Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
095ba7820d | ||
|
|
96cce88aed | ||
|
|
baf739658e | ||
|
|
0c6d3a6c6a | ||
|
|
e8ea8d8abf | ||
|
|
79009305a1 | ||
|
|
03f5742a91 | ||
|
|
4ad68109d2 | ||
|
|
61f97f2f0a | ||
|
|
31ebc8ffbc | ||
|
|
567c74bb57 | ||
|
|
c4161c9db6 | ||
|
|
fd67e7033b | ||
|
|
cbd287e20e | ||
|
|
479caef353 | ||
|
|
8fefc60f6b | ||
|
|
014076dd06 | ||
|
|
d408229ba9 | ||
|
|
47d6c37819 | ||
|
|
1eb8fa7223 | ||
|
|
f9c28b3c45 | ||
|
|
a26d34c2b3 | ||
|
|
4d076ede3d | ||
|
|
f60d0618e6 | ||
|
|
b975a7c103 | ||
|
|
0e9150b8f6 | ||
|
|
4fdbee6df5 | ||
|
|
e6a126ea0b | ||
|
|
43d44a4518 | ||
|
|
8bf7503c8e | ||
|
|
785215bd3c | ||
|
|
952e04815a | ||
|
|
d6c95a536c | ||
|
|
9785ef5e1e | ||
|
|
3b7aa70e44 |
File diff suppressed because one or more lines are too long
0
config/rotate.py
Normal file → Executable file
0
config/rotate.py
Normal file → Executable file
Submodule config/water.css updated: 7e86e4f67c...576eee5b82
63
notes/comment.go
Executable file
63
notes/comment.go
Executable file
@@ -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)
|
||||
}
|
||||
56
notes/comment_test.go
Normal file
56
notes/comment_test.go
Normal file
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -26,11 +26,13 @@ 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%%">
|
||||
<table style="width:100%%; height: 90%%">
|
||||
<textarea name="content" style="width:100%%; min-height:90%%; cursor:crosshair;">%s</textarea>
|
||||
<div class="form">
|
||||
<form action="/submit/%s" method="post">
|
||||
<table>
|
||||
<textarea name="content" style="cursor:crosshair;">%s</textarea>
|
||||
</table>
|
||||
<button type="submit">Submit</button>
|
||||
</form>
|
||||
</div>
|
||||
`, href, b)
|
||||
}
|
||||
|
||||
124
notes/file.go
124
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{
|
||||
Flags: html.CommonFlags | html.TOC,
|
||||
})
|
||||
parser := parser.NewWithExtensions(parser.CommonExtensions | parser.HeadingIDs | parser.AutoHeadingIDs | parser.Titleblock)
|
||||
content := markdown.ToHTML(b, parser, renderer)
|
||||
return string(content) + "\n", nil
|
||||
return n.gomarkdown(urlPath, b)
|
||||
return n.blackfriday(urlPath, b)
|
||||
return n.goldmark(urlPath, b)
|
||||
return n.md2min(urlPath, b)
|
||||
}
|
||||
|
||||
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 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
|
||||
}
|
||||
}
|
||||
|
||||
35
notes/md/file.go
Executable file
35
notes/md/file.go
Executable file
@@ -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
|
||||
}
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package notes
|
||||
@@ -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)
|
||||
}
|
||||
@@ -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())
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package notes
|
||||
@@ -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))
|
||||
}
|
||||
@@ -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)
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
package notes
|
||||
|
||||
import "local/notes-server/config"
|
||||
|
||||
type Notes struct {
|
||||
root string
|
||||
}
|
||||
|
||||
func New() *Notes {
|
||||
return &Notes{
|
||||
root: config.Root,
|
||||
}
|
||||
}
|
||||
@@ -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()))
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package notes
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
package notes
|
||||
48
server/attach.go
Executable file
48
server/attach.go
Executable file
@@ -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
|
||||
}
|
||||
35
server/comment.go
Executable file
35
server/comment.go
Executable file
@@ -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)
|
||||
}
|
||||
@@ -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) {
|
||||
if config.ReadOnly {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(w, `<div style='display:inline-block'>
|
||||
<a href=%q><input type="button" value="Edit"></input></a>
|
||||
</div><br>`, path.Join("/edit/", baseHREF))
|
||||
}
|
||||
|
||||
func htmlDelete(w http.ResponseWriter, baseHREF string) {
|
||||
if config.ReadOnly {
|
||||
return
|
||||
}
|
||||
fmt.Fprintf(w, `<div style='display:inline-block'>
|
||||
<a href=%q><input type="button" value="Delete" onclick="return confirm('Delete?');"></input></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>
|
||||
|
||||
33
server/raw.go
Executable file
33
server/raw.go
Executable file
@@ -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
|
||||
}
|
||||
@@ -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 {
|
||||
path string
|
||||
endpoints := map[string]struct {
|
||||
handler http.HandlerFunc
|
||||
}{
|
||||
{
|
||||
path: "/",
|
||||
"/": {
|
||||
handler: s.root,
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("notes/%s%s", wildcard, wildcard),
|
||||
fmt.Sprintf("raw/%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)),
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("edit/%s%s", wildcard, wildcard),
|
||||
fmt.Sprintf("edit/%s%s", wildcard, wildcard): {
|
||||
handler: s.gzip(s.authenticate(s.edit)),
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("delete/%s%s", wildcard, wildcard),
|
||||
fmt.Sprintf("delete/%s%s", wildcard, wildcard): {
|
||||
handler: s.gzip(s.authenticate(s.delete)),
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("submit/%s%s", wildcard, wildcard),
|
||||
fmt.Sprintf("submit/%s%s", wildcard, wildcard): {
|
||||
handler: s.gzip(s.authenticate(s.submit)),
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("create/%s%s", wildcard, wildcard),
|
||||
fmt.Sprintf("create/%s%s", wildcard, wildcard): {
|
||||
handler: s.gzip(s.authenticate(s.create)),
|
||||
},
|
||||
{
|
||||
path: fmt.Sprintf("search"),
|
||||
fmt.Sprintf("attach/%s%s", wildcard, wildcard): {
|
||||
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 {
|
||||
if err := s.Add(endpoint.path, endpoint.handler); err != nil {
|
||||
for path, endpoint := range endpoints {
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ func (s *Server) search(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
head(w, r)
|
||||
fmt.Fprintln(w, h2(filetree.NewPathFromURL("/notes").MultiLink()))
|
||||
htmlSearch(w)
|
||||
fmt.Fprintln(w, h1(keywords), results)
|
||||
foot(w, r)
|
||||
}
|
||||
|
||||
35
versions/max_file_size.go
Normal file
35
versions/max_file_size.go
Normal file
@@ -0,0 +1,35 @@
|
||||
package versions
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"local/notes-server/config"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func getScript() string {
|
||||
return strings.ReplaceAll(script, "{{{MAXSIZE}}}", fmt.Sprint(config.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
|
||||
`
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user