mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-25 09:12:38 +00:00
Code Issues Releases Wiki Activity

Fix Merge

Browse source
This commit is contained in:
Halali 2019-01-01 21:31:01 +01:00
parent 67bf114098
commit d12273926c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bazarr/check_update.py
View file

@ -6,12 +6,12 @@ import sqlite3
import json
import requests
if not no_update:
import git
from get_args import args
from get_settings import get_general_settings
if not args.no_update:
import git
current_working_directory = os.path.dirname(os.path.dirname(__file__))

7
bazarr/main.py
View file

@ -13,6 +13,8 @@ import hashlib
import urllib
import warnings
import queueconfig
import platform
import apprise
from get_args import args
from init import *
@ -1537,7 +1539,7 @@ def system():
with open(os.path.join(args.config_dir, 'config', 'releases.txt'), 'r') as f:
releases = ast.literal_eval(f.read())
import platform
use_sonarr = get_general_settings()[12]
url_sonarr = get_sonarr_settings()[6]
apikey_sonarr = get_sonarr_settings()[4]
sv = url_sonarr + "/api/system/status?apikey=" + apikey_sonarr
@ -1547,7 +1549,8 @@ def system():
sonarr_version = requests.get(sv, timeout=15, verify=False).json()['version']
except:
pass
use_radarr = get_general_settings()[13]
url_radarr = get_radarr_settings()[6]
apikey_radarr = get_radarr_settings()[4]
rv = url_radarr + "/api/system/status?apikey=" + apikey_radarr