Changeset 61 in code for trunk/cmd

Timestamp:

Apr 21, 2023, 11:06:28 PM (2 years ago)

Author:

Izuru Yakumo

Message:

Add serve function, update documentation accordingly

Signed-off-by: Izuru Yakumo <yakumo.izuru@…>

File:

• trunk/cmd/aya/main.go (modified) (7 diffs)

trunk/cmd/aya/main.go

@@ -5 +5 @@
         "fmt"
         "io"
-        "io/ioutil"
+        "net/http"
         "os"
         "os/exec"
@@ -60 +60 @@
 func run(vars Vars, cmd string, args ...string) (string, error) {
         // First check if partial exists (.html)
-        if b, err := ioutil.ReadFile(filepath.Join(AYADIR, cmd+".html")); err == nil {
+        if b, err := os.ReadFile(filepath.Join(AYADIR, cmd+".html")); err == nil {
                 return string(b), nil
         }
@@ -91 +91 @@
 // If no empty newline is found - file is treated as content-only.
 func getVars(path string, globals Vars) (Vars, string, error) {
-        b, err := ioutil.ReadFile(path)
+        b, err := os.ReadFile(path)
         if err != nil {
                 return nil, "", err
@@ -360 +360 @@
         }
 }
+// Serve the public directory over HTTP
+func servePubDir() {
+        rootdir := http.Dir(PUBDIR)
+        http.Handle("/", http.FileServer(rootdir))
+        log.Fatal(http.ListenAndServe(":8000", nil))
+}
 
 func init() {
@@ -373 +379 @@
         fmt.Printf("Where <command> is:\n")
         fmt.Printf("\tbuild\tGenerate site\n")
+        fmt.Printf("\tserve\tServe %v over HTTP\n", PUBDIR)
+        fmt.Printf("\tvar\tQuery variable(s) from a markdown file\n")
+        fmt.Printf("\tversion\tPrint program version and exit\n")
         fmt.Printf("\twatch\t(Re)generate site while looking for changes\n")
-        fmt.Printf("\tvar\tQuery a variable from a markdown file\n")
-        fmt.Printf("\tversion\tPrint version and exit\n")
         fmt.Printf("\n")
         fmt.Printf("Other commands may be dynamically added by plugins found in %v\n", AYADIR)
@@ -398 +405 @@
                         fmt.Println("ERROR: too many arguments")
                 }
-        case "watch":
-                buildAll(true)
+        case "serve":
+                servePubDir()
         case "var":
                 if len(args) == 0 {
@@ -421 +428 @@
                 }
         case "version":
-                fmt.Printf("%v\n", aya.Version)
+                fmt.Printf("%v\n", aya.FullVersion())
                 os.Exit(0)
+        case "watch":
+                buildAll(true)
         default:
                 if s, err := run(globals(), cmd, args...); err != nil {