james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-09-13 09:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

single, stateless endpoint for item list

Browse Source
This commit is contained in:
Nazar Kanaev
2020-07-07 11:50:34 +01:00
parent 7f8225b351
commit babb98d870
5 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
server/handlers.go
View File

@@ -259,26 +259,6 @@ func FeedHandler(rw http.ResponseWriter, req *http.Request) {
}
}
func findItems(db *storage.Storage, filter storage.ItemFilter) []storage.Item {
statusFilter := db.GetSettingsValue("filter")
if statusFilter != nil && len(statusFilter.(string)) != 0 {
status := storage.StatusValues[statusFilter.(string)]
filter.Status = &status
}
return db.ListItems(filter)
}
func FeedItemsHandler(rw http.ResponseWriter, req *http.Request) {
id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
if err != nil {
rw.WriteHeader(http.StatusBadRequest)
return
}
rw.WriteHeader(http.StatusOK)
items := findItems(db(req), storage.ItemFilter{FeedID: &id})
writeJSON(rw, items)
}
type UpdateItem struct {
Status *storage.ItemStatus `json:"status,omitempty"`
}
@@ -305,23 +285,21 @@ func ItemHandler(rw http.ResponseWriter, req *http.Request) {
}
}
func FolderItemsHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" {
id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
if err != nil {
rw.WriteHeader(http.StatusBadRequest)
return
}
items := findItems(db(req), storage.ItemFilter{FolderID: &id})
writeJSON(rw, items)
} else {
rw.WriteHeader(http.StatusMethodNotAllowed)
}
}
func ItemListHandler(rw http.ResponseWriter, req *http.Request) {
if req.Method == "GET" {
items := findItems(db(req), storage.ItemFilter{})
query := req.URL.Query()
filter := storage.ItemFilter{}
if folderID, err := strconv.ParseInt(query.Get("folder_id"), 10, 64); err == nil {
filter.FolderID = &folderID
}
if feedID, err := strconv.ParseInt(query.Get("feed_id"), 10, 64); err == nil {
filter.FeedID = &feedID
}
if status := query.Get("status"); len(status) != 0 {
statusValue := storage.StatusValues[status]
filter.Status = &statusValue
}
items := db(req).ListItems(filter)
writeJSON(rw, items)
} else {
rw.WriteHeader(http.StatusMethodNotAllowed)

2
server/server.go
View File

@@ -73,10 +73,8 @@ var routes []Route = []Route{
p("/api/status", StatusHandler),
p("/api/folders", FolderListHandler),
p("/api/folders/:id", FolderHandler),
p("/api/folders/:id/items", FolderItemsHandler),
p("/api/feeds", FeedListHandler),
p("/api/feeds/:id", FeedHandler),
p("/api/feeds/:id/items", FeedItemsHandler),
p("/api/feeds/find", FeedHandler),
p("/api/items", ItemListHandler),
p("/api/items/:id", ItemHandler),