From 266ddbb9db9ff9545494d749fc17226097ff54dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Thu, 22 Aug 2019 14:13:48 -0400
Subject: [PATCH] Continuing development.

---
 bazarr/get_subtitle.py | 14 ++++++++------
 bazarr/main.py         |  8 +++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bazarr/get_subtitle.py b/bazarr/get_subtitle.py
index 3373a3ace..f72314cdc 100644
--- a/bazarr/get_subtitle.py
+++ b/bazarr/get_subtitle.py
@@ -690,8 +690,8 @@ def wanted_download_subtitles(path, l, count_episodes):
     ).join_from(
         TableEpisodes, TableShows, JOIN.LEFT_OUTER
     ).where(
-        TableEpisodes.path == path_replace_reverse(path) &
-        TableEpisodes.missing_subtitles != '[]'
+        (TableEpisodes.path == path_replace_reverse(path)) &
+        (TableEpisodes.missing_subtitles != '[]')
     ).objects()
     
     providers_list = get_providers()
@@ -759,8 +759,8 @@ def wanted_download_subtitles_movie(path, l, count_movies):
         TableMovies.title,
         TableMovies.forced
     ).where(
-        TableMovies.path == path_replace_reverse_movie(path) &
-        TableMovies.missing_subtitles != '[]'
+        (TableMovies.path == path_replace_reverse_movie(path)) &
+        (TableMovies.missing_subtitles != '[]')
     )
     
     providers_list = get_providers()
@@ -1017,7 +1017,8 @@ def upgrade_subtitles():
         ).join_from(
             TableHistory, TableEpisodes, JOIN.LEFT_OUTER
         ).where(
-            TableHistory.action.in_(query_actions) & TableHistory.score.is_null(False)
+            (TableHistory.action.in_(query_actions)) &
+            (TableHistory.score.is_null(False))
         ).group_by(
             TableHistory.video_path,
             TableHistory.language
@@ -1054,7 +1055,8 @@ def upgrade_subtitles():
         ).join_from(
             TableHistoryMovie, TableMovies, JOIN.LEFT_OUTER
         ).where(
-            TableHistoryMovie.action.in_(query_actions) & TableHistoryMovie.score.is_null(False)
+            (TableHistoryMovie.action.in_(query_actions)) & 
+            (TableHistoryMovie.score.is_null(False))
         ).group_by(
             TableHistoryMovie.video_path,
             TableHistoryMovie.language
diff --git a/bazarr/main.py b/bazarr/main.py
index e3a366b9f..cfa14f71c 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -1133,7 +1133,7 @@ def historyseries():
     stats = TableHistory.select(
         TableHistory.timestamp
     ).where(
-        TableHistory.action | 0
+        TableHistory.action != 0
     )
     total = len(stats)
     for stat in stats:
@@ -1185,7 +1185,8 @@ def historyseries():
             fn.MAX(TableHistory.timestamp).alias('timestamp'),
             TableHistory.score
         ).where(
-            TableHistory.action.in_(query_actions) & TableHistory.score.is_null(False)
+            (TableHistory.action.in_(query_actions)) & 
+            (TableHistory.score.is_null(False))
         ).group_by(
             TableHistory.video_path,
             TableHistory.language
@@ -1275,7 +1276,8 @@ def historymovies():
             fn.MAX(TableHistoryMovie.timestamp).alias('timestamp'),
             TableHistoryMovie.score
         ).where(
-            TableHistoryMovie.action.in_(query_actions) & TableHistoryMovie.score.is_null(False)
+            (TableHistoryMovie.action.in_(query_actions)) & 
+            (TableHistoryMovie.score.is_null(False))
         ).group_by(
             TableHistoryMovie.video_path,
             TableHistoryMovie.language