ready to pass from server to monitor but monitor still needs save to disk and reload
Former-commit-id: 1cebef822fdc157f0622b4e0fb9f93db48e0e70d
This commit is contained in:
BIN
server/.routes.go.swp
Normal file
BIN
server/.routes.go.swp
Normal file
Binary file not shown.
@@ -1,12 +1,16 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"local/router"
|
||||
"local/rssmon3/monitor"
|
||||
"local/rssmon3/rss"
|
||||
"log"
|
||||
"net/http"
|
||||
"regexp"
|
||||
"time"
|
||||
)
|
||||
|
||||
func (s *Server) Routes() error {
|
||||
@@ -15,6 +19,7 @@ func (s *Server) Routes() error {
|
||||
handler http.HandlerFunc
|
||||
}{
|
||||
{path: fmt.Sprintf("/api/tag/%s", router.Wildcard), handler: s.tag},
|
||||
{path: fmt.Sprintf("/api/feed"), handler: s.feed},
|
||||
}
|
||||
for _, handle := range handles {
|
||||
if err := s.router.Add(handle.path, handle.handler); err != nil {
|
||||
@@ -47,6 +52,57 @@ func (s *Server) tag(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
tag := regexp.MustCompile("^.*\\/").ReplaceAllString(r.URL.Path, "")
|
||||
log.Println(tag)
|
||||
feeds, err := rss.TaggedFeeds(tag)
|
||||
if err != nil {
|
||||
s.error(w, r, err)
|
||||
return
|
||||
}
|
||||
items := []*rss.Item{}
|
||||
for _, feed := range feeds {
|
||||
feedItems, err := feed.Items(20)
|
||||
if err != nil {
|
||||
s.error(w, r, err)
|
||||
}
|
||||
items = append(items, feedItems...)
|
||||
}
|
||||
if err := rss.WriteFeed(w, tag, items); err != nil {
|
||||
s.error(w, r, err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Server) feed(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "PUT" {
|
||||
s.notFound(w, r)
|
||||
return
|
||||
}
|
||||
var putFeed struct {
|
||||
URL string `json:"url"`
|
||||
Interval time.Duration `json:"refresh"`
|
||||
TitleFilter string `json:"items"`
|
||||
ContentFilter string `json:"content"`
|
||||
Tags []string `json:"tags"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&putFeed); err != nil {
|
||||
s.userError(w, r, err)
|
||||
return
|
||||
}
|
||||
f := &rss.Feed{
|
||||
Key: putFeed.URL,
|
||||
URL: putFeed.URL,
|
||||
TitleFilter: putFeed.TitleFilter,
|
||||
ContentFilter: putFeed.ContentFilter,
|
||||
Tags: putFeed.Tags,
|
||||
}
|
||||
if err := rss.SubmitFeed(f); err != nil {
|
||||
s.error(w, r, err)
|
||||
return
|
||||
}
|
||||
i, err := monitor.NewItem(f.Key, putFeed.Interval)
|
||||
if err != nil {
|
||||
s.error(w, r, err)
|
||||
return
|
||||
}
|
||||
log.Println(i)
|
||||
s.error(w, r, errors.New("not impl"))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user