From b03cf48eb2074ef41ced9d59712b005a127c17bf Mon Sep 17 00:00:00 2001 From: "Gabriel A. Giovanini" Date: Tue, 26 Jul 2022 01:08:03 +0200 Subject: feat: Add necessary param for packing Datadir parameter will make easier for later to create the apk. --- build.yml | 5 +++-- db/db.go | 8 ++++++-- main.go | 13 ++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/build.yml b/build.yml index efb5f50..4917a59 100644 --- a/build.yml +++ b/build.yml @@ -13,13 +13,14 @@ secrets: environment: deploy: builds@gabrielgio.me target: artifacts.gabrielgio.me/midr/ + version: v0.1.1 tasks: - archive: | cd midr git archive \ - -o midr-v0.1.0.tar.gz \ - --prefix=midr-v0.1.0/ HEAD + -o midr-$version.tar.gz \ + --prefix=midr-$version/ HEAD - deploy: | cd midr diff --git a/db/db.go b/db/db.go index 948f154..4728aa7 100644 --- a/db/db.go +++ b/db/db.go @@ -1,6 +1,8 @@ package db import ( + "path" + "gorm.io/driver/sqlite" "gorm.io/gorm" ) @@ -10,8 +12,10 @@ var ( err error ) -func ConnectDb() { - DB, err = gorm.Open(sqlite.Open("main.db"), &gorm.Config{}) +func ConnectDb(folder string) { + dbPath := path.Join(folder, "main.db") + + DB, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{}) if err != nil { panic("failed to connect to the database.") diff --git a/main.go b/main.go index c763c5a..247d751 100644 --- a/main.go +++ b/main.go @@ -2,19 +2,30 @@ package main import ( "embed" + "flag" "fmt" "git.sr.ht/~gabrielgio/midr/db" "git.sr.ht/~gabrielgio/midr/routes" + "github.com/gin-gonic/gin" ) var Version = "development" +var dataDir = flag.String("d", ".", "Folder where midr will store the data") +var production = flag.Bool("p", false, "Set production") //go:embed assets/* templates/* var f embed.FS func main() { + flag.Parse() fmt.Println("Version:\t", Version) - db.ConnectDb() + fmt.Println("Datadir:\t", *dataDir) + + if *production { + gin.SetMode(gin.ReleaseMode) + } + + db.ConnectDb(*dataDir) routes.HandleRequests(f) } -- cgit v1.2.3