.*hi.*<.div>", s); err != nil {
t.Fatal(err, s)
diff --git a/server/notes.go b/server/notes.go
old mode 100755
new mode 100644
index b0b811f..a76de72
--- a/server/notes.go
+++ b/server/notes.go
@@ -2,26 +2,61 @@ package server
import (
"fmt"
+ "local/notes-server/filetree"
"net/http"
+ "path"
)
func (s *Server) notes(w http.ResponseWriter, r *http.Request) {
- p := NewPathFromURL(r.URL.Path)
+ p := filetree.NewPathFromURL(r.URL.Path)
+ head(w, r)
+ notesHead(w, p)
+ defer foot(w, r)
if p.IsDir() {
- head(w, r)
- notesHead(w, p)
- notesDir(p, w, r)
- foot(w, r)
+ s.dir(w, r)
} else if p.IsFile() {
- head(w, r)
- notesHead(w, p)
- notesFile(p, w, r)
- foot(w, r)
+ s.file(w, r)
} else {
http.NotFound(w, r)
}
}
-func notesHead(w http.ResponseWriter, p Path) {
+func notesHead(w http.ResponseWriter, p filetree.Path) {
fmt.Fprintln(w, h2(p.MultiLink()))
}
+
+func (s *Server) dir(w http.ResponseWriter, r *http.Request) {
+ dirs, files, err := s.Notes.Dir(r.URL.Path)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+ dirHead(w, filetree.NewPathFromURL(r.URL.Path).BaseHREF)
+ block(w, dirs)
+ block(w, files)
+}
+
+func dirHead(w http.ResponseWriter, baseHREF string) {
+ fmt.Fprintf(w, `
+
+ `, path.Join("/create/", baseHREF))
+}
+
+func (s *Server) file(w http.ResponseWriter, r *http.Request) {
+ file, err := s.Notes.File(r.URL.Path)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+ fileHead(w, filetree.NewPathFromURL(r.URL.Path).BaseHREF)
+ fmt.Fprintln(w, file)
+}
+
+func fileHead(w http.ResponseWriter, baseHREF string) {
+ fmt.Fprintf(w, `
+
+ `, path.Join("/edit/", baseHREF))
+}
diff --git a/server/notes_test.go b/server/notes_test.go
deleted file mode 100755
index abb4e43..0000000
--- a/server/notes_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package server
diff --git a/server/paths_test.go b/server/paths_test.go
deleted file mode 100755
index abb4e43..0000000
--- a/server/paths_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package server
diff --git a/server/routes.go b/server/routes.go
index 8b853ee..8496fdc 100755
--- a/server/routes.go
+++ b/server/routes.go
@@ -2,10 +2,7 @@ package server
import (
"fmt"
- "local/notes-server/config"
- "local/oauth2/oauth2client"
"local/router"
- "log"
"net/http"
)
@@ -40,16 +37,3 @@ func (s *Server) Routes() error {
}
return nil
}
-
-func (s *Server) authenticate(foo http.HandlerFunc) http.HandlerFunc {
- return func(w http.ResponseWriter, r *http.Request) {
- if config.OAuthServer != "" {
- err := oauth2client.Authenticate(config.OAuthServer, "notes-server", w, r)
- if err != nil {
- log.Println(err)
- return
- }
- }
- foo(w, r)
- }
-}
diff --git a/server/server.go b/server/server.go
index efd72ff..f2a60e9 100755
--- a/server/server.go
+++ b/server/server.go
@@ -1,54 +1,35 @@
package server
import (
- "fmt"
"local/notes-server/config"
+ "local/notes-server/notes"
+ "local/oauth2/oauth2client"
"local/router"
+ "log"
"net/http"
)
type Server struct {
*router.Router
+ Notes *notes.Notes
}
func New() *Server {
return &Server{
Router: router.New(),
+ Notes: notes.New(),
}
}
-func head(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte(config.Head + "\n"))
-}
-
-func foot(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte(config.Foot + "\n"))
-}
-
-func block(content string, w http.ResponseWriter) {
- fmt.Fprintf(w, "\n
\n%s\n
\n", content)
-}
-
-func h1(content string) string {
- return h("1", content)
-}
-
-func h2(content string) string {
- return h("2", content)
-}
-
-func h3(content string) string {
- return h("3", content)
-}
-
-func h4(content string) string {
- return h("4", content)
-}
-
-func h5(content string) string {
- return h("5", content)
-}
-
-func h(level, content string) string {
- return fmt.Sprintf("\n
\n%s\n\n", level, content, level)
+func (s *Server) authenticate(foo http.HandlerFunc) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ if config.OAuthServer != "" {
+ err := oauth2client.Authenticate(config.OAuthServer, "notes-server", w, r)
+ if err != nil {
+ log.Println(err)
+ return
+ }
+ }
+ foo(w, r)
+ }
}
diff --git a/server/submit.go b/server/submit.go
index a7f3cff..4bb7c29 100755
--- a/server/submit.go
+++ b/server/submit.go
@@ -1,11 +1,9 @@
package server
import (
- "fmt"
"html"
- "io/ioutil"
+ "local/notes-server/filetree"
"net/http"
- "os"
"path"
"strings"
)
@@ -18,14 +16,12 @@ func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
content := r.FormValue("content")
content = html.UnescapeString(content)
content = strings.ReplaceAll(content, "\r", "")
- p := NewPathFromURL(r.URL.Path)
- os.MkdirAll(path.Dir(p.Local), os.ModePerm)
- if err := ioutil.WriteFile(p.Local, []byte(content), os.ModePerm); err != nil {
- w.WriteHeader(http.StatusInternalServerError)
- fmt.Fprintln(w, err)
- } else {
- url := *r.URL
- url.Path = path.Join("/notes/", p.BaseHREF)
- http.Redirect(w, r, url.String(), http.StatusSeeOther)
+ err := s.Notes.Submit(r.URL.Path, content)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
}
+ url := *r.URL
+ url.Path = path.Join("/notes/", filetree.NewPathFromURL(r.URL.Path).BaseHREF)
+ http.Redirect(w, r, url.String(), http.StatusSeeOther)
}
diff --git a/server/submit_test.go b/server/submit_test.go
deleted file mode 100755
index abb4e43..0000000
--- a/server/submit_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package server