Colorful messages
git-svn-id: file:///srv/svn/repo/aya/trunk@93 cec141ff-132a-4243-88a5-ce187bd62f94
This commit is contained in:
@@ -38,7 +38,6 @@ func buildAll(watch bool) {
|
|||||||
run(vars, "prehook")
|
run(vars, "prehook")
|
||||||
modified = true
|
modified = true
|
||||||
}
|
}
|
||||||
fmt.Println(path)
|
|
||||||
return build(path, nil, vars)
|
return build(path, nil, vars)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -54,4 +53,5 @@ func buildAll(watch bool) {
|
|||||||
lastModified = time.Now()
|
lastModified = time.Now()
|
||||||
time.Sleep(1 * time.Second)
|
time.Sleep(1 * time.Second)
|
||||||
}
|
}
|
||||||
|
fmt.Printf("\033[0;37m%s\033[0m\n", "Building...")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,30 +39,30 @@ func main() {
|
|||||||
buildAll(false)
|
buildAll(false)
|
||||||
} else if len(args) == 1 {
|
} else if len(args) == 1 {
|
||||||
if err := build(args[0], os.Stdout, globals()); err != nil {
|
if err := build(args[0], os.Stdout, globals()); err != nil {
|
||||||
log.Fatal("[build] " + err.Error())
|
log.Fatalf("\033[0;31m%s\033[0m\n", "[build] " + err.Error())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Fatal("[build] Too many arguments")
|
log.Fatalf("\033[0;31m%s\033[0m\n", "Too many arguments")
|
||||||
}
|
}
|
||||||
case "clean":
|
case "clean":
|
||||||
fmt.Println("[clean] Removing generated site directory")
|
fmt.Printf("\033[0;37m%s\033[0m\n", "Removing generated artifacts...")
|
||||||
os.RemoveAll(PUBDIR)
|
os.RemoveAll(PUBDIR)
|
||||||
case "help":
|
case "help":
|
||||||
aya.PrintUsage()
|
aya.PrintUsage()
|
||||||
case "serve":
|
case "serve":
|
||||||
d, err := os.Stat(PUBDIR)
|
d, err := os.Stat(PUBDIR)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("[aya.HttpServe] I see, you want me to serve a non-existent directory, huh?")
|
log.Fatalf("\033[0;31m%s\033[0m\n", "I see, you want me to serve a non-existent directory, huh?")
|
||||||
} else {
|
} else {
|
||||||
aya.HttpServe(fmt.Sprint(d), 8000)
|
aya.HttpServe(fmt.Sprint(d), 8000)
|
||||||
}
|
}
|
||||||
case "var":
|
case "var":
|
||||||
if len(args) == 0 {
|
if len(args) == 0 {
|
||||||
log.Fatal("[var] Filename expected")
|
log.Fatalf("\033[0;31m%s\033[0m\n", "A filename was expected, but I didn't get any")
|
||||||
} else {
|
} else {
|
||||||
s := ""
|
s := ""
|
||||||
if vars, _, err := getVars(args[0], Vars{}); err != nil {
|
if vars, _, err := getVars(args[0], Vars{}); err != nil {
|
||||||
log.Fatal("[var]" + err.Error())
|
log.Fatalf("\033[0;31m%s\033[0m\n", "[var]" + err.Error())
|
||||||
} else {
|
} else {
|
||||||
if len(args) > 1 {
|
if len(args) > 1 {
|
||||||
for _, a := range args[1:] {
|
for _, a := range args[1:] {
|
||||||
|
|||||||
2
serve.go
2
serve.go
@@ -35,6 +35,6 @@ 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("127.0.0.1:%d", Port)
|
addr := fmt.Sprintf("127.0.0.1:%d", Port)
|
||||||
log.Printf("[aya.HttpServe] Listening on %s\n", addr)
|
fmt.Printf("\033[0;32mListening on %s\033[0m\n", addr)
|
||||||
log.Fatal(http.ListenAndServe(addr, nil))
|
log.Fatal(http.ListenAndServe(addr, nil))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user