From 545dd085350372583257401ccaa97ba40e93fcb7 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 26 Apr 2016 00:09:46 -0700 Subject: [PATCH] Flip mask_session_info bool --- plexpy/datafactory.py | 20 ++++++++++---------- plexpy/libraries.py | 2 +- plexpy/plextv.py | 2 +- plexpy/pmsconnect.py | 4 ++-- plexpy/session.py | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index f94fa111..23c97b75 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -231,7 +231,7 @@ class DataFactory(object): home_stats.append({'stat_id': stat, 'stat_type': sort_type, - 'rows': session.mask_session_info(top_tv, mask_metadata=True)}) + 'rows': session.mask_session_info(top_tv)}) elif stat == 'popular_tv': popular_tv = [] @@ -274,7 +274,7 @@ class DataFactory(object): popular_tv.append(row) home_stats.append({'stat_id': stat, - 'rows': session.mask_session_info(popular_tv, mask_metadata=True)}) + 'rows': session.mask_session_info(popular_tv)}) elif stat == 'top_movies': top_movies = [] @@ -318,7 +318,7 @@ class DataFactory(object): home_stats.append({'stat_id': stat, 'stat_type': sort_type, - 'rows': session.mask_session_info(top_movies, mask_metadata=True)}) + 'rows': session.mask_session_info(top_movies)}) elif stat == 'popular_movies': popular_movies = [] @@ -361,7 +361,7 @@ class DataFactory(object): popular_movies.append(row) home_stats.append({'stat_id': stat, - 'rows': session.mask_session_info(popular_movies, mask_metadata=True)}) + 'rows': session.mask_session_info(popular_movies)}) elif stat == 'top_music': top_music = [] @@ -405,7 +405,7 @@ class DataFactory(object): home_stats.append({'stat_id': stat, 'stat_type': sort_type, - 'rows': session.mask_session_info(top_music, mask_metadata=True)}) + 'rows': session.mask_session_info(top_music)}) elif stat == 'popular_music': popular_music = [] @@ -448,7 +448,7 @@ class DataFactory(object): popular_music.append(row) home_stats.append({'stat_id': stat, - 'rows': session.mask_session_info(popular_music, mask_metadata=True)}) + 'rows': session.mask_session_info(popular_music)}) elif stat == 'top_users': top_users = [] @@ -501,7 +501,7 @@ class DataFactory(object): home_stats.append({'stat_id': stat, 'stat_type': sort_type, - 'rows': session.mask_session_info(top_users, mask_metadata=True)}) + 'rows': session.mask_session_info(top_users)}) elif stat == 'top_platforms': top_platform = [] @@ -547,7 +547,7 @@ class DataFactory(object): home_stats.append({'stat_id': stat, 'stat_type': sort_type, - 'rows': session.mask_session_info(top_platform, mask_metadata=True)}) + 'rows': session.mask_session_info(top_platform)}) elif stat == 'last_watched': last_watched = [] @@ -599,7 +599,7 @@ class DataFactory(object): last_watched.append(row) home_stats.append({'stat_id': stat, - 'rows': session.mask_session_info(last_watched, mask_metadata=True)}) + 'rows': session.mask_session_info(last_watched)}) elif stat == 'most_concurrent': @@ -718,7 +718,7 @@ class DataFactory(object): } library_stats.append(library) - return session.filter_session_info(library_stats, 'section_id') + return session.filter_session_info(library_stats, filter_key='section_id') def get_stream_details(self, row_id=None): monitor_db = database.MonitorDatabase() diff --git a/plexpy/libraries.py b/plexpy/libraries.py index a3d952c6..785767f8 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -717,7 +717,7 @@ class Libraries(object): } user_stats.append(row) - return session.mask_session_info(user_stats) + return session.mask_session_info(user_stats, mask_metadata=False) def get_recently_watched(self, section_id=None, limit='10'): if not session.allow_session_library(section_id): diff --git a/plexpy/plextv.py b/plexpy/plextv.py index 5e89001d..4dae8f92 100644 --- a/plexpy/plextv.py +++ b/plexpy/plextv.py @@ -400,7 +400,7 @@ class PlexTV(object): synced_items.append(sync_details) - return session.filter_session_info(synced_items, 'user_id') + return session.filter_session_info(synced_items, filter_key='user_id') def get_server_urls(self, include_https=True): diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index a8949b40..44e8a880 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -495,7 +495,7 @@ class PmsConnect(object): recents_list.append(recent_items) output = {'recently_added': session.filter_session_info( - sorted(recents_list, key=lambda k: k['added_at'], reverse=True), 'section_id')} + sorted(recents_list, key=lambda k: k['added_at'], reverse=True), filter_key='section_id')} return output @@ -976,7 +976,7 @@ class PmsConnect(object): session_list.append(session_output) output = {'stream_count': helpers.get_xml_attr(xml_head[0], 'size'), - 'sessions': session.mask_session_info(session_list, True) + 'sessions': session.mask_session_info(session_list) } return output diff --git a/plexpy/session.py b/plexpy/session.py index 1b49fbe4..7ae4ff12 100644 --- a/plexpy/session.py +++ b/plexpy/session.py @@ -91,7 +91,7 @@ def filter_session_info(list_of_dicts, filter_key=None): return list_of_dicts -def mask_session_info(list_of_dicts, mask_metadata=False): +def mask_session_info(list_of_dicts, mask_metadata=True): """ Masks user info in a list of dictionary items to only display info for the current logged in session """