open-source-mirrors
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for #796

Browse Source
pull/803/head
Louis Vézina 5 years ago
parent f80727f409
commit d0d8388d9f
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File

46
bazarr/get_movies.py
Unescape View File

@ -134,31 +134,31 @@ def update_movies():
current_movies_radarr.append(six.text_type(movie['tmdbId'])) current_movies_radarr.append(six.text_type(movie['tmdbId']))
if six.text_type(movie['tmdbId']) in current_movies_db_list: if six.text_type(movie['tmdbId']) in current_movies_db_list:
movies_to_update.append({'radarrId': movie["id"], movies_to_update.append({'radarrId': int(movie["id"]),
'title': six.text_type(movie["title"]), 'title': movie["title"],
'path': six.text_type(movie["path"] + separator + movie['movieFile']['relativePath']), 'path': movie["path"] + separator + movie['movieFile']['relativePath'],
'tmdbId': six.text_type(movie["tmdbId"]), 'tmdbId': six.text_type(movie["tmdbId"]),
'poster': six.text_type(poster), 'poster': poster,
'fanart': six.text_type(fanart), 'fanart': fanart,
'audio_language': six.text_type(profile_id_to_language(movie['qualityProfileId'], audio_profiles)), 'audio_language': profile_id_to_language(movie['qualityProfileId'], audio_profiles),
'sceneName': sceneName, 'sceneName': sceneName,
'monitored': six.text_type(bool(movie['monitored'])), 'monitored': six.text_type(bool(movie['monitored'])),
'year': six.text_type(movie['year']), 'year': six.text_type(movie['year']),
'sortTitle': six.text_type(movie['sortTitle']), 'sortTitle': movie['sortTitle'],
'alternativeTitles': six.text_type(alternativeTitles), 'alternativeTitles': alternativeTitles,
'format': six.text_type(format), 'format': format,
'resolution': six.text_type(resolution), 'resolution': resolution,
'video_codec': six.text_type(videoCodec), 'video_codec': videoCodec,
'audio_codec': six.text_type(audioCodec), 'audio_codec': audioCodec,
'overview': six.text_type(overview), 'overview': overview,
'imdbId': six.text_type(imdbId), 'imdbId': imdbId,
'movie_file_id': movie['movieFile']['id']}) 'movie_file_id': int(movie['movieFile']['id'])})
else: else:
if movie_default_enabled is True: if movie_default_enabled is True:
movies_to_add.append({'radarrId': 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': movie["tmdbId"], 'tmdbId': six.text_type(movie["tmdbId"]),
'languages': movie_default_language, 'languages': movie_default_language,
'subtitles': '[]', 'subtitles': '[]',
'hearing_impaired': movie_default_hi, 'hearing_impaired': movie_default_hi,
@ -169,7 +169,7 @@ def update_movies():
'sceneName': sceneName, 'sceneName': sceneName,
'monitored': six.text_type(bool(movie['monitored'])), 'monitored': six.text_type(bool(movie['monitored'])),
'sortTitle': movie['sortTitle'], 'sortTitle': movie['sortTitle'],
'year': movie['year'], 'year': six.text_type(movie['year']),
'alternativeTitles': alternativeTitles, 'alternativeTitles': alternativeTitles,
'format': format, 'format': format,
'resolution': resolution, 'resolution': resolution,
@ -177,12 +177,12 @@ def update_movies():
'audio_codec': audioCodec, 'audio_codec': audioCodec,
'imdbId': imdbId, 'imdbId': imdbId,
'forced': movie_default_forced, 'forced': movie_default_forced,
'movie_file_id': movie['movieFile']['id']}) 'movie_file_id': int(movie['movieFile']['id'])})
else: else:
movies_to_add.append({'radarrId': 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': movie["tmdbId"], 'tmdbId': six.text_type(movie["tmdbId"]),
'languages': None, 'languages': None,
'subtitles': '[]', 'subtitles': '[]',
'hearing_impaired': None, 'hearing_impaired': None,
@ -193,7 +193,7 @@ def update_movies():
'sceneName': sceneName, 'sceneName': sceneName,
'monitored': six.text_type(bool(movie['monitored'])), 'monitored': six.text_type(bool(movie['monitored'])),
'sortTitle': movie['sortTitle'], 'sortTitle': movie['sortTitle'],
'year': movie['year'], 'year': six.text_type(movie['year']),
'alternativeTitles': alternativeTitles, 'alternativeTitles': alternativeTitles,
'format': format, 'format': format,
'resolution': resolution, 'resolution': resolution,
@ -201,7 +201,7 @@ def update_movies():
'audio_codec': audioCodec, 'audio_codec': audioCodec,
'imdbId': imdbId, 'imdbId': imdbId,
'forced': None, 'forced': None,
'movie_file_id': movie['movieFile']['id']}) '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 +

7
bazarr/get_series.py
Unescape View File

@ -5,6 +5,7 @@ from __future__ import print_function
import os import os
import requests import requests
import logging import logging
import six
from queueconfig import notifications from queueconfig import notifications
from config import settings, url_sonarr from config import settings, url_sonarr
@ -91,7 +92,7 @@ def update_series():
'fanart': fanart, 'fanart': fanart,
'audio_language': audio_language, 'audio_language': audio_language,
'sortTitle': show['sortTitle'], 'sortTitle': show['sortTitle'],
'year': str(show['year']), 'year': six.text_type(show['year']),
'alternateTitles': alternate_titles}) 'alternateTitles': alternate_titles})
else: else:
if serie_default_enabled is True: if serie_default_enabled is True:
@ -106,7 +107,7 @@ def update_series():
'fanart': fanart, 'fanart': fanart,
'audio_language': audio_language, 'audio_language': audio_language,
'sortTitle': show['sortTitle'], 'sortTitle': show['sortTitle'],
'year': str(show['year']), 'year': six.text_type(show['year']),
'alternateTitles': alternate_titles, 'alternateTitles': alternate_titles,
'forced': serie_default_forced}) 'forced': serie_default_forced})
else: else:
@ -119,7 +120,7 @@ def update_series():
'fanart': fanart, 'fanart': fanart,
'audio_language': audio_language, 'audio_language': audio_language,
'sortTitle': show['sortTitle'], 'sortTitle': show['sortTitle'],
'year': str(show['year']), 'year': six.text_type(show['year']),
'alternateTitles': alternate_titles}) 'alternateTitles': alternate_titles})
# Remove old series from DB # Remove old series from DB

Write Preview
Loading…
Cancel
Save