sam
/
werc
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

sort menu entries

This commit is contained in:
mischief 2016-01-20 18:33:26 -08:00
parent 0f0b1bee47
commit c0a06bf061
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
main.go
View File

@ -12,6 +12,7 @@ import (
"net/http"
"os"
"path/filepath"
"sort"
"strings"
"time"
@ -31,18 +32,24 @@ type WercConfig struct {
Subtitle string
}
type WercPage struct {
Title string // <head> title
Menu []MenuEntry // menu entries
Content template.HTML // inner page content
Config WercConfig // site-specific config
}
type MenuEntry struct {
Name string
Path string
This bool
Sub []MenuEntry
Sub []*MenuEntry
}
type MenuEntries []*MenuEntry
func (me MenuEntries) Len() int { return len(me) }
func (me MenuEntries) Swap(i, j int) { me[i], me[j] = me[j], me[i] }
func (me MenuEntries) Less(i, j int) bool { return me[i].Name < me[j].Name }
type WercPage struct {
Title string // <head> title
Menu MenuEntries // menu entries
Content template.HTML // inner page content
Config WercConfig // site-specific config
}
type Werc struct {
@ -127,9 +134,9 @@ func ptitle(s string) string {
return file
}
func (werc *Werc) genmenu(site, dir string) []MenuEntry {
func (werc *Werc) genmenu(site, dir string) MenuEntries {
var dirs []string
var root []MenuEntry
var root MenuEntries
base := "sites/" + site
@ -152,9 +159,9 @@ func (werc *Werc) genmenu(site, dir string) []MenuEntry {
//log.Printf("dirs %v", dirs)
var last []MenuEntry
var last MenuEntries
for i := range dirs {
var sub []MenuEntry
var sub MenuEntries
b := filepath.Join(base, dirs[i])
fi, _ := readdir(werc.fs, b)
for _, f := range fi {
@ -162,7 +169,7 @@ func (werc *Werc) genmenu(site, dir string) []MenuEntry {
if !ok {
continue
}
me := MenuEntry{Name: newname, Path: filepath.Join(dirs[i], newname)}
me := &MenuEntry{Name: newname, Path: filepath.Join(dirs[i], newname)}
if f.Mode().IsDir() {
me.Path = me.Path + "/"
me.Name = me.Name + "/"
@ -175,6 +182,10 @@ func (werc *Werc) genmenu(site, dir string) []MenuEntry {
sub = append(sub, me)
}
if sub != nil {
sort.Sort(sub)
}
if dirs[i] == "/" {
root = sub
last = root
@ -191,6 +202,8 @@ func (werc *Werc) genmenu(site, dir string) []MenuEntry {
}
}
sort.Sort(root)
return root
}