Changeset 69 in code for trunk/cmd

Timestamp:

Sep 13, 2023, 10:49:50 AM (21 months ago)

Author:

Izuru Yakumo

Message:

Ready to release 0.6.0

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

File:

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

trunk/cmd/aya/main.go

@@ -1 @@
-// $TheSupernovaDuo: cmd/aya/main.go,v 0.5.x 2023/5/8 18:6:18 yakumo_izuru Exp $
+// $TheSupernovaDuo: cmd/aya/main.go,v 0.6.0 2023/9/13 07:50:00 yakumo_izuru Exp $
 package main
 
@@ -14 +14 @@
         "time"
 
+        "github.com/eknkc/amber"
         "github.com/russross/blackfriday/v2"
+        log "github.com/sirupsen/logrus"
+        "github.com/yosssi/gcss"
         "gopkg.in/yaml.v2"
         "marisa.chaotic.ninja/aya"
-        log "github.com/sirupsen/logrus"
-        "github.com/eknkc/amber"
-        "github.com/yosssi/gcss"
 )
 
 const (
-        AYADIR  = ".aya"
+        AYADIR = ".aya"
         PUBDIR = ".pub"
 )
@@ -173 +173 @@
                 }
         }
-        
+
 }
 
@@ -187 +187 @@
         }
         v["content"] = string(blackfriday.Run([]byte(content),
-                blackfriday.WithExtensions(blackfriday.CommonExtensions|blackfriday.AutoHeadingIDs),
+                blackfriday.WithExtensions(blackfriday.CommonExtensions|blackfriday.AutoHeadingIDs|blackfriday.Strikethrough|blackfriday.Footnotes),
         ))
         if w == nil {
@@ -261 +261 @@
         return err
 }
+
 // Compiles .gcss into .css
 func buildGCSS(path string, w io.Writer) error {
@@ -300 +301 @@
         return err
 }
+
 // This function passes the files to build to their corresponding functions
 func build(path string, w io.Writer, vars Vars) error {
@@ -360 +362 @@
         }
 }
-// Serve the public directory over HTTP
-func servePubDir() {
-        rootdir := http.Dir(PUBDIR)
-        http.Handle("/", http.FileServer(rootdir))
-        log.Printf("Serving %v at port 8000, see http://localhost:8000", rootdir)
+
+// Serve the public directory over HTTP and watch for changes
+func serve() {
+        http.Handle("/", http.FileServer(http.Dir(PUBDIR)))
         log.Fatal(http.ListenAndServe(":8000", nil))
 }
+
 // Initialize the environment
 func init() {
@@ -374 +376 @@
         os.Setenv("PATH", p)
 }
+
 // Print usage notes
 func printUsage() {
@@ -381 +384 @@
         fmt.Printf("\tbuild\tGenerate site\n")
         fmt.Printf("\tclean\tRemoves the generated site directory\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("\twatch\t(Re)generate site while looking for changes (it also serves on HTTP)\n")
         fmt.Printf("\n")
         fmt.Printf("Other commands may be dynamically added by plugins found in %v\n", AYADIR)
@@ -410 +412 @@
                 log.Println("Removing generated site directory")
                 os.RemoveAll(PUBDIR)
-        case "serve":
-                servePubDir()
+        case "help":
+                printUsage()
         case "var":
                 if len(args) == 0 {
@@ -437 +439 @@
         case "watch":
                 buildAll(true)
+                serve()
         default:
                 if s, err := run(globals(), cmd, args...); err != nil {