do not wrap button with anchor for edit and del

.gitignore

@@ -1,3 +1,5 @@
+
+vendor
 gollum
 public
 **.sw*

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"local/notes-server/config"
+	"local/notes-server/notes/editor"
 	"local/notes-server/server"
 	"local/notes-server/versions"
 	"log"
@@ -12,6 +13,7 @@ import (
 )
 
 func main() {
+	log.Println(len(editor.CodeMirrorCSS))
 	server := server.New()
 	if err := server.Routes(); err != nil {
 		panic(err)

notes/comment.go

@@ -0,0 +1,63 @@
+package notes
+
+import (
+	"bufio"
+	"bytes"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"local/notes-server/filetree"
+	"os"
+	"path"
+	"strings"
+)
+
+func (n *Notes) Comment(urlPath string, lineno int, comment string) error {
+	p := filetree.NewPathFromURL(urlPath)
+	if stat, err := os.Stat(p.Local); err != nil {
+		return errors.New("cannot comment as it does not exist")
+	} else if stat.IsDir() {
+		return errors.New("cannot comment on a dir")
+	}
+	f, err := os.Open(p.Local)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	f2, err := ioutil.TempFile(os.TempDir(), path.Base(p.Local)+".*")
+	if err != nil {
+		return err
+	}
+	defer f2.Close()
+	reader := bufio.NewReader(f)
+	writer := io.Writer(f2)
+	for i := 0; i < lineno+1; i++ {
+		line, _, err := reader.ReadLine()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return err
+		}
+		_, err = io.Copy(writer, bytes.NewReader(line))
+		if err != nil {
+			return err
+		}
+		_, err = writer.Write([]byte("\n"))
+		if err != nil {
+			return err
+		}
+	}
+	formatted := fmt.Sprintf("> *%s*\n\n", comment)
+	_, err = io.Copy(writer, strings.NewReader(formatted))
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(writer, reader)
+	if err != nil && err != io.EOF {
+		return err
+	}
+	f2.Close()
+	return os.Rename(f2.Name(), p.Local)
+}

notes/comment_test.go

@@ -0,0 +1,56 @@
+package notes
+
+import (
+	"bytes"
+	"io/ioutil"
+	"local/notes-server/config"
+	"os"
+	"path"
+	"strings"
+	"testing"
+)
+
+func TestComment(t *testing.T) {
+	d, err := ioutil.TempDir(os.TempDir(), "testComment.*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(d)
+	f, err := ioutil.TempFile(d, "testFile.*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	f.Write([]byte(`
+   hello
+   world
+   # i have a heading
+   ## i have a subber heading
+   ### i have a[heading with](http://google.com) a hyperlink
+   ## *I think this heading is in italics*
+   `))
+	f.Close()
+	fpath := path.Join("/comment", strings.TrimPrefix(f.Name(), d))
+	config.Root = d
+	n := &Notes{}
+	t.Logf("d=%s, fpath=%s", d, fpath)
+
+	if err := n.Comment("/comment/a", 5, "a"); err == nil {
+		t.Error(err)
+	}
+
+	if err := n.Comment(fpath, -1, "illegal line no"); err != nil {
+		t.Error(err)
+	}
+
+	if err := n.Comment(fpath, 10000, "big line no"); err != nil {
+		t.Error(err)
+	}
+
+	if err := n.Comment(fpath, 0, "first_line_OK"); err != nil {
+		t.Error(err)
+	} else if b, err := ioutil.ReadFile(f.Name()); err != nil {
+		t.Error(err)
+	} else if !bytes.Contains(b, []byte("> *first_line_OK*\n")) {
+		t.Errorf("%s", b)
+	}
+}

notes/delete.go

@@ -1,11 +1,16 @@
 package notes
 
 import (
+	"fmt"
 	"local/notes-server/filetree"
 	"os"
 )
 
 func (n *Notes) Delete(urlPath string) error {
 	p := filetree.NewPathFromURL(urlPath)
-	return os.Remove(p.Local)
+	err := os.Remove(p.Local)
+	if err != nil {
+		err = fmt.Errorf("failed to delete %q => %q: %v", urlPath, p.Local, err)
+	}
+	return err
 }

notes/delete_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"local/notes-server/config"
 	"os"
+	"path"
 	"testing"
 )
 
@@ -11,17 +12,22 @@ func TestDelete(t *testing.T) {
 	config.Root = "/tmp"
 	ioutil.WriteFile("/tmp/a", []byte("hi"), os.ModePerm)
 	n := &Notes{}
+
+	t.Run("delete 404", func(t *testing.T) {
 		if err := n.Delete("/notes/a"); err != nil {
 			t.Error(err)
 		}
 		if _, err := os.Stat("/tmp/a"); err == nil {
 			t.Error(err)
 		}
+	})
 
+	t.Run("delete w. content", func(t *testing.T) {
 		d, err := ioutil.TempDir(os.TempDir(), "trydel*")
 		if err != nil {
 			t.Fatal(err)
 		}
+		config.Root = path.Dir(d)
 		for i := 0; i < 3; i++ {
 			f, err := ioutil.TempFile(d, "file*")
 			if err != nil {
@@ -29,15 +35,20 @@ func TestDelete(t *testing.T) {
 			}
 			f.Close()
 		}
-	if err := n.Delete(d); err == nil {
+		if err := n.Delete("/abc/" + path.Base(d)); err == nil {
 			t.Error(err)
 		}
+	})
 
-	e, err := ioutil.TempDir(os.TempDir(), "trydel*")
+	t.Run("delete empty dir", func(t *testing.T) {
+		d2p := os.TempDir()
+		d2, err := ioutil.TempDir(d2p, "trydel*")
+		config.Root = path.Dir(d2p)
 		if err != nil {
 			t.Fatal(err)
 		}
-	if err := n.Delete(e); err != nil {
+		if err := n.Delete("/abc/" + path.Base(d2)); err != nil {
-		t.Error(err)
+			t.Errorf("failed to del empty dir %s in %s: %v", d2, d2p, err)
 		}
+	})
 }

notes/edit.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"local/notes-server/filetree"
+	"local/notes-server/notes/editor"
 	"strings"
 )
 
@@ -26,11 +27,49 @@ func editFile(p filetree.Path) string {
 	}
 	b, _ := ioutil.ReadFile(p.Local)
 	return fmt.Sprintf(`
-      <form action="/submit/%s" method="post" style="width:100%%; height: 90%%">
+      <div class="form">
-         <table style="width:100%%; height: 90%%">
+         <form action="/submit/%s" method="post">
-            <textarea name="content" style="width:100%%; min-height:90%%; cursor:crosshair;">%s</textarea>
+            <textarea id="mytext" name="content" style="cursor:crosshair;">%s</textarea>
-         </table>
             <button type="submit">Submit</button>
          </form>
-   `, href, b)
+      </div>
+      <!--
+      https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.59.4/codemirror.min.js
+      https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.59.4/codemirror.min.css
+      https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.59.4/keymap/vim.min.js
+      https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.59.4/theme/dracula.min.css
+      -->
+      <script>%s</script>
+      <style>%s</style>
+      <script>%s</script>
+      <style>%s</style>
+      <script>
+         if( ! /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
+            CodeMirror.fromTextArea(document.getElementById("mytext"), {
+               lineNumbers: true,
+               mode: "md",
+               theme: "dracula",
+               keyMap: "vim",
+               smartIndent: true,
+               indentUnit: 3,
+               tabSize: 3,
+               indentWithTabs: false,
+               lineWrapping: true,
+               autofocus: true,
+               dragDrop: false,
+               spellcheck: true,
+               autocorrect: false,
+               autocapitalize: false,
+               extraKeys: {
+                  Tab: (cm) => {
+                     var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+                     cm.replaceSelection(spaces);
+                  },
+               },
+            })
+         } else {
+            console.log(navigator.userAgent)
+         }
+      </script>
+   `, href, b, editor.CodeMirrorJS, editor.CodeMirrorCSS, editor.CodeMirrorVIM, editor.CodeMirrorTheme)
 }

notes/editor/dracula.min.css

@@ -0,0 +1 @@
+.cm-s-dracula .CodeMirror-gutters,.cm-s-dracula.CodeMirror{background-color:#282a36!important;color:#f8f8f2!important;border:none}.cm-s-dracula .CodeMirror-gutters{color:#282a36}.cm-s-dracula .CodeMirror-cursor{border-left:solid thin #f8f8f0}.cm-s-dracula .CodeMirror-linenumber{color:#6d8a88}.cm-s-dracula .CodeMirror-selected{background:rgba(255,255,255,.1)}.cm-s-dracula .CodeMirror-line::selection,.cm-s-dracula .CodeMirror-line>span::selection,.cm-s-dracula .CodeMirror-line>span>span::selection{background:rgba(255,255,255,.1)}.cm-s-dracula .CodeMirror-line::-moz-selection,.cm-s-dracula .CodeMirror-line>span::-moz-selection,.cm-s-dracula .CodeMirror-line>span>span::-moz-selection{background:rgba(255,255,255,.1)}.cm-s-dracula span.cm-comment{color:#6272a4}.cm-s-dracula span.cm-string,.cm-s-dracula span.cm-string-2{color:#f1fa8c}.cm-s-dracula span.cm-number{color:#bd93f9}.cm-s-dracula span.cm-variable{color:#50fa7b}.cm-s-dracula span.cm-variable-2{color:#fff}.cm-s-dracula span.cm-def{color:#50fa7b}.cm-s-dracula span.cm-operator{color:#ff79c6}.cm-s-dracula span.cm-keyword{color:#ff79c6}.cm-s-dracula span.cm-atom{color:#bd93f9}.cm-s-dracula span.cm-meta{color:#f8f8f2}.cm-s-dracula span.cm-tag{color:#ff79c6}.cm-s-dracula span.cm-attribute{color:#50fa7b}.cm-s-dracula span.cm-qualifier{color:#50fa7b}.cm-s-dracula span.cm-property{color:#66d9ef}.cm-s-dracula span.cm-builtin{color:#50fa7b}.cm-s-dracula span.cm-type,.cm-s-dracula span.cm-variable-3{color:#ffb86c}.cm-s-dracula .CodeMirror-activeline-background{background:rgba(255,255,255,.1)}.cm-s-dracula .CodeMirror-matchingbracket{text-decoration:underline;color:#fff!important}

notes/editor/embed.go

@@ -0,0 +1,17 @@
+package editor
+
+import _ "embed"
+
+var (
+	//go:embed codemirror.min.js
+	CodeMirrorJS string
+
+	//go:embed codemirror.min.css
+	CodeMirrorCSS string
+
+	//go:embed vim.min.js
+	CodeMirrorVIM string
+
+	//go:embed dracula.min.css
+	CodeMirrorTheme string
+)

notes/file.go

@@ -1,13 +1,23 @@
 package notes
 
 import (
+	"bytes"
+	"encoding/base64"
 	"errors"
+	"fmt"
+	"io"
 	"io/ioutil"
 	"local/notes-server/filetree"
+	"local/notes-server/notes/md"
+	"path"
+	"regexp"
+	"strings"
 
-	"github.com/gomarkdown/markdown"
+	"github.com/fairlyblank/md2min"
+	"github.com/gomarkdown/markdown/ast"
 	"github.com/gomarkdown/markdown/html"
-	"github.com/gomarkdown/markdown/parser"
+	"github.com/yuin/goldmark"
+	blackfriday "gopkg.in/russross/blackfriday.v2"
 )
 
 func (n *Notes) File(urlPath string) (string, error) {
@@ -16,10 +26,108 @@ func (n *Notes) File(urlPath string) (string, error) {
 		return "", errors.New("path is dir")
 	}
 	b, _ := ioutil.ReadFile(p.Local)
-	renderer := html.NewRenderer(html.RendererOptions{
+	return n.gomarkdown(urlPath, b)
-		Flags: html.CommonFlags | html.TOC,
+	return n.blackfriday(urlPath, b)
-	})
+	return n.goldmark(urlPath, b)
-	parser := parser.NewWithExtensions(parser.CommonExtensions | parser.HeadingIDs | parser.AutoHeadingIDs | parser.Titleblock)
+	return n.md2min(urlPath, b)
-	content := markdown.ToHTML(b, parser, renderer)
+}
-	return string(content) + "\n", nil
+
+func (n *Notes) blackfriday(urlPath string, b []byte) (string, error) {
+	renderer := blackfriday.NewHTMLRenderer(blackfriday.HTMLRendererParameters{
+		Flags: blackfriday.TOC | blackfriday.Smartypants | blackfriday.SmartypantsFractions | blackfriday.SmartypantsDashes | blackfriday.SmartypantsQuotesNBSP | blackfriday.CompletePage,
+	})
+	return string(blackfriday.Run(
+		b,
+		blackfriday.WithRenderer(renderer),
+	)), nil
+}
+
+func (n *Notes) goldmark(urlPath string, b []byte) (string, error) {
+	buff := bytes.NewBuffer(nil)
+	err := goldmark.Convert(b, buff)
+	return string(buff.Bytes()), err
+}
+
+func (n *Notes) md2min(urlPath string, b []byte) (string, error) {
+	mdc := md2min.New("h1")
+	buff := bytes.NewBuffer(nil)
+	err := mdc.Parse(b, buff)
+	return string(buff.Bytes()), err
+}
+
+func (n *Notes) gomarkdown(urlPath string, b []byte) (string, error) {
+	return md.Gomarkdown(b, n.commentFormer(urlPath, b))
+}
+
+func (n *Notes) commentFormer(urlPath string, md []byte) html.RenderNodeFunc {
+	urlPath = strings.TrimPrefix(urlPath, "/")
+	urlPath = strings.TrimPrefix(urlPath, strings.Split(urlPath, "/")[0])
+	lines := bytes.Split(md, []byte("\n"))
+	cur := -1
+	nextHeader := func() {
+		cur++
+		for cur < len(lines) {
+			for _, opener_closer := range [][]string{{"```", "```"}, {`<summary>`, `</summary>`}} {
+				if cur < len(lines) && bytes.Contains(lines[cur], []byte(opener_closer[0])) {
+					cur++
+					for cur < len(lines) && !bytes.Contains(lines[cur], []byte(opener_closer[1])) {
+						cur++
+					}
+					cur++
+				}
+			}
+			if cur >= len(lines) {
+				break
+			}
+			line := lines[cur]
+			ok, err := regexp.Match(`^\s*#+\s*.+$`, line)
+			if err != nil {
+				panic(err)
+			} else if ok {
+				return
+			}
+			cur++
+		}
+	}
+	return func(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) {
+		if heading, ok := node.(*ast.Heading); !n.RO && ok && !entering {
+			nextHeader()
+			fmt.Fprintf(w, `
+            <form method="POST" action=%q class="comment">
+               <input name="lineno" type="number" style="display:none" value="%d"/>
+               <input autocomplete="off" name="content" type="text"/>
+               <input type="submit"/>
+            </form>
+         `, path.Join("/comment", urlPath)+"#"+heading.HeadingID, cur)
+		}
+		return ast.GoToNext, false
+	}
+}
+
+func (n *Notes) commentFormerOld() html.RenderNodeFunc {
+	return func(w io.Writer, node ast.Node, entering bool) (ast.WalkStatus, bool) {
+		if heading, ok := node.(*ast.Heading); ok {
+			if !entering {
+				literal := ""
+				ast.WalkFunc(heading, func(n ast.Node, e bool) ast.WalkStatus {
+					if leaf := n.AsLeaf(); e && leaf != nil {
+						if literal != "" {
+							literal += ".*"
+						}
+						literal += string(leaf.Literal)
+					}
+					return ast.GoToNext
+				})
+				level := heading.Level
+				id := base64.URLEncoding.EncodeToString([]byte(fmt.Sprintf(`^[ \t]*%s\s*%s(].*)?\s*$`, strings.Repeat("#", level), literal)))
+				fmt.Fprintf(w, `
+            <form method="POST" target="/comment" name="%s" class="comment">
+               <input autocomplete="off" name="content" type="text"/>
+               <input type="submit"/>
+            </form>
+         `, id)
+			}
+		}
+		return ast.GoToNext, false
+	}
 }

notes/md/file.go

@@ -0,0 +1,35 @@
+package md
+
+import (
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
+)
+
+func Gomarkdown(b []byte, renderHook html.RenderNodeFunc) (string, error) {
+	renderer := html.NewRenderer(html.RendererOptions{
+		Flags:          html.CommonFlags | html.TOC,
+		RenderNodeHook: renderHook,
+	})
+	ext := parser.NoExtensions
+	for _, extension := range []parser.Extensions{
+		parser.NoIntraEmphasis,
+		parser.Tables,
+		parser.FencedCode,
+		parser.Autolink,
+		parser.Strikethrough,
+		parser.SpaceHeadings,
+		parser.HeadingIDs,
+		parser.BackslashLineBreak,
+		parser.DefinitionLists,
+		parser.MathJax,
+		parser.Titleblock,
+		parser.AutoHeadingIDs,
+		parser.Includes,
+	} {
+		ext |= extension
+	}
+	parser := parser.NewWithExtensions(ext)
+	content := markdown.ToHTML(b, parser, renderer)
+	return string(content) + "\n", nil
+}

notes/notes.go

@@ -4,10 +4,12 @@ import "local/notes-server/config"
 
 type Notes struct {
 	root string
+	RO   bool
 }
 
 func New() *Notes {
 	return &Notes{
 		root: config.Root,
+		RO:   config.ReadOnly,
 	}
 }

notes/search.go

@@ -3,6 +3,7 @@ package notes
 import (
 	"bufio"
 	"errors"
+	"io"
 	"local/notes-server/filetree"
 	"log"
 	"os"
@@ -51,42 +52,59 @@ func (n *Notes) Search(phrase string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	perffiles := filetree.NewFiles()
 	files := filetree.NewFiles()
 	err = filepath.Walk(n.root,
 		func(walked string, info os.FileInfo, err error) error {
 			if err != nil {
 				return err
 			}
-			if info.IsDir() {
+			if !info.Mode().IsRegular() {
+				return nil
+			}
+			p := filetree.NewPathFromLocal(path.Dir(walked))
+			if ok, _ := searcher.stream(strings.NewReader(info.Name())); ok {
+				perffiles.Push(p, info)
 				return nil
 			}
 			if size := info.Size(); size < 1 || size > (5*1024*1024) {
 				return nil
 			}
-			ok, err := grepFile(walked, searcher)
+			ok, err := searcher.file(walked)
 			if err != nil && err.Error() == "bufio.Scanner: token too long" {
 				err = nil
 			}
-			if err == nil && ok {
-				p := filetree.NewPathFromLocal(path.Dir(walked))
-				files.Push(p, info)
-			}
 			if err != nil {
 				log.Printf("failed to scan %v: %v", walked, err)
+			} else if ok {
+				files.Push(p, info)
 			}
 			return err
 		},
 	)
-	return filetree.Paths(*files).List(true), err
+	for _, file := range *files {
+		*perffiles = append(*perffiles, file)
+	}
+	return filetree.Paths(*perffiles).List(true), err
 }
 
-func grepFile(file string, searcher *searcher) (bool, error) {
+func (searcher *searcher) file(file string) (bool, error) {
+	if d := path.Base(path.Dir(file)); strings.HasPrefix(d, ".") && strings.HasSuffix(d, ".attachments") {
+		return false, nil
+	}
+	if strings.Contains(file, "/.git/") {
+		return false, nil
+	}
 	f, err := os.Open(file)
 	if err != nil {
 		return false, err
 	}
 	defer f.Close()
-	scanner := bufio.NewScanner(f)
+	return searcher.stream(f)
+}
+
+func (searcher *searcher) stream(r io.Reader) (bool, error) {
+	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
 		if searcher.matches(scanner.Bytes()) {
 			return true, scanner.Err()

notes/search_test.go

@@ -34,7 +34,7 @@ func TestSearch(t *testing.T) {
 		t.Fatal(v, result)
 	}
 
-	result, err = n.Search("4")
+	result, err = n.Search("number.4")
 	if err != nil {
 		t.Fatal(err)
 	}

server/.notes/create.go

@@ -1,24 +0,0 @@
-package notes
-
-import (
-	"html"
-	"local/notes-server/filetree"
-	"net/http"
-	"path"
-	"strings"
-)
-
-func (n *Notes) Create(w http.ResponseWriter, r *http.Request) {
-	content := r.FormValue("base")
-	content = html.UnescapeString(content)
-	content = strings.ReplaceAll(content, "\r", "")
-	urlPath := path.Join(r.URL.Path, content)
-	p := filetree.NewPathFromURL(urlPath)
-	if p.IsDir() {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-	url := *r.URL
-	url.Path = path.Join("/edit/", p.BaseHREF)
-	http.Redirect(w, r, url.String(), http.StatusSeeOther)
-}

server/.notes/create_test.go

@@ -1 +0,0 @@
-package notes

server/.notes/dir.go

@@ -1,37 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"path"
-)
-
-func notesDir(p Path, w http.ResponseWriter, r *http.Request) {
-	dirs, files := lsDir(p)
-	content := dirs.List()
-	notesDirHead(p, w)
-	block(content, w)
-	fmt.Fprintln(w, files.List())
-}
-
-func notesDirHead(p Path, w http.ResponseWriter) {
-	fmt.Fprintf(w, `
-      <form action=%q method="get">
-         <input type="text" name="base"></input>
-         <button type="submit">Create</button>
-      </form>
-   `, path.Join("/create/", p.BaseHREF))
-}
-
-func lsDir(path Path) (Paths, Paths) {
-	dirs := newDirs()
-	files := newFiles()
-
-	found, _ := ioutil.ReadDir(path.Local)
-	for _, f := range found {
-		dirs.Push(path, f)
-		files.Push(path, f)
-	}
-	return Paths(*dirs), Paths(*files)
-}

server/.notes/dir_test.go

@@ -1,26 +0,0 @@
-package notes
-
-import (
-	"net/http/httptest"
-	"testing"
-)
-
-func TestLsDir(t *testing.T) {
-	p := Path{Local: "/usr/local"}
-	dirs, files := lsDir(p)
-	if len(dirs) == 0 {
-		t.Fatal(len(dirs))
-	}
-	if len(files) == 0 {
-		t.Fatal(len(files))
-	}
-	t.Log(dirs)
-	t.Log(files)
-}
-
-func TestNotesDir(t *testing.T) {
-	path := Path{Local: "/usr/local"}
-	w := httptest.NewRecorder()
-	notesDir(path, w, nil)
-	t.Logf("%s", w.Body.Bytes())
-}

server/.notes/edit.go

@@ -1,43 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-)
-
-func (s *Server) edit(w http.ResponseWriter, r *http.Request) {
-	p := NewPathFromURL(r.URL.Path)
-	if p.IsDir() {
-		http.NotFound(w, r)
-		return
-	}
-	head(w, r)
-	editHead(w, p)
-	editFile(w, p)
-	foot(w, r)
-}
-
-func editHead(w http.ResponseWriter, p Path) {
-	fmt.Fprintln(w, h2(p.MultiLink()))
-}
-
-func editFile(w http.ResponseWriter, p Path) {
-	href := p.HREF
-	href = strings.TrimPrefix(href, "/")
-	hrefs := strings.SplitN(href, "/", 2)
-	href = hrefs[0]
-	if len(hrefs) > 1 {
-		href = hrefs[1]
-	}
-	b, _ := ioutil.ReadFile(p.Local)
-	fmt.Fprintf(w, `
-      <form action="/submit/%s" method="post" style="width:100%%; height: 90%%">
-         <table style="width:100%%; height: 90%%">
-            <textarea name="content" style="width:100%%; min-height:90%%">%s</textarea>
-         </table>
-         <button type="submit">Submit</button>
-      </form>
-   `, href, b)
-}

server/.notes/edit_test.go

@@ -1 +0,0 @@
-package notes

server/.notes/file.go

@@ -1,29 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"path"
-
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/html"
-	"github.com/gomarkdown/markdown/parser"
-)
-
-func notesFile(p Path, w http.ResponseWriter, r *http.Request) {
-	b, _ := ioutil.ReadFile(p.Local)
-	notesFileHead(p, w)
-	renderer := html.NewRenderer(html.RendererOptions{
-		Flags: html.CommonFlags | html.TOC,
-	})
-	parser := parser.NewWithExtensions(parser.CommonExtensions | parser.HeadingIDs | parser.AutoHeadingIDs | parser.Titleblock)
-	content := markdown.ToHTML(b, parser, renderer)
-	fmt.Fprintf(w, "%s\n", content)
-}
-
-func notesFileHead(p Path, w http.ResponseWriter) {
-	fmt.Fprintf(w, `
-      <a href=%q><input type="button" value="Edit"></input></a>
-   `, path.Join("/edit/", p.BaseHREF))
-}

server/.notes/file_test.go

@@ -1,46 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http/httptest"
-	"os"
-	"strings"
-	"testing"
-)
-
-func TestNotesFile(t *testing.T) {
-	f, err := ioutil.TempFile(os.TempDir(), "until*")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(f.Name())
-	fmt.Fprintln(f, `
-# Hello
-## World
-* This
-* is
-* bullets
-
-| My | table | goes |
-|----|-------|------|
-| h  | e     | n    |
-
-   `)
-	f.Close()
-	w := httptest.NewRecorder()
-	p := Path{Local: f.Name()}
-	notesFile(p, w, nil)
-	s := string(w.Body.Bytes())
-	shouldContain := []string{
-		"tbody",
-		"h1",
-		"h2",
-	}
-	for _, should := range shouldContain {
-		if !strings.Contains(s, should) {
-			t.Fatalf("%s: %s", should, s)
-		}
-	}
-	t.Logf("%s", s)
-}

server/.notes/notes.go

@@ -1,13 +0,0 @@
-package notes
-
-import "local/notes-server/config"
-
-type Notes struct {
-	root string
-}
-
-func New() *Notes {
-	return &Notes{
-		root: config.Root,
-	}
-}

server/.notes/rnotes.go

@@ -1,27 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"net/http"
-)
-
-func (s *Server) notes(w http.ResponseWriter, r *http.Request) {
-	p := NewPathFromURL(r.URL.Path)
-	if p.IsDir() {
-		head(w, r)
-		notesHead(w, p)
-		notesDir(p, w, r)
-		foot(w, r)
-	} else if p.IsFile() {
-		head(w, r)
-		notesHead(w, p)
-		notesFile(p, w, r)
-		foot(w, r)
-	} else {
-		http.NotFound(w, r)
-	}
-}
-
-func notesHead(w http.ResponseWriter, p Path) {
-	fmt.Fprintln(w, h2(p.MultiLink()))
-}

server/.notes/rnotes_test.go

@@ -1 +0,0 @@
-package notes

server/.notes/submit.go

@@ -1,31 +0,0 @@
-package notes
-
-import (
-	"fmt"
-	"html"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path"
-	"strings"
-)
-
-func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.NotFound(w, r)
-		return
-	}
-	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)
-	}
-}

