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

Merge branch 'development' into hermes 

# Conflicts:
#	bazarr/main.py
#	views/providers.tpl
This commit is contained in:
Louis Vézina 2020-04-13 23:44:47 -04:00
parent b2d8d49495 b42887c5fa
commit 50901a3b04
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bazarr/main.py
View File

@ -684,11 +684,11 @@ def api_movies_history():
@app.route('/test_url/<protocol>/<path:url>', methods=['GET'])
@login_required
def test_url(protocol, url):
url = unquote(url)
try:
result = requests.get(protocol + "://" + url, allow_redirects=False, verify=False).json()['version']
except:
result = requests.get(url, allow_redirects=False, verify=False).json()['version']
except Exception as e:
logging.exception('BAZARR cannot successfully contact this URL: ' + url)
return dict(status=False)
else:
return dict(status=True, version=result)