mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/hermes' into hermes

This commit is contained in:
Louis Vézina 2020-03-29 10:03:50 -04:00
parent d9453121a6 78556a0854
commit 1695069319
2 changed files with 57 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
bazarr/get_movies.py
View File

@ -25,10 +25,16 @@ def update_movies():
radarr_version = get_radarr_version() radarr_version = get_radarr_version()
movie_default_enabled = settings.general.getboolean('movie_default_enabled') movie_default_enabled = settings.general.getboolean('movie_default_enabled')
movie_default_language = settings.general.movie_default_language
movie_default_hi = settings.general.movie_default_hi if movie_default_enabled is True:
movie_default_forced = settings.general.movie_default_forced movie_default_language = settings.general.movie_default_language
movie_default_hi = settings.general.movie_default_hi
movie_default_forced = settings.general.movie_default_forced
else:
movie_default_language = '[]'
movie_default_hi = 'False'
movie_default_forced = 'False'
if apikey_radarr is None: if apikey_radarr is None:
pass pass
else: else:
@ -155,54 +161,29 @@ def update_movies():
'imdbId': imdbId, 'imdbId': imdbId,
'movie_file_id': int(movie['movieFile']['id'])}) 'movie_file_id': int(movie['movieFile']['id'])})
else: else:
if movie_default_enabled is True: movies_to_add.append({'radarrId': int(movie["id"]),
movies_to_add.append({'radarrId': int(movie["id"]), 'title': movie["title"],
'title': movie["title"], 'path': movie["path"] + separator + movie['movieFile']['relativePath'],
'path': movie["path"] + separator + movie['movieFile']['relativePath'], 'tmdbId': str(movie["tmdbId"]),
'tmdbId': str(movie["tmdbId"]), 'languages': movie_default_language,
'languages': movie_default_language, 'subtitles': '[]',
'subtitles': '[]', 'hearing_impaired': movie_default_hi,
'hearing_impaired': movie_default_hi, 'overview': overview,
'overview': overview, 'poster': poster,
'poster': poster, 'fanart': fanart,
'fanart': fanart, 'audio_language': audio_language,
'audio_language': audio_language, 'sceneName': sceneName,
'sceneName': sceneName, 'monitored': str(bool(movie['monitored'])),
'monitored': str(bool(movie['monitored'])), 'sortTitle': movie['sortTitle'],
'sortTitle': movie['sortTitle'], 'year': str(movie['year']),
'year': str(movie['year']), 'alternativeTitles': alternativeTitles,
'alternativeTitles': alternativeTitles, 'format': format,
'format': format, 'resolution': resolution,
'resolution': resolution, 'video_codec': videoCodec,
'video_codec': videoCodec, 'audio_codec': audioCodec,
'audio_codec': audioCodec, 'imdbId': imdbId,
'imdbId': imdbId, 'forced': movie_default_forced,
'forced': movie_default_forced, 'movie_file_id': int(movie['movieFile']['id'])})
'movie_file_id': int(movie['movieFile']['id'])})
else:
movies_to_add.append({'radarrId': int(movie["id"]),
'title': movie["title"],
'path': movie["path"] + separator + movie['movieFile']['relativePath'],
'tmdbId': str(movie["tmdbId"]),
'languages': None,
'subtitles': '[]',
'hearing_impaired': None,
'overview': overview,
'poster': poster,
'fanart': fanart,
'audio_language': audio_language,
'sceneName': sceneName,
'monitored': str(bool(movie['monitored'])),
'sortTitle': movie['sortTitle'],
'year': str(movie['year']),
'alternativeTitles': alternativeTitles,
'format': format,
'resolution': resolution,
'video_codec': videoCodec,
'audio_codec': audioCodec,
'imdbId': imdbId,
'forced': None,
'movie_file_id': int(movie['movieFile']['id'])})
else: else:
logging.error( logging.error(
'BAZARR Radarr returned a movie without a file path: ' + movie["path"] + separator + 'BAZARR Radarr returned a movie without a file path: ' + movie["path"] + separator +

54
bazarr/get_series.py
View File

@ -21,9 +21,16 @@ def update_series():
sonarr_version = get_sonarr_version() sonarr_version = get_sonarr_version()
serie_default_enabled = settings.general.getboolean('serie_default_enabled') serie_default_enabled = settings.general.getboolean('serie_default_enabled')
serie_default_language = settings.general.serie_default_language
serie_default_hi = settings.general.serie_default_hi if serie_default_enabled is True:
serie_default_forced = settings.general.serie_default_forced serie_default_language = settings.general.serie_default_language
serie_default_hi = settings.general.serie_default_hi
serie_default_forced = settings.general.serie_default_forced
else:
serie_default_language = '[]'
serie_default_hi = 'Flase'
serie_default_forced = 'False'
audio_profiles = get_profile_list() audio_profiles = get_profile_list()
# Get shows data from Sonarr # Get shows data from Sonarr
@ -93,33 +100,20 @@ def update_series():
'year': str(show['year']), 'year': str(show['year']),
'alternateTitles': alternate_titles}) 'alternateTitles': alternate_titles})
else: else:
if serie_default_enabled is True: series_to_add.append({'title': show["title"],
series_to_add.append({'title': show["title"], 'path': show["path"],
'path': show["path"], 'tvdbId': show["tvdbId"],
'tvdbId': show["tvdbId"], 'languages': serie_default_language,
'languages': serie_default_language, 'hearing_impaired': serie_default_hi,
'hearing_impaired': serie_default_hi, 'sonarrSeriesId': show["id"],
'sonarrSeriesId': show["id"], 'overview': overview,
'overview': overview, 'poster': poster,
'poster': poster, 'fanart': fanart,
'fanart': fanart, 'audio_language': audio_language,
'audio_language': audio_language, 'sortTitle': show['sortTitle'],
'sortTitle': show['sortTitle'], 'year': str(show['year']),
'year': str(show['year']), 'alternateTitles': alternate_titles,
'alternateTitles': alternate_titles, 'forced': serie_default_forced})
'forced': serie_default_forced})
else:
series_to_add.append({'title': show["title"],
'path': show["path"],
'tvdbId': show["tvdbId"],
'sonarrSeriesId': show["id"],
'overview': overview,
'poster': poster,
'fanart': fanart,
'audio_language': audio_language,
'sortTitle': show['sortTitle'],
'year': str(show['year']),
'alternateTitles': alternate_titles})
# Remove old series from DB # Remove old series from DB
removed_series = list(set(current_shows_db_list) - set(current_shows_sonarr)) removed_series = list(set(current_shows_db_list) - set(current_shows_sonarr))