parent
1b8f7f86f4
commit
125455fcb6
|
|
@ -1,6 +1,8 @@
|
||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"html"
|
"html"
|
||||||
"local/notes-server/filetree"
|
"local/notes-server/filetree"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
@ -16,6 +18,7 @@ func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
|
||||||
content := r.FormValue("content")
|
content := r.FormValue("content")
|
||||||
content = html.UnescapeString(content)
|
content = html.UnescapeString(content)
|
||||||
content = strings.ReplaceAll(content, "\r", "")
|
content = strings.ReplaceAll(content, "\r", "")
|
||||||
|
content = trimLines(content)
|
||||||
err := s.Notes.Submit(r.URL.Path, content)
|
err := s.Notes.Submit(r.URL.Path, content)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
@ -25,3 +28,12 @@ func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
|
||||||
url.Path = path.Join("/notes/", filetree.NewPathFromURL(r.URL.Path).BaseHREF)
|
url.Path = path.Join("/notes/", filetree.NewPathFromURL(r.URL.Path).BaseHREF)
|
||||||
http.Redirect(w, r, url.String(), http.StatusSeeOther)
|
http.Redirect(w, r, url.String(), http.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func trimLines(s string) string {
|
||||||
|
buff := bytes.NewBuffer(nil)
|
||||||
|
for _, line := range strings.Split(s, "\n") {
|
||||||
|
fmt.Fprintln(buff, strings.TrimRight(line, "\n \r\t"))
|
||||||
|
}
|
||||||
|
fixed := string(buff.Bytes())
|
||||||
|
return fixed[:len(fixed)-1]
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
package server
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestTrimLines(t *testing.T) {
|
||||||
|
t.Run("no newline at end", func(t *testing.T) {
|
||||||
|
s := `
|
||||||
|
hello
|
||||||
|
world`
|
||||||
|
s += " "
|
||||||
|
s += " \t"
|
||||||
|
got := trimLines(s)
|
||||||
|
want := `
|
||||||
|
hello
|
||||||
|
world`
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("want %q, got %q", want, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
t.Run("noop", func(t *testing.T) {
|
||||||
|
s := `hi`
|
||||||
|
got := trimLines(s)
|
||||||
|
want := `hi`
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("want %q, got %q", want, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
t.Run("newline", func(t *testing.T) {
|
||||||
|
s := "hi\n"
|
||||||
|
got := trimLines(s)
|
||||||
|
want := "hi\n"
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("want %q, got %q", want, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue