From f613dd9f27b0e0d55740e7801960f44333215e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Sun, 20 Oct 2019 09:42:25 -0400
Subject: [PATCH] Fix for DB.

---
 bazarr/database.py | 86 ++++++++++++++++++++++++++--------------------
 bazarr/init.py     |  4 +++
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/bazarr/database.py b/bazarr/database.py
index 9adfd0f10..46ab691a8 100644
--- a/bazarr/database.py
+++ b/bazarr/database.py
@@ -9,18 +9,13 @@ from playhouse.migrate import *
 from helper import path_replace, path_replace_movie, path_replace_reverse, path_replace_reverse_movie
 
 database = SqliteQueueDatabase(
-    os.path.join(args.config_dir, 'db', 'bazarr.db'),
+    None,
     use_gevent=False,
-    autostart=True,
+    autostart=False,
     queue_max_size=256,  # Max. # of pending writes that can accumulate.
     results_timeout=30.0  # Max. time to wait for query to be executed.
 )
 
-database.pragma('wal_checkpoint', 'TRUNCATE')  # Run a checkpoint and merge remaining wal-journal.
-database.cache_size = -1024  # Number of KB of cache for wal-journal.
-                             # Must be negative because positive means number of pages.
-database.wal_autocheckpoint = 50  # Run an automatic checkpoint every 50 write transactions.
-
 
 @database.func('path_substitution')
 def path_substitution(path):
@@ -176,37 +171,52 @@ class TableSettingsNotifier(BaseModel):
         table_name = 'table_settings_notifier'
 
 
-# Database tables creation if they don't exists
-models_list = [TableShows, TableEpisodes, TableMovies, TableHistory, TableHistoryMovie, TableSettingsLanguages,
-               TableSettingsNotifier, System]
-database.create_tables(models_list, safe=True)
-
-
-# Database migration
-migrator = SqliteMigrator(database)
-
-# TableShows migration
-table_shows_columns = []
-for column in database.get_columns('table_shows'):
-    table_shows_columns.append(column.name)
-if 'forced' not in table_shows_columns:
-    migrate(migrator.add_column('table_shows', 'forced', TableShows.forced))
-
-# TableEpisodes migration
-table_episodes_columns = []
-for column in database.get_columns('table_episodes'):
-    table_episodes_columns.append(column.name)
-if 'episode_file_id' not in table_episodes_columns:
-    migrate(migrator.add_column('table_episodes', 'episode_file_id', TableEpisodes.episode_file_id))
-
-# TableMovies migration
-table_movies_columns = []
-for column in database.get_columns('table_movies'):
-    table_movies_columns.append(column.name)
-if 'forced' not in table_movies_columns:
-    migrate(migrator.add_column('table_movies', 'forced', TableMovies.forced))
-if 'movie_file_id' not in table_movies_columns:
-    migrate(migrator.add_column('table_movies', 'movie_file_id', TableMovies.movie_file_id))
+def database_init():
+    database.init(os.path.join(args.config_dir, 'db', 'bazarr.db'))
+    database.start()
+    database.connect()
+
+    database.pragma('wal_checkpoint', 'TRUNCATE')  # Run a checkpoint and merge remaining wal-journal.
+    database.cache_size = -1024  # Number of KB of cache for wal-journal.
+                                 # Must be negative because positive means number of pages.
+    database.wal_autocheckpoint = 50  # Run an automatic checkpoint every 50 write transactions.
+
+    # Database tables creation if they don't exists
+    models_list = [TableShows, TableEpisodes, TableMovies, TableHistory, TableHistoryMovie, TableSettingsLanguages,
+                   TableSettingsNotifier, System]
+
+    database.create_tables(models_list, safe=True)
+
+    # Upgrade DB schema
+    database_upgrade()
+
+
+def database_upgrade():
+    # Database migration
+    migrator = SqliteMigrator(database)
+
+    # TableShows migration
+    table_shows_columns = []
+    for column in database.get_columns('table_shows'):
+        table_shows_columns.append(column.name)
+    if 'forced' not in table_shows_columns:
+        migrate(migrator.add_column('table_shows', 'forced', TableShows.forced))
+
+    # TableEpisodes migration
+    table_episodes_columns = []
+    for column in database.get_columns('table_episodes'):
+        table_episodes_columns.append(column.name)
+    if 'episode_file_id' not in table_episodes_columns:
+        migrate(migrator.add_column('table_episodes', 'episode_file_id', TableEpisodes.episode_file_id))
+
+    # TableMovies migration
+    table_movies_columns = []
+    for column in database.get_columns('table_movies'):
+        table_movies_columns.append(column.name)
+    if 'forced' not in table_movies_columns:
+        migrate(migrator.add_column('table_movies', 'forced', TableMovies.forced))
+    if 'movie_file_id' not in table_movies_columns:
+        migrate(migrator.add_column('table_movies', 'movie_file_id', TableMovies.movie_file_id))
 
 
 def wal_cleaning():
diff --git a/bazarr/init.py b/bazarr/init.py
index 552848bb7..e76b0c80f 100644
--- a/bazarr/init.py
+++ b/bazarr/init.py
@@ -11,6 +11,7 @@ from config import settings
 from check_update import check_releases
 from get_args import args
 from utils import get_binary
+from database import database_init
 
 from dogpile.cache.region import register_backend as register_cache_backend
 import subliminal
@@ -54,6 +55,9 @@ if not os.path.exists(os.path.join(args.config_dir, 'cache')):
     os.mkdir(os.path.join(args.config_dir, 'cache'))
     logging.debug("BAZARR Created cache folder")
 
+# Initiate database
+database_init()
+
 # Configure dogpile file caching for Subliminal request
 register_cache_backend("subzero.cache.file", "subzero.cache_backends.file", "SZFileBackend")
 subliminal.region.configure('subzero.cache.file', expiration_time=datetime.timedelta(days=30),