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

Fix for #658.

Browse Source
pull/684/head
Louis Vézina 5 years ago
parent c44252470a
commit 6cf1bd5b9d
7 changed files with 81 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
bazarr/check_update.py
Unescape View File

@ -6,7 +6,7 @@ import requests
import tarfile import tarfile
from get_args import args from get_args import args
from config import settings, bazarr_url from config import settings
from queueconfig import notifications from queueconfig import notifications
from database import database from database import database

96
bazarr/config.py
Unescape View File

@ -142,36 +142,66 @@ settings = simpleconfigparser(defaults=defaults)
settings.read(os.path.join(args.config_dir, 'config', 'config.ini')) settings.read(os.path.join(args.config_dir, 'config', 'config.ini'))
base_url = settings.general.base_url base_url = settings.general.base_url
bazarr_url = 'http://localhost:' + (str(args.port) if args.port else settings.general.port) + base_url
# sonarr url def url_sonarr():
if settings.sonarr.getboolean('ssl'): if settings.sonarr.getboolean('ssl'):
protocol_sonarr = "https" protocol_sonarr = "https"
else: else:
protocol_sonarr = "http" protocol_sonarr = "http"
if settings.sonarr.base_url == '': if settings.sonarr.base_url == '':
settings.sonarr.base_url = "/" settings.sonarr.base_url = "/"
if not settings.sonarr.base_url.startswith("/"): if not settings.sonarr.base_url.startswith("/"):
settings.sonarr.base_url = "/" + settings.sonarr.base_url settings.sonarr.base_url = "/" + settings.sonarr.base_url
if settings.sonarr.base_url.endswith("/"): if settings.sonarr.base_url.endswith("/"):
settings.sonarr.base_url = settings.sonarr.base_url[:-1] settings.sonarr.base_url = settings.sonarr.base_url[:-1]
url_sonarr = protocol_sonarr + "://" + settings.sonarr.ip + ":" + settings.sonarr.port + settings.sonarr.base_url return protocol_sonarr + "://" + settings.sonarr.ip + ":" + settings.sonarr.port + settings.sonarr.base_url
url_sonarr_short = protocol_sonarr + "://" + settings.sonarr.ip + ":" + settings.sonarr.port
# radarr url def url_sonarr_short():
if settings.radarr.getboolean('ssl'): if settings.sonarr.getboolean('ssl'):
protocol_radarr = "https" protocol_sonarr = "https"
else: else:
protocol_radarr = "http" protocol_sonarr = "http"
if settings.radarr.base_url == '': if settings.sonarr.base_url == '':
settings.radarr.base_url = "/" settings.sonarr.base_url = "/"
if not settings.radarr.base_url.startswith("/"): if not settings.sonarr.base_url.startswith("/"):
settings.radarr.base_url = "/" + settings.radarr.base_url settings.sonarr.base_url = "/" + settings.sonarr.base_url
if settings.radarr.base_url.endswith("/"): if settings.sonarr.base_url.endswith("/"):
settings.radarr.base_url = settings.radarr.base_url[:-1] settings.sonarr.base_url = settings.sonarr.base_url[:-1]
return protocol_sonarr + "://" + settings.sonarr.ip + ":" + settings.sonarr.port
url_radarr = protocol_radarr + "://" + settings.radarr.ip + ":" + settings.radarr.port + settings.radarr.base_url
url_radarr_short = protocol_radarr + "://" + settings.radarr.ip + ":" + settings.radarr.port
def url_radarr():
if settings.radarr.getboolean('ssl'):
protocol_radarr = "https"
else:
protocol_radarr = "http"
if settings.radarr.base_url == '':
settings.radarr.base_url = "/"
if not settings.radarr.base_url.startswith("/"):
settings.radarr.base_url = "/" + settings.radarr.base_url
if settings.radarr.base_url.endswith("/"):
settings.radarr.base_url = settings.radarr.base_url[:-1]
return protocol_radarr + "://" + settings.radarr.ip + ":" + settings.radarr.port + settings.radarr.base_url
def url_radarr_short():
if settings.radarr.getboolean('ssl'):
protocol_radarr = "https"
else:
protocol_radarr = "http"
if settings.radarr.base_url == '':
settings.radarr.base_url = "/"
if not settings.radarr.base_url.startswith("/"):
settings.radarr.base_url = "/" + settings.radarr.base_url
if settings.radarr.base_url.endswith("/"):
settings.radarr.base_url = settings.radarr.base_url[:-1]
return protocol_radarr + "://" + settings.radarr.ip + ":" + settings.radarr.port

