1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-27 10:07:22 +00:00

Continuing development.

This commit is contained in:
Louis Vézina 2019-08-22 14:13:48 -04:00
parent 47dd76fced
commit 266ddbb9db
2 changed files with 13 additions and 9 deletions

View file

@ -690,8 +690,8 @@ def wanted_download_subtitles(path, l, count_episodes):
).join_from( ).join_from(
TableEpisodes, TableShows, JOIN.LEFT_OUTER TableEpisodes, TableShows, JOIN.LEFT_OUTER
).where( ).where(
TableEpisodes.path == path_replace_reverse(path) & (TableEpisodes.path == path_replace_reverse(path)) &
TableEpisodes.missing_subtitles != '[]' (TableEpisodes.missing_subtitles != '[]')
).objects() ).objects()
providers_list = get_providers() providers_list = get_providers()
@ -759,8 +759,8 @@ def wanted_download_subtitles_movie(path, l, count_movies):
TableMovies.title, TableMovies.title,
TableMovies.forced TableMovies.forced
).where( ).where(
TableMovies.path == path_replace_reverse_movie(path) & (TableMovies.path == path_replace_reverse_movie(path)) &
TableMovies.missing_subtitles != '[]' (TableMovies.missing_subtitles != '[]')
) )
providers_list = get_providers() providers_list = get_providers()
@ -1017,7 +1017,8 @@ def upgrade_subtitles():
).join_from( ).join_from(
TableHistory, TableEpisodes, JOIN.LEFT_OUTER TableHistory, TableEpisodes, JOIN.LEFT_OUTER
).where( ).where(
TableHistory.action.in_(query_actions) & TableHistory.score.is_null(False) (TableHistory.action.in_(query_actions)) &
(TableHistory.score.is_null(False))
).group_by( ).group_by(
TableHistory.video_path, TableHistory.video_path,
TableHistory.language TableHistory.language
@ -1054,7 +1055,8 @@ def upgrade_subtitles():
).join_from( ).join_from(
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
).where( ).where(
TableHistoryMovie.action.in_(query_actions) & TableHistoryMovie.score.is_null(False) (TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
).group_by( ).group_by(
TableHistoryMovie.video_path, TableHistoryMovie.video_path,
TableHistoryMovie.language TableHistoryMovie.language

View file

@ -1133,7 +1133,7 @@ def historyseries():
stats = TableHistory.select( stats = TableHistory.select(
TableHistory.timestamp TableHistory.timestamp
).where( ).where(
TableHistory.action | 0 TableHistory.action != 0
) )
total = len(stats) total = len(stats)
for stat in stats: for stat in stats:
@ -1185,7 +1185,8 @@ def historyseries():
fn.MAX(TableHistory.timestamp).alias('timestamp'), fn.MAX(TableHistory.timestamp).alias('timestamp'),
TableHistory.score TableHistory.score
).where( ).where(
TableHistory.action.in_(query_actions) & TableHistory.score.is_null(False) (TableHistory.action.in_(query_actions)) &
(TableHistory.score.is_null(False))
).group_by( ).group_by(
TableHistory.video_path, TableHistory.video_path,
TableHistory.language TableHistory.language
@ -1275,7 +1276,8 @@ def historymovies():
fn.MAX(TableHistoryMovie.timestamp).alias('timestamp'), fn.MAX(TableHistoryMovie.timestamp).alias('timestamp'),
TableHistoryMovie.score TableHistoryMovie.score
).where( ).where(
TableHistoryMovie.action.in_(query_actions) & TableHistoryMovie.score.is_null(False) (TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
).group_by( ).group_by(
TableHistoryMovie.video_path, TableHistoryMovie.video_path,
TableHistoryMovie.language TableHistoryMovie.language