Mirrored_Repos/JBOPS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from blacktwin/blacktwin-patch-1

Browse Source 
check for total user count
This commit is contained in:
blacktwin 2017-07-21 10:21:01 -04:00 committed by GitHub
commit a5cb3412d9
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
maps/ips_to_maps.py
View File

@ -94,8 +94,14 @@ class UserIPs(object):
self.play_count = d['play_count'] self.play_count = d['play_count']
self.platform = d['platform'] self.platform = d['platform']
def get_get_users_tables(users): def get_get_users_tables(users='', length=''):
# Get the user IP list from PlexPy # Get the users list from PlexPy
if length:
payload = {'apikey': PLEXPY_APIKEY,
'cmd': 'get_users_table',
'length': length}
else:
payload = {'apikey': PLEXPY_APIKEY, payload = {'apikey': PLEXPY_APIKEY,
'cmd': 'get_users_table'} 'cmd': 'get_users_table'}
@ -103,12 +109,17 @@ def get_get_users_tables(users):
r = requests.get(PLEXPY_URL.rstrip('/') + '/api/v2', params=payload) r = requests.get(PLEXPY_URL.rstrip('/') + '/api/v2', params=payload)
response = r.json() response = r.json()
res_data = response['response']['data']['data'] res_data = response['response']['data']['data']
if not length and not users:
# Return total user count
return response['response']['data']['recordsTotal']
else:
if users == 'all': if users == 'all':
return [d['user_id'] for d in res_data] return [d['user_id'] for d in res_data]
elif users == 'friendly_name': elif users == 'friendly_name':
return [d['friendly_name'] for d in res_data] return [d['friendly_name'] for d in res_data]
else: else:
return [d['user_id'] for user in users for d in res_data if user == d['friendly_name']] return [d['user_id'] for user in users for d in res_data if user == d['friendly_name']]
except Exception as e: except Exception as e:
sys.stderr.write("PlexPy API 'get_get_users_tables' request failed: {0}.".format(e)) sys.stderr.write("PlexPy API 'get_get_users_tables' request failed: {0}.".format(e))
@ -357,7 +368,8 @@ def draw_map(map_type, geo_dict, filename):
if __name__ == '__main__': if __name__ == '__main__':
timestr = time.strftime("%Y%m%d-%H%M%S") timestr = time.strftime("%Y%m%d-%H%M%S")
user_lst = get_get_users_tables('friendly_name') user_count = get_get_users_tables()
user_lst = sorted(get_get_users_tables('friendly_name', user_count))
json_check = sorted([f for f in os.listdir('.') if os.path.isfile(f) and f.endswith(".json")], key=os.path.getmtime) json_check = sorted([f for f in os.listdir('.') if os.path.isfile(f) and f.endswith(".json")], key=os.path.getmtime)
parser = argparse.ArgumentParser(description="Use PlexPy to draw map of user locations base on IP address.", parser = argparse.ArgumentParser(description="Use PlexPy to draw map of user locations base on IP address.",
formatter_class=argparse.RawTextHelpFormatter) formatter_class=argparse.RawTextHelpFormatter)