code optimizations

* memory optimization
* runtime reduction
* code cleanup

1 files changed, 53 insertions, 56 deletions

diff --git a/nextcloud_shares.py b/nextcloud_shares.py
index 4c70d06..5bfa28f 100755
--- a/nextcloud_shares.py
+++ b/nextcloud_shares.py
@@ -18,60 +18,52 @@ import os
 
 
 class NextcloudShares:
-	def config(self):
-		config = {
-			'shares': [
-				'graph_title Nextcloud Shares',
-				'graph_args --base 1000 -l 0',
-				'graph_vlabel number of shares',
-				'graph_info graph showing the number of shares',
-				'graph_category nextcloud',
-				'num_shares.label total number of shares',
-				'num_shares.info current over all total of shares',
-				'num_shares.min 0',
-				'num_shares_user.label user shares',
-				'num_shares_user.info current total of user shares',
-				'num_shares_user.min 0',
-				'num_shares_groups.label group shares',
-				'num_shares_groups.info current total of group shares',
-				'num_shares_groups.min 0',
-				'num_shares_link.label link shares',
-				'num_shares_link.info current total of shares through a link',
-				'num_shares_link.min 0',
-				'num_shares_mail.label mail shares',
-				'num_shares_mail.info current total of mail shares',
-				'num_shares_mail.min 0',
-				'num_shares_room.label room shares',
-				'num_shares_room.info current total of room shares',
-				'num_shares_room.min 0',
-				'num_shares_link_no_password.label link shares without a password',
-				'num_shares_link_no_password.info current total of shares through a link without a password protection',
-				'num_shares_link_no_password.min 0',
-				'num_fed_shares_sent.label federated shares sent',
-				'num_fed_shares_sent.info current total of federated shares sent',
-				'num_fed_shares_sent.min 0',
-				'num_fed_shares_received.label federated shares recieved',
-				'num_fed_shares_received.info current total of federated shares recieved',
-				'num_fed_shares_received.min 0'
-			]
-		}
-
-		return config
-
-	def get_data(self, api_response):
-		data = {
-			'nextcloud_shares': [],
-		}
-
-		# shares
+	def __init__(self):
+		self.config = [
+			# shares
+			'graph_title Nextcloud Shares',
+			'graph_args --base 1000 -l 0',
+			'graph_printf %.0lf',
+			'graph_vlabel number of shares',
+			'graph_info graph showing the number of shares',
+			'graph_category nextcloud',
+			'num_shares.label total number of shares',
+			'num_shares.info current over all total of shares',
+			'num_shares.min 0',
+			'num_shares_user.label user shares',
+			'num_shares_user.info current total of user shares',
+			'num_shares_user.min 0',
+			'num_shares_groups.label group shares',
+			'num_shares_groups.info current total of group shares',
+			'num_shares_groups.min 0',
+			'num_shares_link.label link shares',
+			'num_shares_link.info current total of shares through a link',
+			'num_shares_link.min 0',
+			'num_shares_mail.label mail shares',
+			'num_shares_mail.info current total of mail shares',
+			'num_shares_mail.min 0',
+			'num_shares_room.label room shares',
+			'num_shares_room.info current total of room shares',
+			'num_shares_room.min 0',
+			'num_shares_link_no_password.label link shares without a password',
+			'num_shares_link_no_password.info current total of shares through a link without a password protection',
+			'num_shares_link_no_password.min 0',
+			'num_fed_shares_sent.label federated shares sent',
+			'num_fed_shares_sent.info current total of federated shares sent',
+			'num_fed_shares_sent.min 0',
+			'num_fed_shares_received.label federated shares recieved',
+			'num_fed_shares_received.info current total of federated shares recieved',
+			'num_fed_shares_received.min 0'
+		]
+		self.result = list()
+
+	def parse_data(self, api_response):
 		shares = api_response['ocs']['data']['nextcloud']['shares']
-		data['nextcloud_shares'].append('multigraph nextcloud_shares')
 
 		# append for every key in shares the key and the value if the key starts with "num"
-		[data['nextcloud_shares'].append(str(key) + ".value " + str(shares[key]))
-			for key in shares if key.startswith('num')]
-
-		return data
+		for key, value in shares.items():
+			if key.startswith('num'):
+				self.result.append('{k}.value {v}'.format(k=key, v=value))
 
 	def run(self):
 		# init request session with specific header and credentials
@@ -87,10 +79,11 @@ class NextcloudShares:
 
 		# if status code is successful continue
 		if r.status_code == 200:
-			result = self.get_data(r.json())
+			self.parse_data(r.json())
 
-			# for key in results print every entry in dict
-			[print('\n'.join(result[key])) for key in result.keys()]
+			# output results to stdout
+			for el in self.result:
+				print(el, file=sys.stdout)
 
 		elif r.status_code == 996:
 			print('server error')
@@ -106,10 +99,14 @@ class NextcloudShares:
 		if sys.argv.__len__() >= 2:
 			# check if first argument is config or autoconf if not fetch data
 			if sys.argv[1] == "config":
-				# for key in config().keys() print every entry in dict
-				[print('\n'.join(self.config()[key])) for key in self.config().keys()]
+				# output config list to stdout
+				for el in self.config:
+					print(el, file=sys.stdout)
+
+				# if DIRTYCONFIG true also return the corresponding values
 				if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1':
 					self.run()
+
 			elif sys.argv[1] == 'autoconf':
 				if None in [os.environ.get('username'), os.environ.get('password')]:
 					print('env variables are missing')