Fix #149: honor THINGSDB before database discovery

tests/test_database_filepath.py

@@ -0,0 +1,30 @@
+"""Tests for resolving the Things database path."""
+
+import os
+from unittest import mock
+
+from things import database
+
+
+def test_explicit_thingsdb_bypasses_directory_discovery():
+    configured_path = "/tmp/Things Database.thingsdatabase/main.sqlite"
+
+    with mock.patch.dict(os.environ, {"THINGSDB": configured_path}):
+        with mock.patch.object(database.glob, "iglob") as discovery:
+            result = database.resolve_default_filepath()
+
+    assert result == configured_path
+    discovery.assert_not_called()
+
+
+def test_database_discovery_is_used_without_thingsdb():
+    discovered_path = "/tmp/ThingsData-test/Things Database.thingsdatabase/main.sqlite"
+
+    with mock.patch.dict(os.environ, {}, clear=True):
+        with mock.patch.object(
+            database.glob, "iglob", return_value=iter([discovered_path])
+        ) as discovery:
+            result = database.resolve_default_filepath()
+
+    assert result == discovered_path
+    discovery.assert_called_once()

things/database.py

@@ -28,13 +28,25 @@
     "/Things Database.thingsdatabase/main.sqlite"
 )
 
-try:
-    DEFAULT_FILEPATH = next(glob.iglob(os.path.expanduser(DEFAULT_FILEPATH_31616502)))
-except StopIteration:
-    DEFAULT_FILEPATH = os.path.expanduser(DEFAULT_FILEPATH_31516502)
-
 ENVIRONMENT_VARIABLE_WITH_FILEPATH = "THINGSDB"
 
+
+def resolve_default_filepath():
+    """Resolve the database path, preferring an explicit environment override."""
+    configured_filepath = os.getenv(ENVIRONMENT_VARIABLE_WITH_FILEPATH)
+    if configured_filepath:
+        return os.path.expanduser(configured_filepath)
+
+    try:
+        return next(
+            glob.iglob(os.path.expanduser(DEFAULT_FILEPATH_31616502))
+        )
+    except StopIteration:
+        return os.path.expanduser(DEFAULT_FILEPATH_31516502)
+
+
+DEFAULT_FILEPATH = resolve_default_filepath()
+
 # Translate app language to database language
 
 START_TO_FILTER = {