melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update imports to use new db package

Browse Source
This commit is contained in:
mkelvers
2026-05-06 23:13:43 +02:00
parent 9cefb39d01
commit 7f768080ee
14 changed files with 80 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/server/main.go
View File

@@ -14,7 +14,7 @@ import (
"mal/api/auth"
"mal/integrations/jikan"
"mal/internal/db/sqlite"
"mal/internal/db"
"mal/internal/server"
"mal/internal/worker"
"mal/pkg/middleware"
@@ -23,13 +23,13 @@ import (
func main() {
_ = godotenv.Load()
db, err := sqlite.Open(sqlite.GetDBFile())
dbConn, err := db.Open(db.GetDBFile())
if err != nil {
log.Fatalf("failed to open db: %v", err)
}
defer db.Close()
defer dbConn.Close()
queries, err := sqlite.Init(db)
queries, err := db.Init(dbConn)
if err != nil {
log.Fatalf("failed to initialize database: %v", err)
}
@@ -43,7 +43,7 @@ func main() {
app := server.Config{
DB: queries,
SQLDB: db,
SQLDB: dbConn,
JikanClient: jikanClient,
AuthService: auth.NewService(queries),
PlaybackProxySecret: playbackSecret(),

12
cmd/user/main.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
"mal/internal/db/sqlite"
"mal/internal/db"
)
func main() {
@@ -21,14 +21,14 @@ func main() {
username := os.Args[1]
password := os.Args[2]
db, err := sqlite.Open(sqlite.GetDBFile())
dbConn, err := db.Open(db.GetDBFile())
if err != nil {
log.Fatalf("failed to open db: %v", err)
}
defer db.Close()
defer dbConn.Close()
var existingID string
err = db.QueryRow("SELECT id FROM user WHERE username = ?", username).Scan(&existingID)
err = dbConn.QueryRow("SELECT id FROM user WHERE username = ?", username).Scan(&existingID)
if err != nil && err != sql.ErrNoRows {
log.Fatalf("database error: %v", err)
}
@@ -49,7 +49,7 @@ func main() {
log.Fatalf("failed to hash password: %v", err)
}
_, err = db.Exec("UPDATE user SET password_hash = ? WHERE id = ?", string(hash), existingID)
_, err = dbConn.Exec("UPDATE user SET password_hash = ? WHERE id = ?", string(hash), existingID)
if err != nil {
log.Fatalf("failed to update user: %v", err)
}
@@ -64,7 +64,7 @@ func main() {
}
id := uuid.New().String()
_, err = db.Exec("INSERT INTO user (id, username, password_hash) VALUES (?, ?, ?)", id, username, string(hash))
_, err = dbConn.Exec("INSERT INTO user (id, username, password_hash) VALUES (?, ?, ?)", id, username, string(hash))
if err != nil {
log.Fatalf("failed to create user: %v", err)
}