aboutsummaryrefslogtreecommitdiffstats
path: root/nextcloud_users
diff options
context:
space:
mode:
authornico <nico@magicbroccoli.de>2018-10-20 20:47:03 +0200
committernico <nico@magicbroccoli.de>2018-10-20 20:47:03 +0200
commitdeb46a523e11e0c0f37930ad2a65b86f39f7eb8a (patch)
treec9520990d277240ef39c38dc8a6b443f86ea3929 /nextcloud_users
parentffa77ad80004c24938dab96661d67cb9320a5599 (diff)
further code optimazation
* reduced code clutter - removed for iterations in result and config lists + added list comprehension * updated config
Diffstat (limited to 'nextcloud_users')
-rwxr-xr-xnextcloud_users44
1 files changed, 23 insertions, 21 deletions
diff --git a/nextcloud_users b/nextcloud_users
index ef638c6..77dbd5f 100755
--- a/nextcloud_users
+++ b/nextcloud_users
@@ -45,15 +45,17 @@ class NextcloudUsers:
data ={
'nextcloud_users': [],
}
+ # users
users = api_response['ocs']['data']['activeUsers']
- for key in users.keys():
- data['nextcloud_users'].append(str(key) + ".value " + str(users[key]))
+ # append for every key in users the key and the value to the results
+ [data['nextcloud_users'].append(str(key) + ".value " + str(users[key]))
+ for key in users.keys()]
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'))
@@ -64,29 +66,30 @@ class NextcloudUsers:
# 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':
@@ -100,4 +103,3 @@ class NextcloudUsers:
if __name__ == "__main__":
NextcloudUsers().main()
- quit(0)