Just a documentation update
Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja> git-svn-id: file:///srv/svn/repo/aya/trunk@78 cec141ff-132a-4243-88a5-ce187bd62f94
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
// $TheSupernovaDuo: marisa.chaotic.ninja/aya/cmd/aya, v0.6.8 2023-12-04 15:43:44+0000, yakumo_izuru Exp $
|
// $TheSupernovaDuo: marisa.chaotic.ninja/aya/cmd/aya, v0.6.9 2023-12-09 23:30:07+0000, yakumo_izuru Exp $
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -199,7 +199,7 @@ func buildMarkdown(path string, w io.Writer, vars Vars) error {
|
|||||||
return buildHTML(filepath.Join(AYADIR, v["layout"]), w, v)
|
return buildHTML(filepath.Join(AYADIR, v["layout"]), w, v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Renders text file expanding all variable macros inside it
|
// Renders hypertext file expanding all variable macros inside it
|
||||||
func buildHTML(path string, w io.Writer, vars Vars) error {
|
func buildHTML(path string, w io.Writer, vars Vars) error {
|
||||||
v, body, err := getVars(path, vars)
|
v, body, err := getVars(path, vars)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -402,7 +402,7 @@ func main() {
|
|||||||
case "help":
|
case "help":
|
||||||
aya.PrintUsage()
|
aya.PrintUsage()
|
||||||
case "serve":
|
case "serve":
|
||||||
aya.HttpServe(PUBDIR)
|
aya.HttpServe(PUBDIR, 8000)
|
||||||
case "var":
|
case "var":
|
||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
fmt.Println("var: filename expected")
|
fmt.Println("var: filename expected")
|
||||||
|
|||||||
5
serve.go
5
serve.go
@@ -29,10 +29,11 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
log.Println(r.RemoteAddr, r.Method, rw.StatusCode, r.URL)
|
log.Println(r.RemoteAddr, r.Method, rw.StatusCode, r.URL)
|
||||||
}
|
}
|
||||||
|
|
||||||
func HttpServe(Dir string) {
|
// This function is called by the `aya serve` subcommand
|
||||||
|
func HttpServe(Dir string, Port int) {
|
||||||
handler := &Handler{http.FileServer(http.Dir(Dir))}
|
handler := &Handler{http.FileServer(http.Dir(Dir))}
|
||||||
http.Handle("/", handler)
|
http.Handle("/", handler)
|
||||||
addr := fmt.Sprintf(":%d", 8000)
|
addr := fmt.Sprintf(":%d", Port)
|
||||||
log.Printf("Listening on %s\n", addr)
|
log.Printf("Listening on %s\n", addr)
|
||||||
log.Fatal(http.ListenAndServe(addr, nil))
|
log.Fatal(http.ListenAndServe(addr, nil))
|
||||||
}
|
}
|
||||||
|
|||||||
1
usage.go
1
usage.go
@@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// This function is called by the `aya help` subcommand
|
||||||
func PrintUsage() {
|
func PrintUsage() {
|
||||||
fmt.Printf("aya/%v\n", FullVersion())
|
fmt.Printf("aya/%v\n", FullVersion())
|
||||||
fmt.Println("Homepage: https://aya.chaotic.ninja")
|
fmt.Println("Homepage: https://aya.chaotic.ninja")
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
var (
|
var (
|
||||||
// Set to current tag
|
// Set to current tag
|
||||||
Version = "v0.6.8"
|
Version = "v0.6.9"
|
||||||
Time = time.Now()
|
Time = time.Now()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user