ensure dirs exist, improve logging

Author: cooper

authenticator/authenticator.go

@@ -10,9 +10,9 @@ import (
 // Authenticator represents a quiki server or site authentication service.
 type Authenticator struct {
 	Users map[string]User `json:"users,omitempty"`
-
-	path string      // path to JSON file
-	mu   *sync.Mutex // data lock
+	IsNew bool            `json:"-"`
+	path  string          // path to JSON file
+	mu    *sync.Mutex     // data lock
 }
 
 // Open reads a user data file and returns an Authenticator for it.
@@ -44,6 +44,7 @@ func Open(path string) (*Authenticator, error) {
 	}
 
 	// create a new one
+	auth.IsNew = true
 	return auth, auth.write()
 }
 

wiki/log.go

@@ -9,26 +9,35 @@ import (
 // Log logs info for a wiki.
 func (w *Wiki) Log(i ...any) {
 	w.logger().Println(i...)
+	i = w.addLogPrefix(i)
 	log.Println(i...)
 }
 
 // Debug logs debug info for a wiki.
 func (w *Wiki) Debug(i ...any) {
+	i = w.addLogPrefix(i)
 	log.Println(i...)
 }
 
 // Logf logs info for a wiki.
 func (w *Wiki) Logf(format string, i ...any) {
 	w.logger().Printf(format+"\n", i...)
-	log.Printf(format+"\n", i...)
+	log.Printf("["+w.Opt.Name+"] "+format+"\n", i...)
 }
 
 // Debugf logs debug info for a wiki.
 func (w *Wiki) Debugf(format string, i ...any) {
-	log.Printf(format+"\n", i...)
+	log.Printf("["+w.Opt.Name+"] "+format+"\n", i...)
+}
+
+func (w *Wiki) addLogPrefix(i []any) []any {
+	return append([]any{"[" + w.Opt.Name + "]"}, i...)
 }
 
 func (w *Wiki) logger() *log.Logger {
+	if w._logger != nil {
+		return w._logger
+	}
 	// consider: if wiki is ever destoryed, need to close this
 	f, err := os.OpenFile(w.Dir("cache", "wiki.log"),
 		os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)

wiki/wiki.go

@@ -59,6 +59,9 @@ func NewWikiConfig(confPath string) (*Wiki, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "init authenticator")
 	}
+	if w.Auth.IsNew {
+		w.Log("created wiki authentication file")
+	}
 
 	// no errors occurred
 	return w, nil

wikifier/page-opt.go

@@ -1,6 +1,7 @@
 package wikifier
 
 import (
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -219,13 +220,30 @@ func InjectPageOpt(page *Page, opt *PageOpt) error {
 		}
 	}
 
-	// all of these deprecated options are now overridden
+	// these dirs are derived from wiki dir
 	opt.Dir.Page = filepath.Join(opt.Dir.Wiki, "pages")
 	opt.Dir.Image = filepath.Join(opt.Dir.Wiki, "images")
 	opt.Dir.Model = filepath.Join(opt.Dir.Wiki, "models")
 	opt.Dir.Cache = filepath.Join(opt.Dir.Wiki, "cache")
 	opt.Dir.Category = filepath.Join(opt.Dir.Wiki, "cache", "category")
 
+	// ensure they all exist
+	for _, dir := range []string{
+		opt.Dir.Wiki,
+		opt.Dir.Page,
+		opt.Dir.Image,
+		opt.Dir.Model,
+		opt.Dir.Cache,
+		opt.Dir.Category,
+	} {
+		if _, err := os.Lstat(dir); err != nil && os.IsNotExist(err) {
+			err = os.MkdirAll(dir, 0755)
+			if err != nil {
+				return errors.Wrap(err, "creating "+dir)
+			}
+		}
+	}
+
 	// convert all HTTP roots to /
 	opt.Root.Wiki = startWithSlash(filepath.ToSlash(opt.Root.Wiki))
 	opt.Root.Image = startWithSlash(filepath.ToSlash(opt.Root.Image))