mirror of
https://github.com/notherealmarco/WASAPhoto.git
synced 2025-03-14 14:16:15 +01:00
Merge branch 'main' into dev
This commit is contained in:
commit
0402e2fd84
3 changed files with 12 additions and 3 deletions
6
.vscode/launch.json
vendored
6
.vscode/launch.json
vendored
|
@ -12,9 +12,9 @@
|
||||||
"mode": "auto",
|
"mode": "auto",
|
||||||
"buildFlags": "-tags webui",
|
"buildFlags": "-tags webui",
|
||||||
"program": "./cmd/webapi",
|
"program": "./cmd/webapi",
|
||||||
"args": [
|
//"args": [
|
||||||
"--db-filename", "/home/marco/wasa/wasadata/wasaphoto.db", "--data-path", "/home/marco/wasa/wasadata/data"
|
// "--db-filename", "/home/marco/wasa/wasadata/wasaphoto.db", "--data-path", "/home/marco/wasa/wasadata/data"
|
||||||
]
|
//]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -81,6 +81,12 @@ func run() error {
|
||||||
|
|
||||||
logger.Infof("application initializing")
|
logger.Infof("application initializing")
|
||||||
|
|
||||||
|
// Create the directories if they don't exist
|
||||||
|
if err := os.MkdirAll(cfg.Data.Path, 0755); err != nil {
|
||||||
|
logger.WithError(err).Error("error creating data directory")
|
||||||
|
return fmt.Errorf("creating data directory: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
// Start Database
|
// Start Database
|
||||||
logger.Println("initializing database support")
|
logger.Println("initializing database support")
|
||||||
dbconn, err := sql.Open("sqlite3", cfg.DB.Filename)
|
dbconn, err := sql.Open("sqlite3", cfg.DB.Filename)
|
||||||
|
@ -120,6 +126,8 @@ func run() error {
|
||||||
logger.WithError(err).Error("error creating the API server instance")
|
logger.WithError(err).Error("error creating the API server instance")
|
||||||
return fmt.Errorf("creating the API server instance: %w", err)
|
return fmt.Errorf("creating the API server instance: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
router := apirouter.Handler()
|
router := apirouter.Handler()
|
||||||
|
|
||||||
router, err = registerWebUI(router)
|
router, err = registerWebUI(router)
|
||||||
|
|
|
@ -100,6 +100,7 @@ func New(db *sql.DB) (AppDatabase, error) {
|
||||||
//todo: check for all the tables, not just users
|
//todo: check for all the tables, not just users
|
||||||
err := db.QueryRow(`SELECT name FROM sqlite_master WHERE type='table' AND name='users';`).Scan(&tableName)
|
err := db.QueryRow(`SELECT name FROM sqlite_master WHERE type='table' AND name='users';`).Scan(&tableName)
|
||||||
if errors.Is(err, sql.ErrNoRows) {
|
if errors.Is(err, sql.ErrNoRows) {
|
||||||
|
//fmt.Println("database is empty, creating structure")
|
||||||
sqlStmt := `CREATE TABLE "users" (
|
sqlStmt := `CREATE TABLE "users" (
|
||||||
"uid" TEXT NOT NULL,
|
"uid" TEXT NOT NULL,
|
||||||
"name" TEXT NOT NULL UNIQUE,
|
"name" TEXT NOT NULL UNIQUE,
|
||||||
|
|
Loading…
Reference in a new issue