diff --git a/notes/delete.go b/notes/delete.go index a265c63..419df78 100755 --- a/notes/delete.go +++ b/notes/delete.go @@ -1,15 +1,11 @@ package notes import ( - "errors" "local/notes-server/filetree" "os" ) func (n *Notes) Delete(urlPath string) error { p := filetree.NewPathFromURL(urlPath) - if p.IsDir() { - return errors.New("path is dir") - } return os.Remove(p.Local) } diff --git a/notes/delete_test.go b/notes/delete_test.go index 26a2c6d..662080f 100755 --- a/notes/delete_test.go +++ b/notes/delete_test.go @@ -17,4 +17,27 @@ func TestDelete(t *testing.T) { if _, err := os.Stat("/tmp/a"); err == nil { t.Error(err) } + + d, err := ioutil.TempDir(os.TempDir(), "trydel*") + if err != nil { + t.Fatal(err) + } + for i := 0; i < 3; i++ { + f, err := ioutil.TempFile(d, "file*") + if err != nil { + t.Fatal(err) + } + f.Close() + } + if err := n.Delete(d); err == nil { + t.Error(err) + } + + e, err := ioutil.TempDir(os.TempDir(), "trydel*") + if err != nil { + t.Fatal(err) + } + if err := n.Delete(e); err != nil { + t.Error(err) + } } diff --git a/public/D/E/F/g b/public/D/E/F/g index 32f95c0..763a755 100755 --- a/public/D/E/F/g +++ b/public/D/E/F/g @@ -1 +1,3 @@ -hi \ No newline at end of file +# Hello + +## World \ No newline at end of file diff --git a/server/notes.go b/server/notes.go index a1608df..8b0a859 100755 --- a/server/notes.go +++ b/server/notes.go @@ -23,12 +23,7 @@ func (s *Server) notes(w http.ResponseWriter, r *http.Request) { func notesHead(w http.ResponseWriter, p filetree.Path) { fmt.Fprintln(w, h2(p.MultiLink(), "margin: 0; position: fixed; padding: .25em; background-color: #202b38; width: 100%; top: 0;")) - fmt.Fprintf(w, ` -
- - -
- `, "/search") + htmlSearch(w) } func (s *Server) dir(w http.ResponseWriter, r *http.Request) { @@ -43,12 +38,8 @@ func (s *Server) dir(w http.ResponseWriter, r *http.Request) { } func dirHead(w http.ResponseWriter, baseHREF string) { - fmt.Fprintf(w, ` -
- - -
- `, path.Join("/create/", baseHREF)) + htmlCreate(w, baseHREF) + htmlDelete(w, baseHREF) } func (s *Server) file(w http.ResponseWriter, r *http.Request) { @@ -62,10 +53,36 @@ func (s *Server) file(w http.ResponseWriter, r *http.Request) { } func fileHead(w http.ResponseWriter, baseHREF string) { - fmt.Fprintf(w, ` - - `, path.Join("/edit/", baseHREF)) - fmt.Fprintf(w, ` - - `, path.Join("/delete/", baseHREF)) + htmlEdit(w, baseHREF) + htmlDelete(w, baseHREF) +} + +func htmlEdit(w http.ResponseWriter, baseHREF string) { + fmt.Fprintf(w, `
+ +

`, path.Join("/edit/", baseHREF)) +} + +func htmlDelete(w http.ResponseWriter, baseHREF string) { + fmt.Fprintf(w, `
+ +

`, path.Join("/delete/", baseHREF)) +} + +func htmlCreate(w http.ResponseWriter, baseHREF string) { + fmt.Fprintf(w, ` +
+ + +
+ `, path.Join("/create/", baseHREF)) +} + +func htmlSearch(w http.ResponseWriter) { + fmt.Fprintf(w, ` +
+ + +
+ `, "/search") }