3.0.2 (#44) (#45)

* Do not include file name in creating db path

* Add db tests

* Use consts for env vars

* Formatting

* Only check if the path exists

* Improve test

* Format tests

Author: NickM-27

Makefile

@@ -1,7 +1,7 @@
 default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
-VERSION = 3.0.1
+VERSION = 3.0.2
 
 local:
 	cd web; flutter build web;

swatch/app.py

@@ -12,7 +12,7 @@
 from playhouse.sqliteq import SqliteQueueDatabase
 
 from swatch.config import SwatchConfig
-from swatch.const import CONST_CONFIG_FILE, CONST_DB_FILE
+from swatch.const import CONST_CONFIG_FILE, CONST_DB_FILE, ENV_CONFIG, ENV_DB
 from swatch.http import create_app
 from swatch.image import ImageProcessor
 from swatch.detection import AutoDetector, DetectionCleanup
@@ -52,7 +52,7 @@ def __init_config__(self) -> None:
         """Init SwatchApp with saved config file."""
         logger.info("Importing SwatchApp Config")
 
-        config_file = os.environ.get("CONFIG_FILE", CONST_CONFIG_FILE)
+        config_file: str = os.environ.get(ENV_CONFIG, CONST_CONFIG_FILE)
 
         if os.path.isfile(config_file):
             logger.info("Verified SwatchApp Config")
@@ -62,11 +62,12 @@ def __init_config__(self) -> None:
 
     def __init_db__(self):
         """Init the Swatch database."""
-        db_file = os.environ.get("DB_FILE", CONST_DB_FILE)
+        db_file: str = os.environ.get(ENV_DB, CONST_DB_FILE)
+        db_path = db_file[: db_file.rfind("/")]
 
-        if not os.path.exists(db_file):
-            logger.debug("%s doesn't exist, creating...", db_file)
-            os.makedirs(db_file)
+        if not os.path.exists(db_path):
+            logger.debug("%s doesn't exist, creating...", db_path)
+            os.makedirs(db_path)
 
         swatch_db = SqliteExtDatabase(db_file)
 

swatch/const.py

@@ -1,5 +1,12 @@
 """Constants."""
 
+### File * Path Vars
+
 CONST_CONFIG_FILE = "/config/config.yaml"
 CONST_DB_FILE = "/database/swatch.db"
 CONST_MEDIA_DIR = "/media"
+
+### Env Vars
+
+ENV_CONFIG = "CONFIG_FILE"
+ENV_DB = "DB_FILE"

tests/test_app.py

@@ -0,0 +1,24 @@
+"""Tests for SwatchApp"""
+
+import os
+import unittest
+
+from swatch.app import SwatchApp
+
+
+class TestApp(unittest.TestCase):
+    """Testing the configuration is parsed correctly."""
+
+    def setUp(self) -> None:
+        """setup simple"""
+        self.db_path = "/media/databases/"
+        self.db_file = "/media/databases/swatch.db"
+
+    def test_db_created(self) -> None:
+        """Test that the db is created and path is as expected."""
+        app = SwatchApp()
+        assert not os.path.exists(self.db_file)
+        os.environ["DB_FILE"] = self.db_file
+        app.__init_db__()
+        assert os.path.exists(self.db_path)
+        assert os.path.isfile(self.db_file)

tests/test_image.py

@@ -1,12 +1,11 @@
-"""Tests for SwatchConfig"""
+"""Tests for SwatchImage"""
 
-import datetime
 import unittest
 
 from swatch.config import SwatchConfig
 
 
-class TestConfig(unittest.TestCase):
+class TestImage(unittest.TestCase):
     """Testing the configuration is parsed correctly."""
 
     def setUp(self) -> None: