cws
/
cabinet
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

adoc support 

* These changes are unverified and I don't know what they're really for
* Ref #7
This commit is contained in:
Chris Sexton 2020-07-23 12:13:58 -04:00
parent b15a85131f
commit 6988064309
4 changed files with 81 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/auth.go
View File

@ -49,7 +49,7 @@ func makeKey() (string, error) {
}
func New(db *db.Database, name, password string) (*User, error) {
q := `insert into users values (null, ?, ?, ?, ?)`
q := `insert or replace into users values (null, ?, ?, ?, ?)`
key, err := makeKey()
if err != nil {

31
entry/entry.go
View File

@ -2,6 +2,8 @@ package entry
import (
"fmt"
"io"
"os/exec"
"regexp"
"strings"
"time"
@ -53,7 +55,7 @@ func PrepareTable(tx *sqlx.Tx) error {
return nil
}
func NewFromMd(db *db.Database, body string) *Entry {
func NewFromAdoc(db *db.Database, body string) *Entry {
e := New(db)
e.Content = body
e.Title = e.GenerateTitle()
@ -61,6 +63,33 @@ func NewFromMd(db *db.Database, body string) *Entry {
return e
}
func pandocMdToAdoc(body string) string {
log.Debug().Str("input", body).Msgf("converting md->adoc")
cmd := exec.Command("pandoc", "-f", "commonmark", "-t", "asciidoctor")
stdin, err := cmd.StdinPipe()
if err != nil {
log.Error().Err(err).Msgf("could not get stdin")
}
go func() {
defer stdin.Close()
io.WriteString(stdin, body)
}()
out, err := cmd.CombinedOutput()
if err != nil {
log.Error().Err(err).Msgf("could not get stdout")
}
log.Debug().Msgf("md->adoc: %s", out)
return string(out)
}
func NewFromMd(db *db.Database, body string) *Entry {
body = pandocMdToAdoc(body)
return NewFromAdoc(db, body)
}
func New(db *db.Database) *Entry {
e := Entry{
db: db,

103
web/entry.go
View File

@ -13,6 +13,18 @@ import (
"github.com/gorilla/mux"
)
func (web *Web) writeJSON(w http.ResponseWriter, code int, data interface{}) error {
w.Header().Set("content-type", "application/json")
resp, err := json.Marshal(data)
if err != nil {
w.WriteHeader(500)
return err
}
w.WriteHeader(code)
w.Write(resp)
return nil
}
func (web *Web) editEntry(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
slug := vars["slug"]
@ -43,70 +55,67 @@ func (web *Web) editEntry(w http.ResponseWriter, r *http.Request) {
err = oldEntry.Update()
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
web.writeJSON(w, 500, err)
return
}
resp, err := json.Marshal(oldEntry)
web.writeJSON(w, 200, oldEntry)
}
func (web *Web) newAdocEntry(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
web.writeJSON(w, 500, err)
return
}
newEntry := entry.NewFromAdoc(web.db, string(body))
err = newEntry.Create()
if err != nil {
web.writeJSON(w, 500, err)
return
}
w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
web.writeJSON(w, 200, newEntry)
}
func (web *Web) newMarkdownEntry(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
log.Error().Err(err).Msgf("could not read message body")
web.writeJSON(w, 500, err)
return
}
newEntry := entry.NewFromMd(web.db, string(body))
err = newEntry.Create()
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
log.Error().Err(err).Msgf("could not create entry")
web.writeJSON(w, 500, err)
return
}
resp, err := json.Marshal(newEntry)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
web.writeJSON(w, 200, newEntry)
}
func (web *Web) newEntry(w http.ResponseWriter, r *http.Request) {
log.Debug().
Str("content-type", r.Header.Get("Content-Type")).
Msgf("newEntry")
dec := json.NewDecoder(r.Body)
newEntry := entry.New(web.db)
err := dec.Decode(&newEntry)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
log.Error().Err(err).Msgf("could not decode entry")
web.writeJSON(w, 500, err)
return
}
err = newEntry.Create()
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
log.Error().Err(err).Msgf("could not create raw entry")
web.writeJSON(w, 500, err)
return
}
resp, err := json.Marshal(newEntry)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
web.writeJSON(w, 200, newEntry)
}
func (web *Web) allEntries(w http.ResponseWriter, r *http.Request) {
@ -122,19 +131,11 @@ func (web *Web) allEntries(w http.ResponseWriter, r *http.Request) {
entries, err := entry.SearchByTag(web.db, query, tags)
if err != nil {
log.Error().Msgf("Error querying: %w", err)
w.WriteHeader(500)
fmt.Fprint(w, err)
web.writeJSON(w, 500, err)
return
}
resp, err := json.Marshal(entries)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
web.writeJSON(w, 200, entries)
}
func (web *Web) getEntry(w http.ResponseWriter, r *http.Request) {
@ -143,25 +144,16 @@ func (web *Web) getEntry(w http.ResponseWriter, r *http.Request) {
entry, err := entry.GetBySlug(web.db, slug)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
web.writeJSON(w, 500, err)
return
}
if !web.AuthCheck(r) && !entry.HasTag("public") {
w.WriteHeader(401)
fmt.Fprint(w, "not allowed")
web.writeJSON(w, 401, "not authorized")
return
}
resp, err := json.Marshal(entry)
if err != nil {
w.WriteHeader(500)
fmt.Fprint(w, err)
return
}
w.Header().Set("content-type", "application/json")
fmt.Fprint(w, string(resp))
web.writeJSON(w, 200, entry)
}
func (web *Web) removeEntry(w http.ResponseWriter, r *http.Request) {
@ -171,9 +163,8 @@ func (web *Web) removeEntry(w http.ResponseWriter, r *http.Request) {
err := entry.RemoveBySlug(web.db, slug)
if err != nil {
log.Error().Msgf("Error deleting: %s", err)
w.WriteHeader(500)
fmt.Fprint(w, err)
web.writeJSON(w, 500, err)
return
}
w.WriteHeader(200)
web.writeJSON(w, 200, "success")
}

5
web/routes.go
View File

@ -88,11 +88,12 @@ func (web *Web) routeSetup() http.Handler {
// curl 'http://127.0.0.1:8080/v1/test' -X POST -H 'Accept: application/json, text/plain, */*' --compressed -H 'Content-Type: application/json;charset=utf-8' --data '{ "test": 1 }'
authedApi.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost)
authedApi.HandleFunc("/entries", web.newEntry).Methods(http.MethodPost).
HeadersRegexp("Content-Type", "application/(text|json).*")
authedApi.HandleFunc("/entries", web.newMarkdownEntry).Methods(http.MethodPost).
HeadersRegexp("Content-Type", "application/markdown.*")
HeadersRegexp("Content-Type", "application/markdown")
authedApi.HandleFunc("/entries", web.newAdocEntry).Methods(http.MethodPost).
HeadersRegexp("Content-Type", "application/asciidoc")
authedApi.HandleFunc("/entries/{slug}", web.removeEntry).Methods(http.MethodDelete)
authedApi.HandleFunc("/entries/{slug}", web.editEntry).Methods(http.MethodPut)