mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-02-24 06:50:51 +00:00
Code Issues Releases Wiki Activity

Continuing development.

Browse source
This commit is contained in:
Louis Vézina 2019-08-29 20:16:11 -04:00
parent 97fba153f5
commit c8850509d7
2 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bazarr/get_subtitle.py
View file

@ -1057,6 +1057,27 @@ def upgrade_subtitles():
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')
)
movies_details_clause = [
(TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
]
if settings.radarr.getboolean('only_monitored'):
movies_details_clause.append(
(TableMovies.monitored == 'True')
)
if settings.general.getboolean('use_sonarr'):
upgradable_episodes = TableHistory.select(
TableHistory.video_path,
@ -1075,8 +1096,7 @@ def upgrade_subtitles():
).join_from(
TableHistory, TableEpisodes, JOIN.LEFT_OUTER
).where(
(TableHistory.action.in_(query_actions)) &
(TableHistory.score.is_null(False))
reduce(operator.and_, episodes_details_clause)
).group_by(
TableHistory.video_path,
TableHistory.language
@ -1113,8 +1133,7 @@ def upgrade_subtitles():
).join_from(
TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
).where(
(TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
reduce(operator.and_, movies_details_clause)
).group_by(
TableHistoryMovie.video_path,
TableHistoryMovie.language

30
bazarr/main.py
View file

@ -1181,13 +1181,24 @@ 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')
)
upgradable_episodes = TableHistory.select(
TableHistory.video_path,
fn.MAX(TableHistory.timestamp).alias('timestamp'),
TableHistory.score
).join_from(
TableHistory, TableEpisodes, JOIN.LEFT_OUTER
).where(
(TableHistory.action.in_(query_actions)) &
(TableHistory.score.is_null(False))
reduce(operator.and_, episodes_details_clause)
).group_by(
TableHistory.video_path,
TableHistory.language
@ -1272,13 +1283,24 @@ def historymovies():
else:
query_actions = [1, 3]
movies_details_clause = [
(TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
]
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(
(TableHistoryMovie.action.in_(query_actions)) &
(TableHistoryMovie.score.is_null(False))
reduce(operator.and_, movies_details_clause)
).group_by(
TableHistoryMovie.video_path,
TableHistoryMovie.language