2
bazarr/get_episodes.py
Unescape View File

@ -40,7 +40,7 @@ def sync_episodes():
for i, seriesId in enumerate(seriesIdList, 1): for i, seriesId in enumerate(seriesIdList, 1):
notifications.write(msg='Getting episodes data from Sonarr...', queue='get_episodes', item=i, length=seriesIdListLength) notifications.write(msg='Getting episodes data from Sonarr...', queue='get_episodes', item=i, length=seriesIdListLength)
# Get episodes data for a series from Sonarr # Get episodes data for a series from Sonarr
url_sonarr_api_episode = url_sonarr + "/api/episode?seriesId=" + str(seriesId['sonarrSeriesId']) + "&apikey=" + apikey_sonarr url_sonarr_api_episode = url_sonarr() + "/api/episode?seriesId=" + str(seriesId['sonarrSeriesId']) + "&apikey=" + apikey_sonarr
try: try:
r = requests.get(url_sonarr_api_episode, timeout=60, verify=False) r = requests.get(url_sonarr_api_episode, timeout=60, verify=False)
r.raise_for_status() r.raise_for_status()

4
bazarr/get_movies.py
Unescape View File

@ -34,7 +34,7 @@ def update_movies():
audio_profiles = get_profile_list() audio_profiles = get_profile_list()
# Get movies data from radarr # Get movies data from radarr
url_radarr_api_movies = url_radarr + "/api/movie?apikey=" + apikey_radarr url_radarr_api_movies = url_radarr() + "/api/movie?apikey=" + apikey_radarr
try: try:
r = requests.get(url_radarr_api_movies, timeout=60, verify=False) r = requests.get(url_radarr_api_movies, timeout=60, verify=False)
r.raise_for_status() r.raise_for_status()
@ -274,7 +274,7 @@ def get_profile_list():
profiles_list = [] profiles_list = []
# Get profiles data from radarr # Get profiles data from radarr
url_radarr_api_movies = url_radarr + "/api/profile?apikey=" + apikey_radarr url_radarr_api_movies = url_radarr() + "/api/profile?apikey=" + apikey_radarr
try: try:
profiles_json = requests.get(url_radarr_api_movies, timeout=60, verify=False) profiles_json = requests.get(url_radarr_api_movies, timeout=60, verify=False)
except requests.exceptions.ConnectionError as errc: except requests.exceptions.ConnectionError as errc:

6
bazarr/get_series.py
Unescape View File

@ -30,7 +30,7 @@ def update_series():
audio_profiles = get_profile_list() audio_profiles = get_profile_list()
# Get shows data from Sonarr # Get shows data from Sonarr
url_sonarr_api_series = url_sonarr + "/api/series?apikey=" + apikey_sonarr url_sonarr_api_series = url_sonarr() + "/api/series?apikey=" + apikey_sonarr
try: try:
r = requests.get(url_sonarr_api_series, timeout=60, verify=False) r = requests.get(url_sonarr_api_series, timeout=60, verify=False)
r.raise_for_status() r.raise_for_status()
@ -165,9 +165,9 @@ def get_profile_list():
# Get profiles data from Sonarr # Get profiles data from Sonarr
if sonarr_version.startswith('2'): if sonarr_version.startswith('2'):
url_sonarr_api_series = url_sonarr + "/api/profile?apikey=" + apikey_sonarr url_sonarr_api_series = url_sonarr() + "/api/profile?apikey=" + apikey_sonarr
elif sonarr_version.startswith('3'): elif sonarr_version.startswith('3'):
url_sonarr_api_series = url_sonarr + "/api/v3/languageprofile?apikey=" + apikey_sonarr url_sonarr_api_series = url_sonarr() + "/api/v3/languageprofile?apikey=" + apikey_sonarr
try: try:
profiles_json = requests.get(url_sonarr_api_series, timeout=60, verify=False) profiles_json = requests.get(url_sonarr_api_series, timeout=60, verify=False)

18
bazarr/main.py
Unescape View File

