miki

commit 06aaeebd50ef5350a6b45e367c8501c502c6b000
parent e5ecb47816ac841865a277164bd001330329c84e
Author: weetat <wtenison@protonmail.com>
Date:   Mon, 24 Feb 2025 18:22:37 +0000

Cleaned error logging format and messages.

Diffstat:
M
src/filesystem/filesystem.go
 | 
15
++++++++++-----
M
src/network/network.go
 | 
26
+++++++++++++-------------
M
web/edit/index.html
 | 
4
++--

3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/filesystem/filesystem.go b/src/filesystem/filesystem.go
@@ -36,11 +36,13 @@ type IDirectoryData interface {
 func MakeDirectorySig(directory string, depth int, pattern *regexp.Regexp) (DirectorySignature, error) {
 
 	if directory == "" || depth < -1 || pattern == nil {
-		return DirectorySignature{}, fmt.Errorf("invalid directory signature (%s, %d, %s)", directory, depth, pattern)
+		_retErr := fmt.Errorf("MakeDirectorySig:invalid directory signature (%s, %d, %s)", directory, depth, pattern)
+		return DirectorySignature{}, _retErr
 	}
 
 	if _, _err := os.Stat(directory); _err != nil {
-		return DirectorySignature{}, _err
+		_retErr := fmt.Errorf("MakeDirectorySig:%s", _err)
+		return DirectorySignature{}, _retErr
 	}
 
 	return DirectorySignature{directory, depth, pattern}, nil
@@ -51,7 +53,8 @@ func MakeDirectoryPkg(resSig DirectorySignature) (DirectoryPackage, error) {
 	// Check and collect resource signature directory files.
 	_files, _err := os.ReadDir(resSig.Root)
 	if _err != nil {
-		return DirectoryPackage{}, _err
+		_retErr := fmt.Errorf("MakeDirectoryPkg:%s", _err)
+		return DirectoryPackage{}, _retErr
 	}
 
 	_resPkg := DirectoryPackage{
@@ -70,12 +73,14 @@ func MakeDirectoryPkg(resSig DirectorySignature) (DirectoryPackage, error) {
 
 			_resDirSig, _err := MakeDirectorySig(_f.Name(), resSig.DependencyDepth, resSig.DependencyPattern)
 			if _err != nil {
-				return DirectoryPackage{}, _err
+				_retErr := fmt.Errorf("MakeDirectoryPkg:%s", _err)
+				return DirectoryPackage{}, _retErr
 			}
 
 			_resDirPkg, _err := MakeDirectoryPkg(_resDirSig)
 			if _err != nil {
-				return DirectoryPackage{}, _err
+				_retErr := fmt.Errorf("MakeDirectoryPkg:%s", _err)
+				return DirectoryPackage{}, _retErr
 			}
 
 			_resFileDirDeps = append(_resFileDirDeps, _resDirPkg.DependencyFiles...)
diff --git a/src/network/network.go b/src/network/network.go
@@ -21,12 +21,12 @@ var serverInfo struct {
 
 var mux *http.ServeMux
 
-func pageHandler(w http.ResponseWriter, r *http.Request) {
+func handlePageDefault(w http.ResponseWriter, r *http.Request) {
 
 	// Produce URL path to directory relation.
 	_r, _err := mfs.MakeDirectorySig(filepath.Join(mfs.Dirs.WebDirectory, r.URL.String()), 0, mfs.FilePatternHTML)
 	if _err != nil {
-		log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourceSig():%s\n", _err)
+		log.Printf("_ERROR\thandlePageDefault(\"/\"):%s\n", _err)
 		http.NotFound(w, r)
 		return
 	}
@@ -34,7 +34,7 @@ func pageHandler(w http.ResponseWriter, r *http.Request) {
 	// Collect HTML template files from directory.
 	_rPkg, _err := mfs.MakeDirectoryPkg(_r)
 	if _err != nil {
-		log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
+		log.Printf("_ERROR\thandlePageDefault(\"/\"):%s\n", _err)
 		http.NotFound(w, r)
 		return
 	}
@@ -43,18 +43,18 @@ func pageHandler(w http.ResponseWriter, r *http.Request) {
 
 	_tmpl, _err := template.ParseFiles(_rPkg.DependencyFiles...)
 	if _err != nil {
-		log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
-		http.Error(w, "_ERROR:HandleFunc(\"/\"):template.ParseFiles()", 500)
+		log.Printf("_ERROR\thandlePageDefault(\"/\"):%s\n", _err)
+		http.Error(w, "_ERROR:handlePageDefault(\"/\"):template.ParseFiles", 500)
 		return
 	}
 
 	if _err = _tmpl.ExecuteTemplate(w, "index.html", _rPkg.DependencyData); _err != nil {
-		log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
-		http.Error(w, "_ERROR:HandleFunc(\"/\"):template.ExecuteTemplate()", 500)
+		log.Printf("_ERROR\thandlePageDefault(\"/\"):%s\n", _err)
+		http.Error(w, "_ERROR:handlePageDefault(\"/\"):template.ExecuteTemplate", 500)
 		return
 	}
 
-	log.Printf("DONE\tHandleFunc:%s\n", r.URL)
+	log.Printf("DONE\thandlePageDefault:%s\n", r.URL)
 }
 
 func Init() {
@@ -77,7 +77,7 @@ func Init() {
 	}
 
 	if _err = json.Unmarshal(_siData, &_siDataStruct); _err != nil {
-		log.Panicln("__PANIC\tjson.Unmarshal:config.json:" + _err.Error())
+		log.Panicln("__PANIC\tnetwork:Init:json.Unmarshal:config.json:" + _err.Error())
 		return
 	}
 
@@ -92,12 +92,12 @@ func Init() {
 
 	_tls_cert_path := filepath.Join(_siDataStruct.ServerInfo.SslPath, _siDataStruct.ServerInfo.CertFile)
 	if _, err := os.Stat(_tls_cert_path); err != nil {
-		log.Panicf("__PANIC\tmain:%s", err)
+		log.Panicf("__PANIC\tnetwork:Init:%s", err)
 	}
 
 	_tls_key_path := filepath.Join(_siDataStruct.ServerInfo.SslPath, _siDataStruct.ServerInfo.KeyFile)
 	if _, err := os.Stat(_tls_key_path); err != nil {
-		log.Panicf("__PANIC\tmain:%s", err)
+		log.Panicf("__PANIC\tnetwork:Init:%s", err)
 	}
 
 	//// SET UP SERVER MUX
@@ -112,8 +112,8 @@ func Init() {
 		// log.Printf("DONE\tmain:mux.HandleFunc:%s\n", r.URL)
 	})
 
-	mux.HandleFunc("/home", pageHandler)
-	mux.HandleFunc("/edit", pageHandler)
+	mux.HandleFunc("/home", handlePageDefault)
+	mux.HandleFunc("/edit", handlePageDefault)
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		// log.Printf("CALL\tmain:mux.HandleFunc:%s\n", r.URL)
diff --git a/web/edit/index.html b/web/edit/index.html
@@ -16,8 +16,8 @@
 
         <section id="left"></section>
 
-        <section id="main">
-
+        <section id="main" class="__container">
+            <textarea name="editor" id="0">{{.fileText}}</textarea>
         </section>
 
         <section id="right"></section>