server/.notes/submit_test.go

@@ -1 +0,0 @@
-package notes

server/attach.go

@@ -0,0 +1,48 @@
+package server
+
+import (
+	"errors"
+	"io"
+	"local/notes-server/filetree"
+	"net/http"
+	"os"
+	"path"
+	"strings"
+)
+
+func (s *Server) attach(w http.ResponseWriter, r *http.Request) {
+	if err := s._attach(w, r); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+func (s *Server) _attach(w http.ResponseWriter, r *http.Request) error {
+	r.ParseMultipartForm(100 << 20)
+	file, handler, err := r.FormFile("file")
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	ft := filetree.NewPathFromURL(r.URL.Path)
+	local := ft.Local
+	target := path.Join(path.Dir(local), "."+path.Base(local)+".attachments", handler.Filename)
+
+	os.MkdirAll(path.Dir(target), os.ModePerm)
+	if fi, err := os.Stat(target); err != nil && !os.IsNotExist(err) {
+		return err
+	} else if err == nil && fi.IsDir() {
+		return errors.New("invalid path")
+	}
+	f, err := os.Create(target)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	if _, err := io.Copy(f, file); err != nil {
+		return err
+	}
+
+	http.Redirect(w, r, "/notes"+strings.TrimPrefix(ft.HREF, "/attach"), http.StatusSeeOther)
+	return nil
+}

server/comment.go

@@ -0,0 +1,35 @@
+package server
+
+import (
+	"html"
+	"local/notes-server/filetree"
+	"net/http"
+	"path"
+	"strconv"
+	"strings"
+)
+
+func (s *Server) comment(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "POST" {
+		http.NotFound(w, r)
+		return
+	}
+	linenos := r.FormValue("lineno")
+	lineno, err := strconv.Atoi(linenos)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	comment := r.FormValue("content")
+	comment = html.UnescapeString(comment)
+	comment = strings.ReplaceAll(comment, "\r", "")
+
+	err = s.Notes.Comment(r.URL.Path, lineno, comment)
+	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)
+}

