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

Convert item and tag get to non-query params

master
Bel LaPointe 2018-10-10 15:31:50 -06:00
parent f48e9e23e3
commit 7ee5f9829c
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -36,8 +36,8 @@ func core() {
defer sclient.Close() defer sclient.Close()
ex.SClient = sclient ex.SClient = sclient
var server *server.Server var srv *server.Server
if server, err = server.New(config.Port, if srv, err = server.New(config.Port,
ex.NewFeed, ex.NewFeed,
ex.GetFeedRSS, ex.GetFeedRSS,
ex.GetFeedItem, ex.GetFeedItem,
@ -45,14 +45,14 @@ func core() {
); err != nil { ); err != nil {
panic(err) panic(err)
} }
ex.Srv = server ex.Srv = srv
if err := ex.LoadDB(); err != nil { if err := ex.LoadDB(); err != nil {
panic(err) panic(err)
} }
logger.Log("Starting with", config) logger.Log("Starting with", config)
if err := server.Serve(); err != nil { if err := srv.Serve(); err != nil {
panic(err) panic(err)
} }
} }

5
main_test.go
View File

@ -96,13 +96,12 @@ func Test_Core(t *testing.T) {
}, },
{ {
method: "get", method: "get",
path: "api/feed/item", path: "api/feed/item/http___127_0_0_1_" + strings.Split(rssserver.URL, ":")[2] + "_feed.20181010_http___127_0_0_1_" + strings.Split(rssserver.URL, ":")[2] + "_itemB",
body: "http___127_0_0_1_" + strings.Split(rssserver.URL, ":")[2] + "_feed.20181010_http___127_0_0_1_" + strings.Split(rssserver.URL, ":")[2] + "_itemB",
status: 200, status: 200,
}, },
{ {
method: "get", method: "get",
path: "api/feed/tag?url=gotest", path: "api/feed/tag/gotest",
status: 200, status: 200,
}, },
{ {

22
server/server.go
View File

@ -142,15 +142,14 @@ func (s *Server) newFeed(w http.ResponseWriter, r *http.Request) {
} }
func (s *Server) getFeedTag(w http.ResponseWriter, r *http.Request) { func (s *Server) getFeedTag(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery) url := advance(r)
if err != nil { if url == "" {
logger.Logf("cannot get feed tag to read: %v", err) s.bad(w, r)
s.mybad(w, r)
return return
} }
feedBody, err := s.getFeedTagHandler(url.Get("url")) feedBody, err := s.getFeedTagHandler(url)
if err != nil { if err != nil {
logger.Logf("cannot get feed tag %s: %v", url.Get("url"), err) logger.Logf("cannot get feed tag %s: %v", url, err)
s.mybad(w, r) s.mybad(w, r)
return return
} }
@ -158,15 +157,14 @@ func (s *Server) getFeedTag(w http.ResponseWriter, r *http.Request) {
} }
func (s *Server) getFeedItem(w http.ResponseWriter, r *http.Request) { func (s *Server) getFeedItem(w http.ResponseWriter, r *http.Request) {
url, err := url.ParseQuery(r.URL.RawQuery) url := advance(r)
if err != nil { if url == "" {
logger.Logf("cannot get feed item to read: %v", err) s.bad(w, r)
s.mybad(w, r)
return return
} }
feedBody, err := s.getFeedItemHandler(url.Get("url")) feedBody, err := s.getFeedItemHandler(url)
if err != nil { if err != nil {
logger.Logf("cannot get feed item %s: %v", url.Get("url"), err) logger.Logf("cannot get feed item %s: %v", url, err)
s.mybad(w, r) s.mybad(w, r)
return return
} }

4
server/server_test.go
View File

@ -49,10 +49,10 @@ func Test_Server(t *testing.T) {
if err := checkStatus("GET", "api/feed?url=localhost_1234", http.StatusOK); err != nil { if err := checkStatus("GET", "api/feed?url=localhost_1234", http.StatusOK); err != nil {
t.Errorf(err.Error()) t.Errorf(err.Error())
} }
if err := checkStatus("GET", "api/feed/item?url=localhost_1234", http.StatusOK); err != nil { if err := checkStatus("GET", "api/feed/item/localhost_1234", http.StatusOK); err != nil {
t.Errorf(err.Error()) t.Errorf(err.Error())
} }
if err := checkStatus("GET", "api/feed/tag?url=b", http.StatusOK); err != nil { if err := checkStatus("GET", "api/feed/tag/b", http.StatusOK); err != nil {
t.Errorf(err.Error()) t.Errorf(err.Error())
} }
syscall.Kill(syscall.Getpid(), syscall.SIGINT) syscall.Kill(syscall.Getpid(), syscall.SIGINT)