Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f0a1c21678 | ||
|
|
807072a77f | ||
|
|
081d50328f | ||
|
4e2b7b3c85 |
8
Dockerfile
Normal file → Executable file
8
Dockerfile
Normal file → Executable file
@@ -1,11 +1,8 @@
|
||||
FROM frolvlad/alpine-glibc:alpine-3.9_glibc-2.29
|
||||
RUN apk update && apk add --no-cache ca-certificates git
|
||||
|
||||
FROM golang:1.13-alpine as certs
|
||||
RUN apk update && apk add --no-cache ca-certificates
|
||||
|
||||
FROM busybox:glibc
|
||||
RUN mkdir -p /var/log
|
||||
WORKDIR /main
|
||||
COPY --from=certs /etc/ssl/certs /etc/ssl/certs
|
||||
|
||||
COPY . .
|
||||
|
||||
@@ -13,4 +10,3 @@ ENV GOPATH=""
|
||||
ENV MNT="/mnt/"
|
||||
ENTRYPOINT ["/main/exec-notes-server"]
|
||||
CMD []
|
||||
|
||||
|
||||
4
TODO
Normal file → Executable file
4
TODO
Normal file → Executable file
@@ -30,10 +30,10 @@ x main test -
|
||||
x TOC levels
|
||||
x delete pages
|
||||
x search
|
||||
FTS
|
||||
x FTS
|
||||
https://stackoverflow.com/questions/26709971/could-this-be-more-efficient-in-go
|
||||
x move auth as flag in router
|
||||
x . and ../** as roots cause bugs in listing and loading and linking
|
||||
x `create` at root is a 400, base= in URL (when `create` input is empty)
|
||||
x versioning
|
||||
delete top-level pages
|
||||
versioning
|
||||
|
||||
@@ -5,6 +5,9 @@ type Paths []Path
|
||||
func (p Paths) List(full ...bool) string {
|
||||
content := "<ul>\n"
|
||||
for _, path := range p {
|
||||
if len(path.Base) > 0 && path.Base[0] == '.' {
|
||||
continue
|
||||
}
|
||||
if len(full) > 0 && full[0] {
|
||||
content += path.FullLI() + "\n"
|
||||
} else {
|
||||
|
||||
0
main_test.go
Normal file → Executable file
0
main_test.go
Normal file → Executable file
0
notes/delete.go
Normal file → Executable file
0
notes/delete.go
Normal file → Executable file
0
notes/delete_test.go
Normal file → Executable file
0
notes/delete_test.go
Normal file → Executable file
0
notes/notes.go
Normal file → Executable file
0
notes/notes.go
Normal file → Executable file
0
notes/notes_test.go
Normal file → Executable file
0
notes/notes_test.go
Normal file → Executable file
10
notes/search.go
Normal file → Executable file
10
notes/search.go
Normal file → Executable file
@@ -4,6 +4,7 @@ import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"local/notes-server/filetree"
|
||||
"log"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
@@ -19,11 +20,20 @@ func (n *Notes) Search(phrase string) (string, error) {
|
||||
if info.IsDir() {
|
||||
return nil
|
||||
}
|
||||
if size := info.Size(); size < 1 || size > (5*1024*1024) {
|
||||
return nil
|
||||
}
|
||||
ok, err := grepFile(walked, []byte(phrase))
|
||||
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)
|
||||
}
|
||||
return err
|
||||
},
|
||||
)
|
||||
|
||||
10
notes/search_test.go
Normal file → Executable file
10
notes/search_test.go
Normal file → Executable file
@@ -42,3 +42,13 @@ func TestSearch(t *testing.T) {
|
||||
t.Fatal(v, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSearchBigFiles(t *testing.T) {
|
||||
n := New()
|
||||
n.root = "/usr/local/bin"
|
||||
|
||||
_, err := n.Search("this file")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
asdf
|
||||
|
||||
this contains my search string
|
||||
@@ -1,5 +1,18 @@
|
||||
asdf
|
||||
searchString
|
||||
# h1
|
||||
|
||||
hi
|
||||
|
||||
here is my new line
|
||||
## h2
|
||||
|
||||
hi
|
||||
|
||||
### h3
|
||||
|
||||
hi
|
||||
|
||||
#### h4
|
||||
|
||||
hi
|
||||
|
||||
* bullet
|
||||
* 1
|
||||
0
server/.notes/notes.go
Normal file → Executable file
0
server/.notes/notes.go
Normal file → Executable file
0
server/html.go
Normal file → Executable file
0
server/html.go
Normal file → Executable file
0
server/notes.go
Normal file → Executable file
0
server/notes.go
Normal file → Executable file
0
versions/.versions.go
Normal file → Executable file
0
versions/.versions.go
Normal file → Executable file
0
versions/.versions_test.go
Normal file → Executable file
0
versions/.versions_test.go
Normal file → Executable file
2
versions/versions.go
Normal file → Executable file
2
versions/versions.go
Normal file → Executable file
@@ -13,6 +13,8 @@ type Versions struct {
|
||||
func New() (*Versions, error) {
|
||||
v := &Versions{}
|
||||
v.cmd("git", "init")
|
||||
v.cmd("git", "config", "user.email", "user@user.user")
|
||||
v.cmd("git", "config", "user.name", "user")
|
||||
return v, nil
|
||||
}
|
||||
|
||||
|
||||
0
versions/versions_test.go
Normal file → Executable file
0
versions/versions_test.go
Normal file → Executable file
3
wrapper.html
Normal file → Executable file
3
wrapper.html
Normal file → Executable file
@@ -18,6 +18,9 @@
|
||||
img {
|
||||
max-height: 400px;
|
||||
}
|
||||
body {
|
||||
font-size: 125%;
|
||||
}
|
||||
</style>
|
||||
</header>
|
||||
<body height="100%">
|
||||
|
||||
Reference in New Issue
Block a user