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

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

This commit is contained in:
panni 2019-04-11 05:02:02 +02:00
parent ee65371089 6deaa6c384
commit 1783c0cd06
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bazarr/main.py
View File

@ -17,6 +17,7 @@ import warnings
import queueconfig import queueconfig
import platform import platform
import apprise import apprise
import re
from get_args import args from get_args import args
from init import * from init import *
@ -606,13 +607,13 @@ def search_json(query):
('%' + query + '%',)) ('%' + query + '%',))
series = c.fetchall() series = c.fetchall()
for serie in series: for serie in series:
search_list.append(dict([('name', serie[0] + ' (' + serie[2] + ')'), ('url', base_url + 'episodes/' + str(serie[1]))])) search_list.append(dict([('name', re.sub(r'\ \(\d{4}\)', '', serie[0]) + ' (' + serie[2] + ')'), ('url', base_url + 'episodes/' + str(serie[1]))]))
if settings.general.getboolean('use_radarr'): if settings.general.getboolean('use_radarr'):
c.execute("SELECT title, radarrId, year FROM table_movies WHERE title LIKE ? ORDER BY title", ('%' + query + '%',)) c.execute("SELECT title, radarrId, year FROM table_movies WHERE title LIKE ? ORDER BY title", ('%' + query + '%',))
movies = c.fetchall() movies = c.fetchall()
for movie in movies: for movie in movies:
search_list.append(dict([('name', movie[0] + ' (' + movie[2] + ')'), ('url', base_url + 'movie/' + str(movie[1]))])) search_list.append(dict([('name', re.sub(r'\ \(\d{4}\)', '', movie[0]) + ' (' + movie[2] + ')'), ('url', base_url + 'movie/' + str(movie[1]))]))
c.close() c.close()
response.content_type = 'application/json' response.content_type = 'application/json'