mirror of
https://github.com/morpheus65535/bazarr
synced 2024-12-27 01:57:33 +00:00
WIP
This commit is contained in:
Louis Vézina
parent
2af22b44f6
commit
b6faa5b25c
2 changed files with 151 additions and 348 deletions
|
|
@ -13,10 +13,9 @@ from subliminal import core
|
|||
from subliminal_patch import search_external_subtitles
|
||||
from bs4 import UnicodeDammit
|
||||
from itertools import islice
|
||||
from database import TableShows, TableEpisodes, TableMovies
|
||||
from peewee import fn, JOIN
|
||||
|
||||
from get_args import args
|
||||
from database import database
|
||||
from get_languages import alpha2_from_alpha3, get_language_set
|
||||
from config import settings
|
||||
from helper import path_replace, path_replace_movie, path_replace_reverse, \
|
||||
|
|
@ -105,15 +104,13 @@ def store_subtitles(file):
|
|||
actual_subtitles.append([str(detected_language), path_replace_reverse(
|
||||
os.path.join(os.path.dirname(file), subtitle))])
|
||||
|
||||
update_count = TableEpisodes.update(
|
||||
{
|
||||
TableEpisodes.subtitles: str(actual_subtitles)
|
||||
}
|
||||
).where(
|
||||
TableEpisodes.path == path_replace_reverse(file)
|
||||
).execute()
|
||||
if update_count > 0:
|
||||
database.execute("UPDATE table_episodes (subtitles) VALUES (?) WHERE path=?",
|
||||
(str(actual_subtitles), path_replace_reverse(file)))
|
||||
episode = database.execute("SELECT sonarrSeriesId FROM table_episodes WHERE path=?", (path_replace_reverse(file),))
|
||||
|
||||
if len(episode):
|
||||
logging.debug("BAZARR storing those languages to DB: " + str(actual_subtitles))
|
||||
list_missing_subtitles(epno=episode[0]['sonarrEpisodeId'])
|
||||
else:
|
||||
logging.debug("BAZARR haven't been able to update existing subtitles to DB : " + str(actual_subtitles))
|
||||
else:
|
||||
|
|
@ -121,14 +118,6 @@ def store_subtitles(file):
|
|||
|
||||
logging.debug('BAZARR ended subtitles indexing for this file: ' + file)
|
||||
|
||||
episode = TableEpisodes.select(
|
||||
TableEpisodes.sonarr_episode_id
|
||||
).where(
|
||||
TableEpisodes.path == path_replace_reverse(file)
|
||||
).first()
|
||||
|
||||
list_missing_subtitles(epno=episode.sonarr_episode_id)
|
||||
|
||||
return actual_subtitles
|
||||
|
||||
|
||||
|
|
@ -210,15 +199,13 @@ def store_subtitles_movie(file):
|
|||
actual_subtitles.append([str(detected_language), path_replace_reverse_movie(
|
||||
os.path.join(os.path.dirname(file), dest_folder, subtitle))])
|
||||
|
||||
update_count = TableMovies.update(
|
||||
{
|
||||
TableMovies.subtitles: str(actual_subtitles)
|
||||
}
|
||||
).where(
|
||||
TableMovies.path == path_replace_reverse_movie(file)
|
||||
).execute()
|
||||
if update_count > 0:
|
||||
database.execute("UPDATE table_movies (subtitles) VALUES (?) WHERE path=?",
|
||||
(str(actual_subtitles), path_replace_reverse_movie(file)))
|
||||
movie = database.execute("SELECT radarrId FROM table_movies WHERE path=?", (path_replace_reverse_movie(file),))
|
||||
|
||||
if len(movie):
|
||||
logging.debug("BAZARR storing those languages to DB: " + str(actual_subtitles))
|
||||
list_missing_subtitles_movies(no=movie[0]['radarrId'])
|
||||
else:
|
||||
logging.debug("BAZARR haven't been able to update existing subtitles to DB : " + str(actual_subtitles))
|
||||
else:
|
||||
|
|
@ -226,34 +213,21 @@ def store_subtitles_movie(file):
|
|||
|
||||
logging.debug('BAZARR ended subtitles indexing for this file: ' + file)
|
||||
|
||||
movie = TableMovies.select(
|
||||
TableMovies.radarr_id
|
||||
).where(
|
||||
TableMovies.path == path_replace_reverse_movie(file)
|
||||
).first()
|
||||
|
||||
list_missing_subtitles_movies(no=movie.radarr_id)
|
||||
|
||||
return actual_subtitles
|
||||
|
||||
|
||||
def list_missing_subtitles(no=None, epno=None):
|
||||
episodes_subtitles_clause = (TableShows.sonarr_series_id.is_null(False))
|
||||
if no is not None:
|
||||
episodes_subtitles_clause = (TableShows.sonarr_series_id == no)
|
||||
episodes_subtitles_clause = " WHERE sonarrSeriesId=no"
|
||||
elif epno is not None:
|
||||
episodes_subtitles_clause = (TableEpisodes.sonarr_episode_id == epno)
|
||||
episodes_subtitles = TableEpisodes.select(
|
||||
TableShows.sonarr_series_id,
|
||||
TableEpisodes.sonarr_episode_id,
|
||||
TableEpisodes.subtitles,
|
||||
TableShows.languages,
|
||||
TableShows.forced
|
||||
).join_from(
|
||||
TableEpisodes, TableShows, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
episodes_subtitles_clause
|
||||
).objects()
|
||||
episodes_subtitles_clause = " WHERE sonarrEpisodeId=no"
|
||||
else:
|
||||
episodes_subtitles_clause = ""
|
||||
episodes_subtitles = database.execute("SELECT table_shows.sonarrSeriesId, table_episodes.sonarrEpisodeId, "
|
||||
"table_episodes.subtitles, table_shows.languages, table_shows.forced "
|
||||
"FROM table_episodes LEFT JOIN table_shows "
|
||||
"on table_episodes.sonarrSeriesId = table_shows.sonarrSeriesId" +
|
||||
episodes_subtitles_clause)
|
||||
|
||||
missing_subtitles_global = []
|
||||
use_embedded_subs = settings.general.getboolean('use_embedded_subs')
|
||||
|
|
@ -296,28 +270,18 @@ def list_missing_subtitles(no=None, epno=None):
|
|||
missing_subtitles_global.append(tuple([str(missing_subtitles), episode_subtitles.sonarr_episode_id]))
|
||||
|
||||
for missing_subtitles_item in missing_subtitles_global:
|
||||
TableEpisodes.update(
|
||||
{
|
||||
TableEpisodes.missing_subtitles: missing_subtitles_item[0]
|
||||
}
|
||||
).where(
|
||||
TableEpisodes.sonarr_episode_id == missing_subtitles_item[1]
|
||||
).execute()
|
||||
database.execute("UPDATE table_episodes (missing_subtitles) VALUES (?) WHERE sonarrEpisodeId=?",
|
||||
(missing_subtitles_item[0], missing_subtitles_item[1]))
|
||||
|
||||
|
||||
def list_missing_subtitles_movies(no=None):
|
||||
movies_subtitles_clause = (TableMovies.radarr_id.is_null(False))
|
||||
if no is not None:
|
||||
movies_subtitles_clause = (TableMovies.radarr_id == no)
|
||||
movies_subtitles_clause = " WHERE radarrId=no"
|
||||
else:
|
||||
movies_subtitles_clause = ""
|
||||
|
||||
movies_subtitles = TableMovies.select(
|
||||
TableMovies.radarr_id,
|
||||
TableMovies.subtitles,
|
||||
TableMovies.languages,
|
||||
TableMovies.forced
|
||||
).where(
|
||||
movies_subtitles_clause
|
||||
)
|
||||
movies_subtitles = database.execute("SELECT radarrId, subtitles, languages, forced FROM table_movies" +
|
||||
movies_subtitles_clause)
|
||||
|
||||
missing_subtitles_global = []
|
||||
use_embedded_subs = settings.general.getboolean('use_embedded_subs')
|
||||
|
|
@ -360,60 +324,43 @@ def list_missing_subtitles_movies(no=None):
|
|||
missing_subtitles_global.append(tuple([str(missing_subtitles), movie_subtitles.radarr_id]))
|
||||
|
||||
for missing_subtitles_item in missing_subtitles_global:
|
||||
TableMovies.update(
|
||||
{
|
||||
TableMovies.missing_subtitles: missing_subtitles_item[0]
|
||||
}
|
||||
).where(
|
||||
TableMovies.radarr_id == missing_subtitles_item[1]
|
||||
).execute()
|
||||
database.execute("UPDATE table_movies (missing_subtitles) VALUES (?) WHERE radarrIr=?",
|
||||
(missing_subtitles_item[0], missing_subtitles_item[1]))
|
||||
|
||||
|
||||
def series_full_scan_subtitles():
|
||||
episodes = TableEpisodes.select(
|
||||
TableEpisodes.path
|
||||
)
|
||||
count_episodes = episodes.count()
|
||||
episodes = database.execute("SELECT path FROM table_episodes")
|
||||
count_episodes = len(episodes)
|
||||
|
||||
for i, episode in enumerate(episodes, 1):
|
||||
notifications.write(msg='Updating all episodes subtitles from disk...',
|
||||
queue='list_subtitles_series', item=i, length=count_episodes)
|
||||
store_subtitles(path_replace(episode.path))
|
||||
store_subtitles(path_replace(episode['path']))
|
||||
|
||||
gc.collect()
|
||||
|
||||
|
||||
def movies_full_scan_subtitles():
|
||||
movies = TableMovies.select(
|
||||
TableMovies.path
|
||||
)
|
||||
count_movies = movies.count()
|
||||
movies = database.execute("SELECT path FROM table_movies")
|
||||
count_movies = len(movies)
|
||||
|
||||
for i, movie in enumerate(movies, 1):
|
||||
notifications.write(msg='Updating all movies subtitles from disk...',
|
||||
queue='list_subtitles_movies', item=i, length=count_movies)
|
||||
store_subtitles_movie(path_replace_movie(movie.path))
|
||||
store_subtitles_movie(path_replace_movie(movie['path']))
|
||||
|
||||
gc.collect()
|
||||
|
||||
|
||||
def series_scan_subtitles(no):
|
||||
episodes = TableEpisodes.select(
|
||||
TableEpisodes.path
|
||||
).where(
|
||||
TableEpisodes.sonarr_series_id == no
|
||||
)
|
||||
episodes = database.execute("SELECT path FROM table_episodes WHERE sonarrSeriesId=?", (no,))
|
||||
|
||||
for episode in episodes:
|
||||
store_subtitles(path_replace(episode.path))
|
||||
|
||||
|
||||
def movies_scan_subtitles(no):
|
||||
movies = TableMovies.select(
|
||||
TableMovies.path
|
||||
).where(
|
||||
TableMovies.radarr_id == no
|
||||
)
|
||||
movies = database.execute("SELECT path FROM table_movies WHERE radarrId=?", (no,))
|
||||
|
||||
for movie in movies:
|
||||
store_subtitles_movie(path_replace_movie(movie.path))
|
||||
|
|
|
|||
364
bazarr/main.py
364
bazarr/main.py
|
|
@ -909,13 +909,9 @@ def history():
|
|||
def historyseries():
|
||||
authorize()
|
||||
|
||||
row_count = TableHistory.select(
|
||||
|
||||
).join_from(
|
||||
TableHistory, TableShows, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableShows.title.is_null(False)
|
||||
).count()
|
||||
row_count = database.execute("SELECT COUNT(*) FROM table_history LEFT JOIN table_shows on "
|
||||
"table_history.sonarrSeriesId = table_shows.sonarrSeriesId WHERE table_shows.title "
|
||||
"is not NULL")
|
||||
page = request.GET.page
|
||||
if page == "":
|
||||
page = "1"
|
||||
|
|
@ -927,46 +923,25 @@ def historyseries():
|
|||
today = []
|
||||
thisweek = []
|
||||
thisyear = []
|
||||
stats = TableHistory.select(
|
||||
TableHistory.timestamp
|
||||
).where(
|
||||
TableHistory.action != 0
|
||||
)
|
||||
stats = database.execute("SELECT timestamp FROM table_history WHERE action != 0")
|
||||
total = len(stats)
|
||||
for stat in stats:
|
||||
if now - timedelta(hours=24) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
today.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(weeks=1) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
thisweek.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(weeks=52) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
thisyear.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(hours=24) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
today.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
if now - timedelta(weeks=1) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
thisweek.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
if now - timedelta(weeks=52) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
thisyear.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
stats = [len(today), len(thisweek), len(thisyear), total]
|
||||
|
||||
data = TableHistory.select(
|
||||
TableHistory.action,
|
||||
TableShows.title.alias('seriesTitle'),
|
||||
TableEpisodes.season.cast('str').concat('x').concat(TableEpisodes.episode.cast('str')).alias('episode_number'),
|
||||
TableEpisodes.title.alias('episodeTitle'),
|
||||
TableHistory.timestamp,
|
||||
TableHistory.description,
|
||||
TableHistory.sonarr_series_id,
|
||||
TableEpisodes.path,
|
||||
TableShows.languages,
|
||||
TableHistory.language,
|
||||
TableHistory.score,
|
||||
TableShows.forced
|
||||
).join_from(
|
||||
TableHistory, TableShows, JOIN.LEFT_OUTER
|
||||
).join_from(
|
||||
TableHistory, TableEpisodes, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableShows.title.is_null(False)
|
||||
).order_by(
|
||||
TableHistory.timestamp.desc()
|
||||
).paginate(
|
||||
int(page),
|
||||
page_size
|
||||
).objects()
|
||||
data = database.execute("SELECT table_history.action, table_shows.title, "
|
||||
"table_episodes.season || 'x' || table_episodes.episode, table_episodes.title, "
|
||||
"table_history.timestamp, table_history.description, table_history.sonarrSeriesId, "
|
||||
"table_episodes.path, table_shows.languages, table_history.language, table_history.score, "
|
||||
"table_shows.forced FROM table_history LEFT JOIN table_shows on "
|
||||
"table_shows.sonarrSeriesId = table_history.sonarrSeriesId LEFT JOIN table_episodes on "
|
||||
"table_episodes.sonarrEpisodeId = table_history.sonarrEpisodeId WHERE table_history.title "
|
||||
"is not NULL ORDER BY timestamp DESC LIMIT ? OFFSET ?", (page_size, offset))
|
||||
|
||||
upgradable_episodes_not_perfect = []
|
||||
if settings.general.getboolean('upgrade_subs'):
|
||||
|
|
@ -979,30 +954,20 @@ def historyseries():
|
|||
else:
|
||||
query_actions = [1, 3]
|
||||
|
||||
episodes_details_clause = [
|
||||
(TableHistory.action.in_(query_actions)) &
|
||||
(TableHistory.score.is_null(False))
|
||||
]
|
||||
|
||||
if settings.sonarr.getboolean('only_monitored'):
|
||||
episodes_details_clause.append(
|
||||
(TableEpisodes.monitored == 'True')
|
||||
)
|
||||
series_monitored_only_query_string = " AND monitored='True'"
|
||||
else:
|
||||
series_monitored_only_query_string = ''
|
||||
|
||||
upgradable_episodes = TableHistory.select(
|
||||
TableHistory.video_path,
|
||||
fn.MAX(TableHistory.timestamp).alias('timestamp'),
|
||||
TableHistory.score
|
||||
).join_from(
|
||||
TableHistory, TableEpisodes, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
reduce(operator.and_, episodes_details_clause)
|
||||
).group_by(
|
||||
TableHistory.video_path,
|
||||
TableHistory.language
|
||||
)
|
||||
upgradable_episodes = database.execute("SELECT video_path, MAX(timestamp), score FROM table_history "
|
||||
"INNER JOIN table_episodes on table_episodes.sonarrEpisodeId = "
|
||||
"table_history.sonarrEpisodeId WHERE action IN (" +
|
||||
','.join(map(str, query_actions)) + ") AND timestamp > ? AND "
|
||||
"score is not null" + series_monitored_only_query_string + " GROUP BY "
|
||||
"table_history.video_path, table_history.language",
|
||||
(minimum_timestamp,))
|
||||
|
||||
for upgradable_episode in upgradable_episodes.dicts():
|
||||
for upgradable_episode in upgradable_episodes:
|
||||
if upgradable_episode['timestamp'] > minimum_timestamp:
|
||||
try:
|
||||
int(upgradable_episode['score'])
|
||||
|
|
@ -1010,7 +975,7 @@ def historyseries():
|
|||
pass
|
||||
else:
|
||||
if int(upgradable_episode['score']) < 360:
|
||||
upgradable_episodes_not_perfect.append(tuple(upgradable_episode.values()))
|
||||
upgradable_episodes_not_perfect.append(upgradable_episode)
|
||||
|
||||
return template('historyseries', bazarr_version=bazarr_version, rows=data, row_count=row_count,
|
||||
page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size,
|
||||
|
|
@ -1022,13 +987,9 @@ def historyseries():
|
|||
def historymovies():
|
||||
authorize()
|
||||
|
||||
row_count = TableHistoryMovie.select(
|
||||
|
||||
).join_from(
|
||||
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableMovies.title.is_null(False)
|
||||
).count()
|
||||
row_count = database.execute("SELECT COUNT(*) FROM table_history_movie LEFT JOIN table_movies ON "
|
||||
"table_history_movie.radarrId=table_movies.radarrId "
|
||||
"WHERE table_movies.title is not NULL")
|
||||
page = request.GET.page
|
||||
if page == "":
|
||||
page = "1"
|
||||
|
|
@ -1040,42 +1001,23 @@ def historymovies():
|
|||
today = []
|
||||
thisweek = []
|
||||
thisyear = []
|
||||
stats = TableHistoryMovie.select(
|
||||
TableHistoryMovie.timestamp
|
||||
).where(
|
||||
TableHistoryMovie.action > 0
|
||||
)
|
||||
stats = database.execute("SELECT timestamp FROM table_history_movie WHERE action != 0")
|
||||
total = len(stats)
|
||||
for stat in stats:
|
||||
if now - timedelta(hours=24) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
today.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(weeks=1) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
thisweek.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(weeks=52) <= datetime.fromtimestamp(stat.timestamp) <= now:
|
||||
thisyear.append(datetime.fromtimestamp(stat.timestamp).date())
|
||||
if now - timedelta(hours=24) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
today.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
if now - timedelta(weeks=1) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
thisweek.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
if now - timedelta(weeks=52) <= datetime.fromtimestamp(stat['timestamp']) <= now:
|
||||
thisyear.append(datetime.fromtimestamp(stat['timestamp']).date())
|
||||
stats = [len(today), len(thisweek), len(thisyear), total]
|
||||
|
||||
data = TableHistoryMovie.select(
|
||||
TableHistoryMovie.action,
|
||||
TableMovies.title,
|
||||
TableHistoryMovie.timestamp,
|
||||
TableHistoryMovie.description,
|
||||
TableHistoryMovie.radarr_id,
|
||||
TableHistoryMovie.video_path,
|
||||
TableMovies.languages,
|
||||
TableHistoryMovie.language,
|
||||
TableHistoryMovie.score,
|
||||
TableMovies.forced
|
||||
).join_from(
|
||||
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableMovies.title.is_null(False)
|
||||
).order_by(
|
||||
TableHistoryMovie.timestamp.desc()
|
||||
).paginate(
|
||||
int(page),
|
||||
page_size
|
||||
).objects()
|
||||
data = database.execute("SELECT table_history_movie.action, table_movies.title, table_history_movie.timestamp, "
|
||||
"table_history_movie.description, table_history_movie.radarrId, "
|
||||
"table_history_movie.video_path, table_movies.languages, table_history_movie.language, "
|
||||
"table_history_movie.score, table_movies.forced FROM table_history_movie "
|
||||
"LEFT JOIN table_movies on table_movies.radarrId = table_history_movie.radarrId "
|
||||
"ORDER BY timestamp DESC LIMIT ? OFFSET ?", (page_size, offset,))
|
||||
|
||||
upgradable_movies = []
|
||||
upgradable_movies_not_perfect = []
|
||||
|
|
@ -1094,30 +1036,15 @@ def historymovies():
|
|||
else:
|
||||
query_actions = [1, 3]
|
||||
|
||||
movies_details_clause = [
|
||||
(TableHistoryMovie.action.in_(query_actions)) &
|
||||
(TableHistoryMovie.score.is_null(False))
|
||||
]
|
||||
upgradable_movies = database.execute("SELECT video_path, MAX(timestamp), score FROM table_history_movie "
|
||||
"INNER JOIN table_movies on table_movies.radarrId="
|
||||
"table_history_movie.radarrId WHERE action IN (" +
|
||||
','.join(map(str, query_actions)) +
|
||||
") AND timestamp > ? AND score is not NULL" +
|
||||
movies_monitored_only_query_string + " GROUP BY video_path, language",
|
||||
(minimum_timestamp,))
|
||||
|
||||
if settings.radarr.getboolean('only_monitored'):
|
||||
movies_details_clause.append(
|
||||
(TableMovies.monitored == 'True')
|
||||
)
|
||||
|
||||
upgradable_movies = TableHistoryMovie.select(
|
||||
TableHistoryMovie.video_path,
|
||||
fn.MAX(TableHistoryMovie.timestamp).alias('timestamp'),
|
||||
TableHistoryMovie.score
|
||||
).join_from(
|
||||
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
reduce(operator.and_, movies_details_clause)
|
||||
).group_by(
|
||||
TableHistoryMovie.video_path,
|
||||
TableHistoryMovie.language
|
||||
)
|
||||
|
||||
for upgradable_movie in upgradable_movies.dicts():
|
||||
for upgradable_movie in upgradable_movies:
|
||||
if upgradable_movie['timestamp'] > minimum_timestamp:
|
||||
try:
|
||||
int(upgradable_movie['score'])
|
||||
|
|
@ -1125,7 +1052,7 @@ def historymovies():
|
|||
pass
|
||||
else:
|
||||
if int(upgradable_movie['score']) < 120:
|
||||
upgradable_movies_not_perfect.append(tuple(upgradable_movie.values()))
|
||||
upgradable_movies_not_perfect.append(upgradable_movie)
|
||||
|
||||
return template('historymovies', bazarr_version=bazarr_version, rows=data, row_count=row_count,
|
||||
page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size,
|
||||
|
|
@ -1144,17 +1071,13 @@ def wanted():
|
|||
def wantedseries():
|
||||
authorize()
|
||||
|
||||
missing_subtitles_clause = [
|
||||
(TableEpisodes.missing_subtitles != '[]')
|
||||
]
|
||||
if settings.sonarr.getboolean('only_monitored'):
|
||||
missing_subtitles_clause.append(
|
||||
(TableEpisodes.monitored == 'True')
|
||||
)
|
||||
monitored_only_query_string = " AND monitored='True'"
|
||||
else:
|
||||
monitored_only_query_string = ''
|
||||
|
||||
missing_count = TableEpisodes.select().where(
|
||||
reduce(operator.and_, missing_subtitles_clause)
|
||||
).count()
|
||||
missing_count = database.execute("SELECT COUNT(*) FROM table_episodes WHERE missing_subtitles != '[]'" +
|
||||
monitored_only_query_string)
|
||||
page = request.GET.page
|
||||
if page == "":
|
||||
page = "1"
|
||||
|
|
@ -1162,27 +1085,14 @@ def wantedseries():
|
|||
offset = (int(page) - 1) * page_size
|
||||
max_page = int(math.ceil(missing_count / (page_size + 0.0)))
|
||||
|
||||
data = TableEpisodes.select(
|
||||
TableShows.title.alias('seriesTitle'),
|
||||
TableEpisodes.season.cast('str').concat('x').concat(TableEpisodes.episode.cast('str')).alias('episode_number'),
|
||||
TableEpisodes.title.alias('episodeTitle'),
|
||||
TableEpisodes.missing_subtitles,
|
||||
TableEpisodes.sonarr_series_id,
|
||||
fn.path_substitution(TableEpisodes.path).alias('path'),
|
||||
TableShows.hearing_impaired,
|
||||
TableEpisodes.sonarr_episode_id,
|
||||
TableEpisodes.scene_name,
|
||||
TableEpisodes.failed_attempts
|
||||
).join_from(
|
||||
TableEpisodes, TableShows, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
reduce(operator.and_, missing_subtitles_clause)
|
||||
).order_by(
|
||||
TableEpisodes.rowid.desc()
|
||||
).paginate(
|
||||
int(page),
|
||||
page_size
|
||||
).objects()
|
||||
# path_replace
|
||||
data = database.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, "
|
||||
"table_episodes.title, table_episodes.missing_subtitles, table_episodes.sonarrSeriesId, "
|
||||
"table_episodes.path, table_shows.hearing_impaired, table_episodes.sonarrEpisodeId, "
|
||||
"table_episodes.scene_name, table_episodes.failedAttempts FROM table_episodes "
|
||||
"INNER JOIN table_shows on table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId "
|
||||
"WHERE table_episodes.missing_subtitles != '[]'" + monitored_only_query_string +
|
||||
" ORDER BY table_episodes._rowid_ DESC LIMIT ? OFFSET ?", (page_size, offset))
|
||||
|
||||
return template('wantedseries', bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page,
|
||||
max_page=max_page, base_url=base_url, page_size=page_size, current_port=settings.general.port)
|
||||
|
|
@ -1193,17 +1103,13 @@ def wantedseries():
|
|||
def wantedmovies():
|
||||
authorize()
|
||||
|
||||
missing_subtitles_clause = [
|
||||
(TableMovies.missing_subtitles != '[]')
|
||||
]
|
||||
if settings.radarr.getboolean('only_monitored'):
|
||||
missing_subtitles_clause.append(
|
||||
(TableMovies.monitored == 'True')
|
||||
)
|
||||
monitored_only_query_string = " AND monitored='True'"
|
||||
else:
|
||||
monitored_only_query_string = ''
|
||||
|
||||
missing_count = TableMovies.select().where(
|
||||
reduce(operator.and_, missing_subtitles_clause)
|
||||
).count()
|
||||
missing_count = database.execute("SELECT COUNT(*) FROM table_movies WHERE missing_subtitles != '[]'" +
|
||||
monitored_only_query_string)
|
||||
page = request.GET.page
|
||||
if page == "":
|
||||
page = "1"
|
||||
|
|
@ -1211,22 +1117,11 @@ def wantedmovies():
|
|||
offset = (int(page) - 1) * page_size
|
||||
max_page = int(math.ceil(missing_count / (page_size + 0.0)))
|
||||
|
||||
data = TableMovies.select(
|
||||
TableMovies.title,
|
||||
TableMovies.missing_subtitles,
|
||||
TableMovies.radarr_id,
|
||||
fn.path_substitution_movie(TableMovies.path).alias('path'),
|
||||
TableMovies.hearing_impaired,
|
||||
TableMovies.scene_name,
|
||||
TableMovies.failed_attempts
|
||||
).where(
|
||||
reduce(operator.and_, missing_subtitles_clause)
|
||||
).order_by(
|
||||
TableMovies.rowid.desc()
|
||||
).paginate(
|
||||
int(page),
|
||||
page_size
|
||||
).objects()
|
||||
# path_replace_movie
|
||||
data = database.execute("SELECT title, missing_subtitles, radarrId, path, hearing_impaired, sceneName, "
|
||||
"failedAttempts FROM table_movies WHERE missing_subtitles != '[]'" +
|
||||
monitored_only_query_string + " ORDER BY _rowid_ DESC LIMIT ? OFFSET ?",
|
||||
(page_size, offset))
|
||||
|
||||
return template('wantedmovies', bazarr_version=bazarr_version, rows=data,
|
||||
missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size,
|
||||
|
|
@ -1249,9 +1144,9 @@ def wanted_search_missing_subtitles_list():
|
|||
def _settings():
|
||||
authorize()
|
||||
|
||||
settings_languages = TableSettingsLanguages.select().order_by(TableSettingsLanguages.name)
|
||||
settings_languages = database.execute("SELECT * FROM table_settings_languages ORDER BY name")
|
||||
settings_providers = sorted(provider_manager.names())
|
||||
settings_notifier = TableSettingsNotifier.select().order_by(TableSettingsNotifier.name)
|
||||
settings_notifier = database.execute("SELECT * FROM table_settings_notifier ORDER BY name")
|
||||
|
||||
return template('settings', bazarr_version=bazarr_version, settings=settings, settings_languages=settings_languages,
|
||||
settings_providers=settings_providers, settings_notifier=settings_notifier, base_url=base_url,
|
||||
|
|
@ -1609,15 +1504,9 @@ def save_settings():
|
|||
settings.betaseries.token = request.forms.get('settings_betaseries_token')
|
||||
|
||||
settings_subliminal_languages = request.forms.getall('settings_subliminal_languages')
|
||||
TableSettingsLanguages.update({TableSettingsLanguages.enabled: 0}).execute()
|
||||
database.execute("UPDATE table_settings_languages (enabled) VALUES (0)")
|
||||
for item in settings_subliminal_languages:
|
||||
TableSettingsLanguages.update(
|
||||
{
|
||||
TableSettingsLanguages.enabled: 1
|
||||
}
|
||||
).where(
|
||||
TableSettingsLanguages.code2 == item
|
||||
).execute()
|
||||
database.execute("UPDATE table_settings_languages (enabled) VALUES (1) WHERE code2=?", (item,))
|
||||
|
||||
settings_serie_default_enabled = request.forms.get('settings_serie_default_enabled')
|
||||
if settings_serie_default_enabled is None:
|
||||
|
|
@ -1668,22 +1557,16 @@ def save_settings():
|
|||
|
||||
configure_logging(settings.general.getboolean('debug') or args.debug)
|
||||
|
||||
notifiers = TableSettingsNotifier.select().order_by(TableSettingsNotifier.name)
|
||||
notifiers = database.execute("SELECT * FROM table_settings_notifier ORDER BY name")
|
||||
for notifier in notifiers:
|
||||
enabled = request.forms.get('settings_notifier_' + notifier.name + '_enabled')
|
||||
enabled = request.forms.get('settings_notifier_' + notifier['name'] + '_enabled')
|
||||
if enabled == 'on':
|
||||
enabled = 1
|
||||
else:
|
||||
enabled = 0
|
||||
notifier_url = request.forms.get('settings_notifier_' + notifier.name + '_url')
|
||||
TableSettingsNotifier.update(
|
||||
{
|
||||
TableSettingsNotifier.enabled: enabled,
|
||||
TableSettingsNotifier.url: notifier_url
|
||||
}
|
||||
).where(
|
||||
TableSettingsNotifier.name == notifier.name
|
||||
).execute()
|
||||
notifier_url = request.forms.get('settings_notifier_' + notifier['name'] + '_url')
|
||||
database.execute("UPDATE table_settings_notifier (enabled, url) VALUES (?,?) WHERE name=?",
|
||||
(enabled,notifier_url,notifier['name']))
|
||||
|
||||
schedule_update_job()
|
||||
sonarr_full_update()
|
||||
|
|
@ -2132,86 +2015,59 @@ def configured():
|
|||
|
||||
@route(base_url + 'api/series/wanted')
|
||||
def api_wanted():
|
||||
data = TableEpisodes.select(
|
||||
TableShows.title.alias('seriesTitle'),
|
||||
TableEpisodes.season.cast('str').concat('x').concat(TableEpisodes.episode.cast('str')).alias('episode_number'),
|
||||
TableEpisodes.title.alias('episodeTitle'),
|
||||
TableEpisodes.missing_subtitles
|
||||
).join_from(
|
||||
TableEpisodes, TableShows, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableEpisodes.missing_subtitles != '[]'
|
||||
).order_by(
|
||||
TableEpisodes.sonarr_episode_id.desc()
|
||||
).limit(10).objects()
|
||||
data = database.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, "
|
||||
"table_episodes.title, table_episodes.missing_subtitles FROM table_episodes "
|
||||
"INNER JOIN table_shows on table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId "
|
||||
"WHERE table_episodes.missing_subtitles != '[]' ORDER BY table_episodes._rowid_ DESC "
|
||||
"LIMIT 10")
|
||||
|
||||
wanted_subs = []
|
||||
for item in data:
|
||||
wanted_subs.append([item.seriesTitle, item.episode_number, item.episodeTitle, item.missing_subtitles])
|
||||
wanted_subs.append([item['seriesTitle'], item['episode_number'], item['episodeTitle'], item['missing_subtitles']])
|
||||
|
||||
return dict(subtitles=wanted_subs)
|
||||
|
||||
|
||||
@route(base_url + 'api/series/history')
|
||||
def api_history():
|
||||
data = TableHistory.select(
|
||||
TableShows.title.alias('seriesTitle'),
|
||||
TableEpisodes.season.cast('str').concat('x').concat(TableEpisodes.episode.cast('str')).alias('episode_number'),
|
||||
TableEpisodes.title.alias('episodeTitle'),
|
||||
fn.strftime('%Y-%m-%d', fn.datetime(TableHistory.timestamp, 'unixepoch')).alias('date'),
|
||||
TableHistory.description
|
||||
).join_from(
|
||||
TableHistory, TableShows, JOIN.LEFT_OUTER
|
||||
).join_from(
|
||||
TableHistory, TableEpisodes, JOIN. LEFT_OUTER
|
||||
).where(
|
||||
TableHistory.action != '0'
|
||||
).order_by(
|
||||
TableHistory.id.desc()
|
||||
).limit(10).objects()
|
||||
data = database.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, "
|
||||
"table_episodes.title, strftime('%Y-%m-%d', "
|
||||
"datetime(table_history.timestamp, 'unixepoch')), table_history.description "
|
||||
"FROM table_history "
|
||||
"INNER JOIN table_shows on table_shows.sonarrSeriesId = table_history.sonarrSeriesId "
|
||||
"INNER JOIN table_episodes on table_episodes.sonarrEpisodeId = table_history.sonarrEpisodeId "
|
||||
"WHERE table_history.action != '0' ORDER BY id DESC LIMIT 10")
|
||||
|
||||
history_subs = []
|
||||
for item in data:
|
||||
history_subs.append([item.seriesTitle, item.episode_number, item.episodeTitle, item.date, item.description])
|
||||
history_subs.append([item['seriesTitle'], item['episode_number'], item['episodeTitle'], item['date'], item['description']])
|
||||
|
||||
return dict(subtitles=history_subs)
|
||||
|
||||
|
||||
@route(base_url + 'api/movies/wanted')
|
||||
def api_wanted():
|
||||
data = TableMovies.select(
|
||||
TableMovies.title,
|
||||
TableMovies.missing_subtitles
|
||||
).where(
|
||||
TableMovies.missing_subtitles != '[]'
|
||||
).order_by(
|
||||
TableMovies.radarr_id.desc()
|
||||
).limit(10).objects()
|
||||
data = database.execute("SELECT table_movies.title, table_movies.missing_subtitles FROM table_movies "
|
||||
"WHERE table_movies.missing_subtitles != '[]' ORDER BY table_movies._rowid_ DESC LIMIT 10")
|
||||
|
||||
wanted_subs = []
|
||||
for item in data:
|
||||
wanted_subs.append([item.title, item.missing_subtitles])
|
||||
wanted_subs.append([item['title'], item['missing_subtitles']])
|
||||
|
||||
return dict(subtitles=wanted_subs)
|
||||
|
||||
|
||||
@route(base_url + 'api/movies/history')
|
||||
def api_history():
|
||||
data = TableHistoryMovie.select(
|
||||
TableMovies.title,
|
||||
fn.strftime('%Y-%m-%d', fn.datetime(TableHistoryMovie.timestamp, 'unixepoch')).alias('date'),
|
||||
TableHistoryMovie.description
|
||||
).join_from(
|
||||
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
|
||||
).where(
|
||||
TableHistoryMovie.action != '0'
|
||||
).order_by(
|
||||
TableHistoryMovie.id.desc()
|
||||
).limit(10).objects()
|
||||
data = database.execute("SELECT table_movies.title, strftime('%Y-%m-%d', "
|
||||
"datetime(table_history_movie.timestamp, 'unixepoch')), table_history_movie.description "
|
||||
"FROM table_history_movie "
|
||||
"INNER JOIN table_movies on table_movies.radarrId = table_history_movie.radarrId "
|
||||
"WHERE table_history_movie.action != '0' ORDER BY id DESC LIMIT 10")
|
||||
|
||||
history_subs = []
|
||||
for item in data:
|
||||
history_subs.append([item.title, item.date, item.description])
|
||||
history_subs.append([item['title'], item['date'], item['description']])
|
||||
|
||||
return dict(subtitles=history_subs)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue