From 104e2929df1711409cec2830aaade18de27df99c Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:27:26 -0700 Subject: [PATCH] Simplify user delete loop --- plexpy/users.py | 5 ++--- plexpy/webserve.py | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plexpy/users.py b/plexpy/users.py index 93efc810..20d9029f 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -673,11 +673,10 @@ class Users(object): # Get the user_ids corresponding to the row_ids result = monitor_db.select('SELECT user_id FROM users ' 'WHERE id IN ({})'.format(','.join(['?'] * len(row_ids))), row_ids) - user_ids = [user['user_id'] for user in result] success = [] - for user_id in user_ids: - success.append(self.delete(user_id=user_id, purge_only=purge_only)) + for user in result: + success.append(self.delete(user_id=user['user_id'], purge_only=purge_only)) return all(success) elif str(user_id).isdigit(): diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 16015876..2b295ef0 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1072,7 +1072,7 @@ class WebInterface(object): "duration": 2998290, "friendly_name": "Jon Snow", "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en", - "id": 1121, + "history_row_id": 1121, "ip_address": "xxx.xxx.xxx.xxx", "is_active": 1, "keep_history": "Checked", @@ -1088,6 +1088,7 @@ class WebInterface(object): "player": "Plex Web (Chrome)", "plays": 487, "rating_key": 153037, + "row_id": 1, "thumb": "/library/metadata/153036/thumb/1462175062", "transcode_decision": "transcode", "user_id": 133788, @@ -1290,7 +1291,7 @@ class WebInterface(object): "data": [{"friendly_name": "Jon Snow", "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en", - "id": 1121, + "history_row_id": 1121, "ip_address": "xxx.xxx.xxx.xxx", "last_played": "Game of Thrones - The Red Woman", "last_seen": 1462591869,