Version handling from file

2023-12-28 07:47:23 +01:00 · 2023-12-28 07:47:23 +01:00 · 392aff5956
commit 392aff5956
parent ac58fa0fc8
4 changed files with 148 additions and 115 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1,24 @@
+Create a configuration file `$HOME/.config/notes.yaml` with the following content:
+
+```yaml
+websocket:
+  domains:
+    - notes.com
+
+database:
+  host: 127.0.0.1
+  port: 5432
+  name: notes.com
+  username: notes
+  password: SomePassword
+
+application:
+  directories:
+    static: /usr/local/share/notes
+    upload: /usr/local/lib/notes/upload
+
+session:
+  daysvalid: 31
+```
+
+Create an empty database.
--- a/db.go
+++ b/db.go
@ -6,7 +6,6 @@ import (
 	_ "github.com/lib/pq"

 	// Standard
-	"embed"
 	"errors"
 	"fmt"
 	"log"
@ -16,9 +15,6 @@ import (
 var (
 	dbConn string
 	db     *sqlx.DB
-
-	//go:embed sql/*
-	embedded embed.FS
 )

 func dbInit() (err error) {// {{{
--- a/main.go
+++ b/main.go
@ -3,8 +3,8 @@ package main
 import (
 	// Standard
 	"crypto/md5"
+	"embed"
 	"encoding/hex"
-	"path/filepath"
 	"flag"
 	"fmt"
 	"html/template"
@ -13,41 +13,45 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"path/filepath"
 	"regexp"
-	"strings"
 	"strconv"
+	"strings"
 	"time"
-	_ "embed"
 )

-const VERSION = "v13";
-const LISTEN_HOST = "0.0.0.0";
+const LISTEN_HOST = "0.0.0.0"
 const DB_SCHEMA = 13

 var (
 	flagPort    int
 	flagVersion bool
+	flagConfig  string
+
 	connectionManager ConnectionManager
 	static            http.Handler
 	config            Config
+	VERSION           string
+
+	//go:embed version sql/*
+	embedded embed.FS
 )

-func init() {// {{{
-	flag.IntVar(
-		&flagPort,
-		"port",
-		1371,
-		"TCP port to listen on",
-	)
-	flag.BoolVar(&flagVersion, "version", false, "Shows Notes version and exists")
+func init() { // {{{
+	version, _ := embedded.ReadFile("version")
+	VERSION = strings.TrimSpace(string(version))

+	configFilename := os.Getenv("HOME") + "/.config/notes.yaml"
+	flag.IntVar(&flagPort, "port", 1371, "TCP port to listen on")
+	flag.BoolVar(&flagVersion, "version", false, "Shows Notes version and exists")
+	flag.StringVar(&flagConfig, "config", configFilename, "Filename of configuration file")
 	flag.Parse()

 	if false {
-		time.Sleep(time.Second*1)
+		time.Sleep(time.Second * 1)
 	}
-}// }}}
-func main() {// {{{
+} // }}}
+func main() { // {{{
 	var err error

 	if flagVersion {
@ -57,7 +61,7 @@ func main() {// {{{

 	log.Printf("\x1b[32mNotes\x1b[0m %s\n", VERSION)

-	config, err = ConfigRead(os.Getenv("HOME")+"/.config/notes.yaml")
+	config, err = ConfigRead(flagConfig)
 	if err != nil {
 		fmt.Printf("%s\n", err)
 		os.Exit(1)
@ -96,13 +100,17 @@ func main() {// {{{
 	log.Printf("\x1b[32mNotes\x1b[0m Listening on %s\n", listen)
 	log.Printf("\x1b[32mNotes\x1b[0m Answer for domains %s\n", strings.Join(config.Websocket.Domains, ", "))
 	http.ListenAndServe(listen, nil)
-}// }}}
+} // }}}

-func cssUpdateHandler(w http.ResponseWriter, r *http.Request) {// {{{
+func cssUpdateHandler(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("[BROADCAST] CSS updated")
-	connectionManager.Broadcast(struct{ Ok bool; ID string; Op string }{ Ok: true, Op: "css_reload" })
-}// }}}
-func websocketHandler(w http.ResponseWriter, r *http.Request) {// {{{
+	connectionManager.Broadcast(struct {
+		Ok bool
+		ID string
+		Op string
+	}{Ok: true, Op: "css_reload"})
+} // }}}
+func websocketHandler(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error

 	_, err = connectionManager.NewConnection(w, r)
@ -110,9 +118,9 @@ func websocketHandler(w http.ResponseWriter, r *http.Request) {// {{{
 		log.Printf("[Connection] %s\n", err)
 		return
 	}
-}// }}}
-func staticHandler(w http.ResponseWriter, r *http.Request) {// {{{
-	data := struct{
+} // }}}
+func staticHandler(w http.ResponseWriter, r *http.Request) { // {{{
+	data := struct {
 		VERSION string
 	}{
 		VERSION: VERSION,
@ -149,9 +157,9 @@ func staticHandler(w http.ResponseWriter, r *http.Request) {// {{{
 	if err = tmpl.Execute(w, data); err != nil {
 		w.Write([]byte(err.Error()))
 	}
-}// }}}
+} // }}}

-func sessionCreate(w http.ResponseWriter, r *http.Request) {// {{{
+func sessionCreate(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/session/create")
 	session, err := CreateSession()
 	if err != nil {
@ -162,8 +170,8 @@ func sessionCreate(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":      true,
 		"Session": session,
 	})
-}// }}}
-func sessionRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func sessionRetrieve(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/session/retrieve")
 	var err error
 	var found bool
@ -179,8 +187,8 @@ func sessionRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
 		"Valid":   found,
 		"Session": session,
 	})
-}// }}}
-func sessionAuthenticate(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func sessionAuthenticate(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/session/authenticate")
 	var err error
 	var session Session
@ -192,7 +200,10 @@ func sessionAuthenticate(w http.ResponseWriter, r *http.Request) {// {{{
 		return
 	}

-	req := struct{ Username string; Password string }{}
+	req := struct {
+		Username string
+		Password string
+	}{}
 	if err = parseRequest(r, &req); err != nil {
 		responseError(w, err)
 		return
@ -208,9 +219,9 @@ func sessionAuthenticate(w http.ResponseWriter, r *http.Request) {// {{{
 		"Authenticated": authenticated,
 		"Session":       session,
 	})
-}// }}}
+} // }}}

-func userPassword(w http.ResponseWriter, r *http.Request) {// {{{
+func userPassword(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error
 	var ok bool
 	var session Session
@ -239,9 +250,9 @@ func userPassword(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":                true,
 		"CurrentPasswordOK": ok,
 	})
-}// }}}
+} // }}}

-func nodeTree(w http.ResponseWriter, r *http.Request) {// {{{
+func nodeTree(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error
 	var session Session

@ -250,7 +261,7 @@ func nodeTree(w http.ResponseWriter, r *http.Request) {// {{{
 		return
 	}

-	req := struct { StartNodeID int }{}
+	req := struct{ StartNodeID int }{}
 	if err = parseRequest(r, &req); err != nil {
 		responseError(w, err)
 		return
@ -266,8 +277,8 @@ func nodeTree(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":    true,
 		"Nodes": nodes,
 	})
-}// }}}
-func nodeRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeRetrieve(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/retrieve")
 	var err error
 	var session Session
@ -277,7 +288,7 @@ func nodeRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
 		return
 	}

-	req := struct { ID int }{}
+	req := struct{ ID int }{}
 	if err = parseRequest(r, &req); err != nil {
 		responseError(w, err)
 		return
@ -293,8 +304,8 @@ func nodeRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":   true,
 		"Node": node,
 	})
-}// }}}
-func nodeCreate(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeCreate(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/create")
 	var err error
 	var session Session
@ -323,8 +334,8 @@ func nodeCreate(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":   true,
 		"Node": node,
 	})
-}// }}}
-func nodeUpdate(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeUpdate(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/update")
 	var err error
 	var session Session
@ -353,8 +364,8 @@ func nodeUpdate(w http.ResponseWriter, r *http.Request) {// {{{
 	responseData(w, map[string]interface{}{
 		"OK": true,
 	})
-}// }}}
-func nodeRename(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeRename(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error
 	var session Session

@ -381,8 +392,8 @@ func nodeRename(w http.ResponseWriter, r *http.Request) {// {{{
 	responseData(w, map[string]interface{}{
 		"OK": true,
 	})
-}// }}}
-func nodeDelete(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeDelete(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error
 	var session Session

@ -408,8 +419,8 @@ func nodeDelete(w http.ResponseWriter, r *http.Request) {// {{{
 	responseData(w, map[string]interface{}{
 		"OK": true,
 	})
-}// }}}
-func nodeUpload(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeUpload(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/upload")
 	var err error
 	var session Session
@ -444,7 +455,6 @@ func nodeUpload(w http.ResponseWriter, r *http.Request) {// {{{
 	md5sumBytes := md5.Sum(fileBytes)
 	md5sum := hex.EncodeToString(md5sumBytes[:])

-
 	var nodeID int
 	if nodeID, err = strconv.Atoi(r.PostFormValue("NodeID")); err != nil {
 		responseError(w, err)
@ -493,8 +503,8 @@ func nodeUpload(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":   true,
 		"File": nodeFile,
 	})
-}// }}}
-func nodeDownload(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeDownload(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/download")
 	var err error
 	var session Session
@ -560,8 +570,8 @@ func nodeDownload(w http.ResponseWriter, r *http.Request) {// {{{
 		}
 	}

-}// }}}
-func nodeFiles(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeFiles(w http.ResponseWriter, r *http.Request) { // {{{
 	var err error
 	var session Session
 	var files []File
@ -589,8 +599,8 @@ func nodeFiles(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":    true,
 		"Files": files,
 	})
-}// }}}
-func nodeSearch(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func nodeSearch(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/node/search")
 	var err error
 	var session Session
@ -619,9 +629,9 @@ func nodeSearch(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":    true,
 		"Nodes": nodes,
 	})
-}// }}}
+} // }}}

-func keyRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
+func keyRetrieve(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/key/retrieve")
 	var err error
 	var session Session
@ -641,8 +651,8 @@ func keyRetrieve(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":   true,
 		"Keys": keys,
 	})
-}// }}}
-func keyCreate(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func keyCreate(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/key/create")
 	var err error
 	var session Session
@ -671,8 +681,8 @@ func keyCreate(w http.ResponseWriter, r *http.Request) {// {{{
 		"OK":  true,
 		"Key": key,
 	})
-}// }}}
-func keyCounter(w http.ResponseWriter, r *http.Request) {// {{{
+} // }}}
+func keyCounter(w http.ResponseWriter, r *http.Request) { // {{{
 	log.Println("/key/counter")
 	var err error
 	var session Session
@ -693,9 +703,9 @@ func keyCounter(w http.ResponseWriter, r *http.Request) {// {{{
 		// Javascript uses int32, thus getting a string counter for Javascript BigInt to parse.
 		"Counter": strconv.FormatInt(counter, 10),
 	})
-}// }}}
+} // }}}

-func newTemplate(requestPath string) (tmpl *template.Template, err error) {// {{{
+func newTemplate(requestPath string) (tmpl *template.Template, err error) { // {{{
 	// Append index.html if needed for further reading of the file
 	p := requestPath
 	if p[len(p)-1] == '/' {
@ -704,9 +714,11 @@ func newTemplate(requestPath string) (tmpl *template.Template, err error) {// {{
 	p = config.Application.Directories.Static + p

 	base := path.Base(p)
-	if tmpl, err = template.New(base).ParseFiles(p); err != nil { return }
+	if tmpl, err = template.New(base).ParseFiles(p); err != nil {
+		return
+	}

 	return
-}// }}}
+} // }}}

 // vim: foldmethod=marker
--- a/1
+++ b/1
@ -0,0 +1 @@
+v14