Archive
/
Rssmon2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add endpoint for feed item get

master
Bel LaPointe 2018-10-09 19:21:45 -06:00
parent dbeca16e07
commit 1e4865f2a5
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/server.go
View File

@ -20,13 +20,15 @@ type Server struct {
addr string addr string
newFeedHandler func(string, string, string, time.Duration) newFeedHandler func(string, string, string, time.Duration)
getFeedHandler func(string, int) (string, error) getFeedHandler func(string, int) (string, error)
getFeedItemHandler func(string) (string, error)
} }
func New(addr string, newFeedHandler func(string, string, string, time.Duration), getFeedHandler func(string, int) (string, error)) (*Server, error) { func New(addr string, newFeedHandler func(string, string, string, time.Duration), getFeedHandler func(string, int) (string, error), getFeedItemHandler func(string) (string, error)) (*Server, error) {
return &Server{ return &Server{
addr: addr, addr: addr,
newFeedHandler: newFeedHandler, newFeedHandler: newFeedHandler,
getFeedHandler: getFeedHandler, getFeedHandler: getFeedHandler,
getFeedItemHandler: getFeedItemHandler,
}, nil }, nil
} }
@ -85,7 +87,11 @@ func (s *Server) api(w http.ResponseWriter, r *http.Request) {
func (s *Server) feed(w http.ResponseWriter, r *http.Request) { func (s *Server) feed(w http.ResponseWriter, r *http.Request) {
switch r.Method { switch r.Method {
case "GET": case "GET":
if advance(r) == "item" {
s.getFeedItem(w, r)
} else {
s.getFeed(w, r) s.getFeed(w, r)
}
case "POST": case "POST":
s.newFeed(w, r) s.newFeed(w, r)
case "PUT": case "PUT":
@ -129,6 +135,22 @@ func (s *Server) newFeed(w http.ResponseWriter, r *http.Request) {
s.newFeedHandler(newFeedBody.URL, newFeedBody.ItemFilter, newFeedBody.ContentFilter, interval) s.newFeedHandler(newFeedBody.URL, newFeedBody.ItemFilter, newFeedBody.ContentFilter, interval)
} }
func (s *Server) getFeedItem(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery)
if err != nil {
logger.Logf("cannot get feed item to read: %v", err)
s.mybad(w, r)
return
}
feedBody, err := s.getFeedItemHandler(url.Get("url"))
if err != nil {
logger.Logf("cannot get feed item %s: %v", url.Get("url"), err)
s.mybad(w, r)
return
}
fmt.Fprintln(w, feedBody)
}
func (s *Server) getFeed(w http.ResponseWriter, r *http.Request) { func (s *Server) getFeed(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery) url, err := url.ParseQuery(r.URL.RawQuery)
if err != nil { if err != nil {
@ -136,7 +158,6 @@ func (s *Server) getFeed(w http.ResponseWriter, r *http.Request) {
s.mybad(w, r) s.mybad(w, r)
return return
} }
defer r.Body.Close()
limit := 20 limit := 20
if url.Get("limit") != "" { if url.Get("limit") != "" {
limit, err = strconv.Atoi(url.Get("limit")) limit, err = strconv.Atoi(url.Get("limit"))