From 063271aabb02197ca20552d3683b7cdb83906826 Mon Sep 17 00:00:00 2001 From: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> Date: Sat, 18 Apr 2020 14:29:49 -0700 Subject: [PATCH] Fix notification rating key being overwritten when retrieving lookup info --- plexpy/database.py | 2 +- plexpy/notification_handler.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/plexpy/database.py b/plexpy/database.py index 8eb6f7ce..fbf6acd8 100644 --- a/plexpy/database.py +++ b/plexpy/database.py @@ -242,7 +242,7 @@ class MonitorDatabase(object): sql_results = self.action(query, args).fetchone() if sql_results is None or sql_results == "": - return "" + return {} return sql_results diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 89eaf369..04e78de1 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -636,6 +636,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m themoviedb_info = lookup_themoviedb_by_id(rating_key=lookup_key, thetvdb_id=notify_params.get('thetvdb_id'), imdb_id=notify_params.get('imdb_id')) + themoviedb_info.pop('rating_key', None) notify_params.update(themoviedb_info) # Get TVmaze info (for tv shows only) @@ -651,6 +652,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m tvmaze_info = lookup_tvmaze_by_id(rating_key=lookup_key, thetvdb_id=notify_params.get('thetvdb_id'), imdb_id=notify_params.get('imdb_id')) + tvmaze_info.pop('rating_key', None) notify_params.update(tvmaze_info) if tvmaze_info.get('thetvdb_id'): @@ -680,6 +682,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m musicbrainz_info = lookup_musicbrainz_info(musicbrainz_type=musicbrainz_type, rating_key=rating_key, artist=artist, release=release, recording=recording, tracks=tracks, tnum=tnum) + musicbrainz_info.pop('rating_key', None) notify_params.update(musicbrainz_info) if notify_params['media_type'] in ('movie', 'show', 'artist'):