gogs
/
notea-de-me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

to helper foo

master
Bel LaPointe 2022-02-08 10:59:35 -07:00
parent fd74e730ec
commit 633212b050
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spike/review/reinvent/ezmded/server/server.go
View File

@ -81,8 +81,8 @@ func (server *Server) apiV0MediaHandler(w http.ResponseWriter, r *http.Request)
return err return err
} }
id := uuid.New().String() id := uuid.New().String()
os.MkdirAll(path.Join(server.root, "media"), os.ModePerm) os.MkdirAll(path.Dir(server.diskMediaPath(id)), os.ModePerm)
if err := ioutil.WriteFile(path.Join(server.root, "media", id), b, os.ModePerm); err != nil { if err := ioutil.WriteFile(server.diskMediaPath(id), b, os.ModePerm); err != nil {
return err return err
} }
return json.NewEncoder(w).Encode(map[string]map[string]string{ return json.NewEncoder(w).Encode(map[string]map[string]string{
@ -93,8 +93,17 @@ func (server *Server) apiV0MediaHandler(w http.ResponseWriter, r *http.Request)
} }
func (server *Server) apiV0MediaIDHandler(w http.ResponseWriter, r *http.Request) error { func (server *Server) apiV0MediaIDHandler(w http.ResponseWriter, r *http.Request) error {
switch r.Method {
case http.MethodGet:
return server.apiV0MediaIDGetHandler(w, r)
}
http.NotFound(w, r)
return nil
}
func (server *Server) apiV0MediaIDGetHandler(w http.ResponseWriter, r *http.Request) error {
id := path.Base(r.URL.Path) id := path.Base(r.URL.Path)
f, err := os.Open(path.Join(server.root, "media", id)) f, err := os.Open(server.diskMediaPath(id))
if os.IsNotExist(err) { if os.IsNotExist(err) {
http.NotFound(w, r) http.NotFound(w, r)
return nil return nil
@ -126,3 +135,7 @@ func (server *Server) rootHandler(w http.ResponseWriter, r *http.Request) error
func (server *Server) tree() *Tree { func (server *Server) tree() *Tree {
return NewTree(path.Join(server.root, "tree.yaml")) return NewTree(path.Join(server.root, "tree.yaml"))
} }
func (server *Server) diskMediaPath(id string) string {
return path.Join(server.root, "media", id)
}

4
spike/review/reinvent/ezmded/server/server_test.go
View File

@ -16,8 +16,8 @@ func TestServerRoutes(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
os.MkdirAll(path.Join(server.root, "media"), os.ModePerm) os.MkdirAll(path.Dir(server.diskMediaPath("id")), os.ModePerm)
ioutil.WriteFile(path.Join(server.root, "media", "id"), []byte("hi"), os.ModePerm) ioutil.WriteFile(server.diskMediaPath("id"), []byte("hi"), os.ModePerm)
cases := map[string]struct { cases := map[string]struct {
path string path string