james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-05-24 21:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Nazar Kanaev 2020-08-10 16:06:06 +01:00
parent 9147d38f99
commit efec1335f5
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/handlers.go
View File

@ -37,6 +37,24 @@ var routes []Route = []Route{
p("/page", PageCrawlHandler), p("/page", PageCrawlHandler),
} }
type FolderCreateForm struct {
Title string `json:"title"`
}
type FolderUpdateForm struct {
Title *string `json:"title,omitempty"`
IsExpanded *bool `json:"is_expanded,omitempty"`
}
type FeedCreateForm struct {
Url string `json:"url"`
FolderID *int64 `json:"folder_id,omitempty"`
}
type ItemUpdateForm struct {
Status *storage.ItemStatus `json:"status,omitempty"`
}
func IndexHandler(rw http.ResponseWriter, req *http.Request) { func IndexHandler(rw http.ResponseWriter, req *http.Request) {
t := template.Must(template.New("index.html").Delims("{%", "%}").Funcs(template.FuncMap{ t := template.Must(template.New("index.html").Delims("{%", "%}").Funcs(template.FuncMap{
"inline": func(svg string) template.HTML { "inline": func(svg string) template.HTML {
@ -67,16 +85,12 @@ func StatusHandler(rw http.ResponseWriter, req *http.Request) {
}) })
} }
type NewFolder struct {
Title string `json:"title"`
}
func FolderListHandler(rw http.ResponseWriter, req *http.Request) { func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" { if req.Method == "GET" {
list := db(req).ListFolders() list := db(req).ListFolders()
writeJSON(rw, list) writeJSON(rw, list)
} else if req.Method == "POST" { } else if req.Method == "POST" {
var body NewFolder var body FolderCreateForm
if err := json.NewDecoder(req.Body).Decode(&body); err != nil { if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
handler(req).log.Print(err) handler(req).log.Print(err)
rw.WriteHeader(http.StatusBadRequest) rw.WriteHeader(http.StatusBadRequest)
@ -95,11 +109,6 @@ func FolderListHandler(rw http.ResponseWriter, req *http.Request) {
} }
} }
type UpdateFolder struct {
Title *string `json:"title,omitempty"`
IsExpanded *bool `json:"is_expanded,omitempty"`
}
func FolderHandler(rw http.ResponseWriter, req *http.Request) { func FolderHandler(rw http.ResponseWriter, req *http.Request) {
id, err := strconv.ParseInt(Vars(req)["id"], 10, 64) id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
if err != nil { if err != nil {
@ -107,7 +116,7 @@ func FolderHandler(rw http.ResponseWriter, req *http.Request) {
return return
} }
if req.Method == "PUT" { if req.Method == "PUT" {
var body UpdateFolder var body FolderUpdateForm
if err := json.NewDecoder(req.Body).Decode(&body); err != nil { if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
handler(req).log.Print(err) handler(req).log.Print(err)
rw.WriteHeader(http.StatusBadRequest) rw.WriteHeader(http.StatusBadRequest)
@ -126,11 +135,6 @@ func FolderHandler(rw http.ResponseWriter, req *http.Request) {
} }
} }
type NewFeed struct {
Url string `json:"url"`
FolderID *int64 `json:"folder_id,omitempty"`
}
func FeedRefreshHandler(rw http.ResponseWriter, req *http.Request) { func FeedRefreshHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "POST" { if req.Method == "POST" {
handler(req).fetchAllFeeds() handler(req).fetchAllFeeds()
@ -161,7 +165,7 @@ func FeedListHandler(rw http.ResponseWriter, req *http.Request) {
list := db(req).ListFeeds() list := db(req).ListFeeds()
writeJSON(rw, list) writeJSON(rw, list)
} else if req.Method == "POST" { } else if req.Method == "POST" {
var feed NewFeed var feed FeedCreateForm
if err := json.NewDecoder(req.Body).Decode(&feed); err != nil { if err := json.NewDecoder(req.Body).Decode(&feed); err != nil {
handler(req).log.Print(err) handler(req).log.Print(err)
rw.WriteHeader(http.StatusBadRequest) rw.WriteHeader(http.StatusBadRequest)
@ -256,10 +260,6 @@ func FeedHandler(rw http.ResponseWriter, req *http.Request) {
} }
} }
type UpdateItem struct {
Status *storage.ItemStatus `json:"status,omitempty"`
}
func ItemHandler(rw http.ResponseWriter, req *http.Request) { func ItemHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "PUT" { if req.Method == "PUT" {
id, err := strconv.ParseInt(Vars(req)["id"], 10, 64) id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
@ -267,7 +267,7 @@ func ItemHandler(rw http.ResponseWriter, req *http.Request) {
rw.WriteHeader(http.StatusBadRequest) rw.WriteHeader(http.StatusBadRequest)
return return
} }
var body UpdateItem var body ItemUpdateForm
if err := json.NewDecoder(req.Body).Decode(&body); err != nil { if err := json.NewDecoder(req.Body).Decode(&body); err != nil {
handler(req).log.Print(err) handler(req).log.Print(err)
rw.WriteHeader(http.StatusBadRequest) rw.WriteHeader(http.StatusBadRequest)