summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Gotsche <n@softwarefools.com>2018-02-01 03:49:51 +0100
committerNikolaus Gotsche <n@softwarefools.com>2018-02-01 03:49:51 +0100
commit7cf0edaf7fed5da03c691e7b3dd0e9592b55f890 (patch)
tree22dcaf985345135e8cfd3495bca7e0666a2f988b
parente3f7e1135d4f3f950a0933e0a26d47f34f148cf3 (diff)
new .db file be obend as argument
-rw-r--r--main.go28
-rw-r--r--sqlite.go4
2 files changed, 27 insertions, 5 deletions
diff --git a/main.go b/main.go
index 0d73a7a..488e2b3 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
import (
"fmt"
"flag"
+ "path/filepath"
_ "log"
//"bufio"
"os"
@@ -92,11 +93,30 @@ func stdOut() {
}
func main() {
+ fmt.Println("Laboravi Started")
+ dbname := "./.mytimes.db"
if len(flag.Args())>0 {
- fmt.Println("Unknown Commands: ",flag.Args())
+
+ aar := flag.Args()
+ var uar []string
+ haveone := false
+ for _,car := range aar {
+ if filepath.Ext(car) == ".db" {
+ if haveone {
+ fmt.Println("Only One DB Allowed! Will ignore",car)
+ } else {
+ dbname=car
+ haveone=true
+ }
+ }else{
+ uar = append(uar,car)
+ }
+ }
+ if len(uar)>0 {
+ fmt.Println("Unknown Commands: ",uar)
+ }
}
- fmt.Println("Laboravi Started")
- initDB("./.mytimes.db")
+ initDB(dbname)
getLastProject()
//getProjects()
getOpenTask()
@@ -116,6 +136,7 @@ func main() {
addCustomer()
os.Exit(0)
} else if newtask {
+ showLastProject()
newTask(projectid)
stdOut()
//showLastProject()
@@ -129,6 +150,7 @@ func main() {
//getClosedTasks(0)
//showOpenTask()
} else if (starttime != "now") {
+ showLastProject()
newTaskTime(projectid,starttime)
os.Exit(0)
} else if (stoptime != "now") {
diff --git a/sqlite.go b/sqlite.go
index 12cfc93..8874e80 100644
--- a/sqlite.go
+++ b/sqlite.go
@@ -41,7 +41,7 @@ func initDB(filename string) {
if _, err := os.Stat(filename); os.IsNotExist(err) {
db, err = sql.Open("sqlite3", filename)
checkErr(err)
- fmt.Println("Creating new DB")
+ fmt.Println("Creating new DB",filename)
sqlstmt := `
CREATE TABLE projects(
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -69,7 +69,7 @@ func initDB(filename string) {
}else{
db, err = sql.Open("sqlite3", filename)
checkErr(err)
- fmt.Println("Opening DB")
+ fmt.Println("Opening DB",filename)
}
}