@ -1,6 +1,6 @@
# coding=utf-8 # coding=utf-8
bazarr_version = '0.8.3' bazarr_version = '0.8.3.1'
import os import os
os.environ["SZ_USER_AGENT"] = "Bazarr/1" os.environ["SZ_USER_AGENT"] = "Bazarr/1"
@ -466,10 +466,10 @@ def download_log():
def image_proxy(url): def image_proxy(url):
authorize() authorize()
apikey = settings.sonarr.apikey apikey = settings.sonarr.apikey
url_image = url_sonarr_short + '/' + url + '?apikey=' + apikey url_image = url_sonarr_short() + '/' + url + '?apikey=' + apikey
try: try:
image_buffer = BytesIO( image_buffer = BytesIO(
requests.get(url_sonarr + '/api' + url_image.split(url_sonarr)[1], timeout=15, verify=False).content) requests.get(url_sonarr() + '/api' + url_image.split(url_sonarr())[1], timeout=15, verify=False).content)
except: except:
return None return None
else: else:
@ -485,13 +485,13 @@ def image_proxy_movies(url):
authorize() authorize()
apikey = settings.radarr.apikey apikey = settings.radarr.apikey
try: try:
url_image = (url_radarr_short + '/' + url + '?apikey=' + apikey).replace('/fanart.jpg', '/banner.jpg') url_image = (url_radarr_short() + '/' + url + '?apikey=' + apikey).replace('/fanart.jpg', '/banner.jpg')
image_buffer = BytesIO( image_buffer = BytesIO(
requests.get(url_radarr + '/api' + url_image.split(url_radarr)[1], timeout=15, verify=False).content) requests.get(url_radarr() + '/api' + url_image.split(url_radarr())[1], timeout=15, verify=False).content)
except: except:
url_image = url_radarr_short + '/' + url + '?apikey=' + apikey url_image = url_radarr_short() + '/' + url + '?apikey=' + apikey
image_buffer = BytesIO( image_buffer = BytesIO(
requests.get(url_radarr + '/api' + url_image.split(url_radarr)[1], timeout=15, verify=False).content) requests.get(url_radarr() + '/api' + url_image.split(url_radarr())[1], timeout=15, verify=False).content)
else: else:
image_buffer.seek(0) image_buffer.seek(0)
bytes = image_buffer.read() bytes = image_buffer.read()
@ -717,7 +717,7 @@ def episodes(no):
seasons_list.append(list(season)) seasons_list.append(list(season))
return template('episodes', bazarr_version=bazarr_version, no=no, details=series_details, return template('episodes', bazarr_version=bazarr_version, no=no, details=series_details,
languages=languages, seasons=seasons_list, url_sonarr_short=url_sonarr_short, base_url=base_url, languages=languages, seasons=seasons_list, url_sonarr_short=url_sonarr_short(), base_url=base_url,
tvdbid=tvdbid, number=number, current_port=settings.general.port) tvdbid=tvdbid, number=number, current_port=settings.general.port)
@ -852,7 +852,7 @@ def movie(no):
languages = database.execute("SELECT code2, name FROM table_settings_languages WHERE enabled=1") languages = database.execute("SELECT code2, name FROM table_settings_languages WHERE enabled=1")
return template('movie', bazarr_version=bazarr_version, no=no, details=movies_details, return template('movie', bazarr_version=bazarr_version, no=no, details=movies_details,
languages=languages, url_radarr_short=url_radarr_short, base_url=base_url, tmdbid=tmdbid, languages=languages, url_radarr_short=url_radarr_short(), base_url=base_url, tmdbid=tmdbid,
current_port=settings.general.port) current_port=settings.general.port)

4
bazarr/utils.py
Unescape View File

@ -82,7 +82,7 @@ def cache_maintenance():
def get_sonarr_version(): def get_sonarr_version():
use_sonarr = settings.general.getboolean('use_sonarr') use_sonarr = settings.general.getboolean('use_sonarr')
apikey_sonarr = settings.sonarr.apikey apikey_sonarr = settings.sonarr.apikey
sv = url_sonarr + "/api/system/status?apikey=" + apikey_sonarr sv = url_sonarr() + "/api/system/status?apikey=" + apikey_sonarr
sonarr_version = '' sonarr_version = ''
if use_sonarr: if use_sonarr:
try: try:
@ -96,7 +96,7 @@ def get_sonarr_version():
def get_radarr_version(): def get_radarr_version():
use_radarr = settings.general.getboolean('use_radarr') use_radarr = settings.general.getboolean('use_radarr')
apikey_radarr = settings.radarr.apikey apikey_radarr = settings.radarr.apikey
rv = url_radarr + "/api/system/status?apikey=" + apikey_radarr rv = url_radarr() + "/api/system/status?apikey=" + apikey_radarr
radarr_version = '' radarr_version = ''
if use_radarr: if use_radarr:
try: try:

Write Preview
Loading…
Cancel
Save