From 1a9fdd1a993b29b703e2241c5c43ad823261cd17 Mon Sep 17 00:00:00 2001 From: Blacktwin Date: Fri, 7 Sep 2018 00:32:58 -0400 Subject: [PATCH] Issue #93, clean up --- utility/delete_watched_TV.py | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/utility/delete_watched_TV.py b/utility/delete_watched_TV.py index 56c1014..b669de1 100644 --- a/utility/delete_watched_TV.py +++ b/utility/delete_watched_TV.py @@ -17,20 +17,11 @@ SHOW_LST = [123456, 123456, 123456, 123456] # Show rating keys. USER_LST = ['Sam', 'Jakie', 'Blacktwin'] # Name of users -class UserHIS(object): - def __init__(self, data=None): - d = data or {} - self.rating_key = d['rating_key'] - - class METAINFO(object): def __init__(self, data=None): d = data or {} self.title = d['title'] - media_info = d['media_info'][0] - parts = media_info['parts'][0] - self.file_size = parts['file_size'] - self.file = parts['file'] + self.file = d['file'] self.media_type = d['media_type'] self.grandparent_title = d['grandparent_title'] @@ -46,7 +37,7 @@ def get_metadata(rating_key): r = requests.get(TAUTULLI_URL.rstrip('/') + '/api/v2', params=payload) response = r.json() - res_data = response['response']['data'] + res_data = response['response']['data']['metadata'] return METAINFO(data=res_data) except Exception as e: @@ -68,7 +59,7 @@ def get_history(user, show, start, length): response = r.json() res_data = response['response']['data']['data'] - return [UserHIS(data=d) for d in res_data if d['watched_status'] == 1] + return [d['rating_key'] for d in res_data if d['watched_status'] == 1] except Exception as e: sys.stderr.write("Tautulli API 'get_history' request failed: {0}.".format(e)) @@ -88,9 +79,9 @@ for user in USER_LST: try: if all([history]): start += count - for h in history: + for rating_key in history: # Getting metadata of what was watched - meta = get_metadata(h.rating_key) + meta = get_metadata(rating_key) if not any(d['title'] == meta.title for d in meta_lst): meta_dict = { 'title': meta.title, @@ -115,12 +106,8 @@ for user in USER_LST: for meta_dict in meta_lst: - for key, value in meta_dict.items(): - if value == USER_LST: - print(u"{} {} has been watched by {}".format(meta_dict['grandparent_title'], meta_dict['title'], - " & ".join(USER_LST))) - delete_lst.append(meta_dict['file']) - -for x in delete_lst: - print("Removing {}".format(x)) - os.remove(x) + print("{} {} has been watched by {}".format(meta_dict['grandparent_title'].encode('UTF-8'), + meta_dict['title'].encode('UTF-8'), + " & ".join(USER_LST))) + print("Removing {}".format(meta_dict['file'])) + os.remove(meta_dict['file'])