# HG changeset patch # User Peter Sanchez # Date 1668819159 21600 # Fri Nov 18 18:52:39 2022 -0600 # Node ID f733e580ffb67696380c479574f2324bd930fb15 # Parent 8ce95fa0383b7c0e8a910006d6a75181984b3d35 Fixing emu loader to work with gifs diff --git a/views/emus.html b/views/emus.html --- a/views/emus.html +++ b/views/emus.html @@ -1,1 +1,1 @@ -{{ range .Emus }}:{{.}}:{{ end }} +{{ range .Emus }}:{{.Name}}:{{ end }} diff --git a/web.go b/web.go --- a/web.go +++ b/web.go @@ -50,7 +50,7 @@ var develMode = false -var emunames []string +var allemus []Emu func getuserstyle(u *login.UserInfo) template.CSS { if u == nil { @@ -151,7 +151,7 @@ func showemus(w http.ResponseWriter, r *http.Request) { templinfo := getInfo(r) - templinfo["Emus"] = emunames + templinfo["Emus"] = allemus err := readviews.Execute(w, "emus.html", templinfo) if err != nil { elog.Print(err) @@ -2431,18 +2431,27 @@ } func emuinit() { + var emunames []string dir, err := os.Open(dataDir + "/emus") if err == nil { emunames, _ = dir.Readdirnames(0) dir.Close() } for i, e := range emunames { - if len(e) > 4 { - emunames[i] = e[:len(e)-4] + if len(e) <= 4 { + continue } + ext := e[len(e)-4:] + emu := Emu{ + ID: fmt.Sprintf("/emu/%s", e), + Name: e[:len(e)-4], + Type: "image/" + ext[1:], + } + allemus = append(allemus, emu) + emunames[i] = e[:len(e)-4] } - sort.Slice(emunames, func(i, j int) bool { - return emunames[i] < emunames[j] + sort.Slice(allemus, func(i, j int) bool { + return allemus[i].Name < allemus[j].Name }) }