diff --git a/.gitignore b/.gitignore index ecaff7f..3e46234 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ **/*.sw* spike/review/reinvent/ezmded/server/ezmded +spike/review/reinvent/ezmded/server/server spike/review/reinvent/ezmded/server/testdata/files/**/* spike/review/reinvent/ezmded/server/testdata/workd/**/* spike/review/reinvent/ezmded/server/testdata/media/**/* diff --git a/spike/review/reinvent/ezmded/server/server.go b/spike/review/reinvent/ezmded/server/server.go index 58b074b..a89efc5 100644 --- a/spike/review/reinvent/ezmded/server/server.go +++ b/spike/review/reinvent/ezmded/server/server.go @@ -4,6 +4,7 @@ import ( "encoding/json" "errors" "fmt" + "html/template" "io" "io/ioutil" "local/gziphttp" @@ -47,7 +48,9 @@ func (server *Server) Routes() error { wildcard("/api/v0/media"): server.apiV0MediaIDHandler, wildcards("/api/v0/files"): server.apiV0FilesHandler, "/api/v0/search": server.apiV0SearchHandler, - wildcards("/ui"): server.uiHandler, + "/ui": server.rootHandler, + "/ui/search": server.uiSearchHandler, + wildcards("/ui/files"): server.uiFilesHandler, } { log.Printf("listening for %s", path) if err := server.router.Add(path, server.tryCatchHttpHandler(handler)); err != nil { @@ -196,17 +199,53 @@ func (server *Server) putContentHandler(filePath string, w http.ResponseWriter, return ensureAndWrite(filePath, b) } -func (server *Server) uiHandler(w http.ResponseWriter, r *http.Request) error { - r.URL.Path = strings.TrimPrefix(r.URL.Path, "/ui") - d := path.Join(server.root, "ui") - httpDir := http.Dir(d) - fileServer := http.FileServer(httpDir) - fileServer.ServeHTTP(w, r) - return nil +func (server *Server) uiSearchHandler(w http.ResponseWriter, r *http.Request) error { + r.URL.Path = strings.TrimPrefix(r.URL.Path, "/ui/files") + t, err := server.uiTemplate() + if err != nil { + return err + } + return t.Lookup("search").Execute(w, "TODO data") +} + +func (server *Server) uiFilesHandler(w http.ResponseWriter, r *http.Request) error { + r.URL.Path = strings.TrimPrefix(r.URL.Path, "/ui/files") + t, err := server.uiTemplate() + if err != nil { + return err + } + return t.Lookup("files").Execute(w, "TODO data") +} + +func (server *Server) uiTemplate() (*template.Template, error) { + templateFiles := []string{} + var loadTemplateFilesFromDir func(string) error + loadTemplateFilesFromDir = func(root string) error { + entries, err := os.ReadDir(root) + if err != nil { + return err + } + for _, entry := range entries { + entryPath := path.Join(root, entry.Name()) + if entry.IsDir() { + if err := loadTemplateFilesFromDir(entryPath); err != nil { + return err + } + } else if strings.HasPrefix(path.Base(entryPath), ".") { + } else if strings.HasSuffix(entryPath, ".ctmpl") { + templateFiles = append(templateFiles, entryPath) + } + } + return nil + } + if err := loadTemplateFilesFromDir(server.root); err != nil { + return nil, err + } + return template.ParseFiles(templateFiles...) } func (server *Server) rootHandler(w http.ResponseWriter, r *http.Request) error { - http.Redirect(w, r, "/ui", 301) + http.Redirect(w, r, "/ui/files", 301) return nil } diff --git a/spike/review/reinvent/ezmded/server/server_test.go b/spike/review/reinvent/ezmded/server/server_test.go index 674b010..ef10966 100644 --- a/spike/review/reinvent/ezmded/server/server_test.go +++ b/spike/review/reinvent/ezmded/server/server_test.go @@ -17,6 +17,14 @@ func TestServerRoutes(t *testing.T) { t.Fatal(err) } + if err := ensureAndWrite(path.Join(server.root, "ui", "files.ctmpl"), []byte(`{{ define "files" }}{{ template "_import" }}HI FROM FILES{{ end }}`)); err != nil { + t.Fatal(err) + } else if err := ensureAndWrite(path.Join(server.root, "ui", "search.ctmpl"), []byte(`{{ define "search" }}{{ template "_import" }}HI FROM SEARCH{{ end }}`)); err != nil { + t.Fatal(err) + } else if err := ensureAndWrite(path.Join(server.root, "ui", "templates", "_import.ctmpl"), []byte(`{{ define "_import" }}HI FROM IMPORT{{ end }}`)); err != nil { + t.Fatal(err) + } + if err := ensureAndWrite(server.diskMediaPath("id"), []byte("hi")); err != nil { t.Fatal(err) } @@ -41,7 +49,7 @@ func TestServerRoutes(t *testing.T) { "v0: /: get": { path: "/", method: http.MethodGet, - want: "mom", + want: "Moved", }, "v0: search: get": { path: "/api/v0/search?q=getf%20bod", @@ -85,6 +93,37 @@ func TestServerRoutes(t *testing.T) { path: "/api/v0/files/delfid", method: http.MethodDelete, }, + "v0: /: redir": { + path: "/", + method: http.MethodGet, + want: "Moved", + }, + "v0: /ui/: redir": { + path: "/ui/", + method: http.MethodGet, + want: "Moved", + }, + "v0: /ui: redir": { + path: "/ui", + method: http.MethodGet, + want: "Moved", + }, + "v0: /ui/search": { + path: "/ui/search", + method: http.MethodGet, + }, + "v0: /ui/search?q=abc": { + path: "/ui/search?q=abc", + method: http.MethodGet, + }, + "v0: /ui/files/getfid": { + path: "/ui/files/getfid", + method: http.MethodGet, + }, + "v0: /ui/files": { + path: "/ui/files", + method: http.MethodGet, + }, } for name, d := range cases { @@ -96,7 +135,7 @@ func TestServerRoutes(t *testing.T) { if w.Code == http.StatusNotFound { t.Fatal(w) } - if w.Code != http.StatusOK { + if w.Code >= 400 { t.Fatal(w) } if len(c.want) > 0 && !strings.Contains(string(w.Body.Bytes()), c.want) {