Merge branch 'master' into lash/gettext

2025-01-04 09:59:26 +00:00
parent 9013cc3618 47b5ff0435
commit 349051b5ef
19 changed files with 448 additions and 356 deletions
--- a/internal/storage/db/gdbm/gdbm.go
+++ b/internal/storage/db/gdbm/gdbm.go
@@ -6,6 +6,11 @@ import (
 	"git.defalsify.org/vise.git/db"
 	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
 	"git.defalsify.org/vise.git/lang"
+	"git.defalsify.org/vise.git/logging"
+)
+
+var (
+	logg = logging.NewVanilla().WithDomain("gdbmstorage")
 )

 var (
--- a/internal/storage/db/sub_prefix_db.go
+++ b/internal/storage/db/sub_prefix_db.go
--- a/internal/storage/db/sub_prefix_db_test.go
+++ b/internal/storage/db/sub_prefix_db_test.go
--- a/internal/storage/storageservice.go
+++ b/internal/storage/storageservice.go
@@ -14,6 +14,7 @@ import (
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/initializers"
+	gdbmstorage "git.grassecon.net/urdt/ussd/internal/storage/db/gdbm"
 )

 var (
@@ -99,7 +100,7 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
 		connStr := buildConnStr()
 		err = newDb.Connect(ctx, connStr)
 	} else {
-		newDb = NewThreadGdbmDb()
+		newDb = gdbmstorage.NewThreadGdbmDb()
 		storeFile := path.Join(ms.dbDir, fileName)
 		err = newDb.Connect(ctx, storeFile)
 	}