From deb46a523e11e0c0f37930ad2a65b86f39f7eb8a Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 20 Oct 2018 20:47:03 +0200 Subject: further code optimazation * reduced code clutter - removed for iterations in result and config lists + added list comprehension * updated config --- nextcloud_dbsize | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'nextcloud_dbsize') diff --git a/nextcloud_dbsize b/nextcloud_dbsize index 9a15774..5878acb 100755 --- a/nextcloud_dbsize +++ b/nextcloud_dbsize @@ -46,7 +46,7 @@ class NextcloudDB: return data def run(self): - # init requests session with specific header and credentials + # init request session with specific header and credentials with requests.Session() as s: # read credentials from env s.auth = (os.environ.get('username'), os.environ.get('password')) @@ -57,29 +57,30 @@ class NextcloudDB: # request the data r = s.get(os.environ.get('url')) - # if status code is successful continue - if r.status_code == 200: - api_response = r.json() - result = self.get_data(api_response) + # if status code is successful continue + if r.status_code == 200: + result = self.get_data(r.json()) - for key in result.keys(): - print('\n'.join(result[key])) + # for key in results print every entry in dict + [print('\n'.join(result[key])) for key in result.keys()] - elif r.status_code == 996: - print('server error') - elif r.status_code == 997: - print('not authorized') - elif r.status_code == 998: - print('not found') - else: - print('unknown error') + elif r.status_code == 996: + print('server error') + elif r.status_code == 997: + print('not authorized') + elif r.status_code == 998: + print('not found') + else: + print('unknown error') def main(self): - # check if first argument is config or autoconf if not fetch data + # check if any argument is given 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 self.config().keys(): - print('\n'.join(self.config()[key])) + # for key in config().keys() print every entry in dict + [print('\n'.join(self.config()[key])) for key in self.config().keys()] + # MUNIN_CAP_DIRTYCONFIG capability if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': self.run() elif sys.argv[1] == 'autoconf': @@ -93,4 +94,3 @@ class NextcloudDB: if __name__ == "__main__": NextcloudDB().main() - quit(0) -- cgit v1.2.3-54-g00ecf