server/notes.go

@@ -2,9 +2,12 @@ package server
 
 import (
 	"fmt"
+	"local/notes-server/config"
 	"local/notes-server/filetree"
 	"net/http"
 	"path"
+	"regexp"
+	"strings"
 )
 
 func (s *Server) notes(w http.ResponseWriter, r *http.Request) {
@@ -48,28 +51,72 @@ func (s *Server) file(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
-	fileHead(w, filetree.NewPathFromURL(r.URL.Path).BaseHREF)
+	s.fileHead(w, r.URL.Path)
 	fmt.Fprintln(w, file)
 }
 
-func fileHead(w http.ResponseWriter, baseHREF string) {
+func (s *Server) fileHead(w http.ResponseWriter, path string) {
+	baseHREF := filetree.NewPathFromURL(path).BaseHREF
 	htmlEdit(w, baseHREF)
 	htmlDelete(w, baseHREF)
+	s.htmlAttachments(w, path)
 }
 
 func htmlEdit(w http.ResponseWriter, baseHREF string) {
-	fmt.Fprintf(w, `<div style='display:inline-block'>
+	if config.ReadOnly {
-      <a href=%q><input type="button" value="Edit"></input></a>
+		return
+	}
+	fmt.Fprintf(w, `<div style='display:inline-block; margin-top: .75em; margin-bottom: .75em;'>
+      <a href=%q class="button">Edit</a>
    </div><br>`, path.Join("/edit/", baseHREF))
 }
 
 func htmlDelete(w http.ResponseWriter, baseHREF string) {
-	fmt.Fprintf(w, `<div style='display:inline-block'>
+	if config.ReadOnly {
-      <a href=%q><input type="button" value="Delete" onclick="return confirm('Delete?');"></input></a>
+		return
+	}
+	fmt.Fprintf(w, `<div style='display:inline-block; margin-top: .75em; margin-bottom: .75em;'>
+      <a href=%q class="button" onclick="return confirm('Delete?');">Delete</a>
    </div><br>`, path.Join("/delete/", baseHREF))
 }
 
+func (s *Server) htmlAttachments(w http.ResponseWriter, urlPath string) {
+	dir := path.Dir(urlPath)
+	f := "." + path.Base(urlPath) + ".attachments"
+	_, files, _ := s.Notes.Dir(path.Join(dir, f))
+	form := fmt.Sprintf(`
+         <form enctype="multipart/form-data" action="/attach/%s" method="post">
+            <input type="file" name="file" required/>
+            <input type="submit" value="+"/>
+         </form>
+   `, strings.TrimPrefix(urlPath, "/notes/"))
+	if config.ReadOnly {
+		form = ""
+	}
+	lines := strings.Split(files, "\n")
+	for i := range lines {
+		pattern := regexp.MustCompile(`\.(png|jpg|jpeg|gif)">`)
+		if !pattern.MatchString(lines[i]) {
+			lines[i] = strings.ReplaceAll(lines[i], "<a", "<a download")
+		}
+		lines[i] = strings.ReplaceAll(lines[i], `href="/notes`, `href="/raw`)
+	}
+	files = strings.Join(lines, "\n")
+	fmt.Fprintf(w, `<div style='display:inline-block' class="attachments">
+      <details>
+         <summary style="display: flex">
+            <span style="flex-grow: 2">Attachments</span>
+         </summary>
+         %s
+         %s
+      </details>
+   </div><br>`, form, files)
+}
+
 func htmlCreate(w http.ResponseWriter, baseHREF string) {
+	if config.ReadOnly {
+		return
+	}
 	fmt.Fprintf(w, `
        <form action=%q method="get">
           <input type="text" name="base"></input>
@@ -80,7 +127,7 @@ func htmlCreate(w http.ResponseWriter, baseHREF string) {
 
 func htmlSearch(w http.ResponseWriter) {
 	fmt.Fprintf(w, `
-      <form action=%q method="post" style="padding-top: 2.5em">
+      <form action=%q method="post" >
          <input type="text" name="keywords"></input>
          <button type="submit">Search</button>
       </form>

server/raw.go

@@ -0,0 +1,33 @@
+package server
+
+import (
+	"io"
+	"local/notes-server/filetree"
+	"local/simpleserve/simpleserve"
+	"net/http"
+	"os"
+)
+
+func (s *Server) raw(w http.ResponseWriter, r *http.Request) {
+	if err := s._raw(w, r); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+func (s *Server) _raw(w http.ResponseWriter, r *http.Request) error {
+	simpleserve.SetContentTypeIfMedia(w, r)
+	p := filetree.NewPathFromURL(r.URL.Path)
+	if !p.IsFile() {
+		http.NotFound(w, r)
+		return nil
+	}
+	f, err := os.Open(p.Local)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+	if _, err := io.Copy(w, f); err != nil {
+		return err
+	}
+	return nil
+}

server/routes.go

@@ -3,49 +3,65 @@ package server
 import (
 	"fmt"
 	"local/gziphttp"
+	"local/notes-server/config"
 	"local/router"
 	"net/http"
 	"path/filepath"
+	"strings"
 )
 
 func (s *Server) Routes() error {
 	wildcard := router.Wildcard
-	endpoints := []struct {
+	endpoints := map[string]struct {
-		path    string
 		handler http.HandlerFunc
 	}{
-		{
+		"/": {
-			path:    "/",
 			handler: s.root,
 		},
-		{
+		fmt.Sprintf("raw/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("notes/%s%s", wildcard, wildcard),
+			handler: s.gzip(s.authenticate(s.raw)),
+		},
+		fmt.Sprintf("notes/%s%s", wildcard, wildcard): {
 			handler: s.gzip(s.authenticate(s.notes)),
 		},
-		{
+		fmt.Sprintf("edit/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("edit/%s%s", wildcard, wildcard),
 			handler: s.gzip(s.authenticate(s.edit)),
 		},
-		{
+		fmt.Sprintf("delete/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("delete/%s%s", wildcard, wildcard),
 			handler: s.gzip(s.authenticate(s.delete)),
 		},
-		{
+		fmt.Sprintf("submit/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("submit/%s%s", wildcard, wildcard),
 			handler: s.gzip(s.authenticate(s.submit)),
 		},
-		{
+		fmt.Sprintf("create/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("create/%s%s", wildcard, wildcard),
 			handler: s.gzip(s.authenticate(s.create)),
 		},
-		{
+		fmt.Sprintf("attach/%s%s", wildcard, wildcard): {
-			path:    fmt.Sprintf("search"),
+			handler: s.gzip(s.authenticate(s.attach)),
+		},
+		fmt.Sprintf("comment/%s%s", wildcard, wildcard): {
+			handler: s.gzip(s.authenticate(s.comment)),
+		},
+		fmt.Sprintf("search"): {
 			handler: s.gzip(s.authenticate(s.search)),
 		},
 	}
 
-	for _, endpoint := range endpoints {
+	for path, endpoint := range endpoints {
-		if err := s.Add(endpoint.path, endpoint.handler); err != nil {
+		if config.ReadOnly {
+			for _, prefix := range []string{
+				"edit/",
+				"delete/",
+				"create/",
+				"submit/",
+				"attach/",
+			} {
+				if strings.HasPrefix(path, prefix) {
+					endpoint.handler = http.NotFound
+				}
+			}
+		}
+		if err := s.Add(path, endpoint.handler); err != nil {
 			return err
 		}
 	}

server/submit.go

@@ -1,6 +1,8 @@
 package server
 
 import (
+	"bytes"
+	"fmt"
 	"html"
 	"local/notes-server/filetree"
 	"net/http"
@@ -16,6 +18,7 @@ func (s *Server) submit(w http.ResponseWriter, r *http.Request) {
 	content := r.FormValue("content")
 	content = html.UnescapeString(content)
 	content = strings.ReplaceAll(content, "\r", "")
+	content = trimLines(content)
 	err := s.Notes.Submit(r.URL.Path, content)
 	if err != nil {
 		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)
 	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]
+}

server/submit_test.go

@@ -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)
+		}
+	})
+}

versions/max_file_size.go

@@ -0,0 +1,38 @@
+package versions
+
+import (
+	"fmt"
+	"local/notes-server/config"
+	"strings"
+)
+
+func getScript() string {
+	maxSizeMB := config.MaxSizeMB
+	if maxSizeMB == 0 {
+		maxSizeMB = 1
+	}
+	return strings.ReplaceAll(script, "{{{MAXSIZE}}}", fmt.Sprint(maxSizeMB<<20))
+}
+
+const script = `#!/bin/bash
+function main() {
+  local maxsize={{{MAXSIZE}}}
+  if [[ "$maxsize" == 0 ]]; then
+    return
+  fi
+  (
+    git diff --name-only --cached
+    git diff --name-only
+    git ls-files --others --exclude-standard
+  ) 2>&1 \
+  | sort -u \
+  | while read -r file; do
+    local size="$(du -sk "$file" | awk '{print $1}')000"
+    if [ "$size" -gt "$maxsize" ]; then
+       echo "file=$file, size=$size, max=$maxsize" >&2
+       git reset HEAD -- "$file"
+    fi
+  done
+}
+main
+`

versions/versions.go

@@ -2,8 +2,13 @@ package versions
 
 import (
 	"fmt"
+	"io/ioutil"
 	"local/notes-server/config"
+	"log"
+	"os"
 	"os/exec"
+	"path"
+	"strings"
 	"time"
 )
 
@@ -15,7 +20,9 @@ func New() (*Versions, error) {
 	v.cmd("git", "init")
 	v.cmd("git", "config", "user.email", "user@user.user")
 	v.cmd("git", "config", "user.name", "user")
-	return v, nil
+	s := getScript()
+	err := ioutil.WriteFile(path.Join(config.Root, "./.git/hooks/pre-commit"), []byte(s), os.ModePerm)
+	return v, err
 }
 
 func (v *Versions) Gitmmit() error {
@@ -39,6 +46,9 @@ func (v *Versions) Commit() error {
 func (v *Versions) cmd(cmd string, args ...string) error {
 	command := exec.Command(cmd, args...)
 	command.Dir = config.Root
-	_, err := command.CombinedOutput()
+	out, err := command.CombinedOutput()
+	if err != nil {
+		log.Println(cmd, args, ":", strings.TrimSpace(string(out)))
+	}
 	return err
 }