anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix notification rating key being overwritten when retrieving lookup info

Browse Source
This commit is contained in:
JonnyWong16
2020-04-18 14:29:49 -07:00
parent e6c2133bf5
commit 063271aabb
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plexpy/database.py
View File

@@ -242,7 +242,7 @@ class MonitorDatabase(object):
sql_results = self.action(query, args).fetchone() sql_results = self.action(query, args).fetchone()
if sql_results is None or sql_results == "": if sql_results is None or sql_results == "":
return "" return {}
return sql_results return sql_results

3
plexpy/notification_handler.py
View File

@@ -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, themoviedb_info = lookup_themoviedb_by_id(rating_key=lookup_key,
thetvdb_id=notify_params.get('thetvdb_id'), thetvdb_id=notify_params.get('thetvdb_id'),
imdb_id=notify_params.get('imdb_id')) imdb_id=notify_params.get('imdb_id'))
themoviedb_info.pop('rating_key', None)
notify_params.update(themoviedb_info) notify_params.update(themoviedb_info)
# Get TVmaze info (for tv shows only) # 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, tvmaze_info = lookup_tvmaze_by_id(rating_key=lookup_key,
thetvdb_id=notify_params.get('thetvdb_id'), thetvdb_id=notify_params.get('thetvdb_id'),
imdb_id=notify_params.get('imdb_id')) imdb_id=notify_params.get('imdb_id'))
tvmaze_info.pop('rating_key', None)
notify_params.update(tvmaze_info) notify_params.update(tvmaze_info)
if tvmaze_info.get('thetvdb_id'): 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, musicbrainz_info = lookup_musicbrainz_info(musicbrainz_type=musicbrainz_type, rating_key=rating_key,
artist=artist, release=release, recording=recording, tracks=tracks, artist=artist, release=release, recording=recording, tracks=tracks,
tnum=tnum) tnum=tnum)
musicbrainz_info.pop('rating_key', None)
notify_params.update(musicbrainz_info) notify_params.update(musicbrainz_info)
if notify_params['media_type'] in ('movie', 'show', 'artist'): if notify_params['media_type'] in ('movie', 'show', 'artist'):