Feeds Categories (#53)

* add further accessor methods to feeds

* add category to feeds

feeds/handler/crawl.go

@@ -25,14 +25,16 @@ func (e *Feeds) fetchAll() {
 		return
 	}
 	for _, feed := range fs {
-		err = e.fetch(feed.Url)
+		err = e.fetch(feed)
 		if err != nil {
 			log.Errorf("Error saving post: %v", err)
 		}
 	}
 }
 
-func (e *Feeds) fetch(url string) error {
+func (e *Feeds) fetch(f *feeds.Feed) error {
+	url := f.Url
+
 	log.Infof("Fetching address %v", url)
 	fd, err := rss.Fetch(url)
 	if err != nil {
@@ -42,17 +44,25 @@ func (e *Feeds) fetch(url string) error {
 
 	for _, item := range fd.Items {
 		id := fmt.Sprintf("%x", md5.Sum([]byte(item.ID)))
+
 		err = e.entries.Create(feeds.Entry{
-			Id:      id,
-			Url:     item.Link,
-			Title:   item.Title,
-			Domain:  domain,
-			Content: item.Summary,
-			Date:    item.Date.Unix(),
+			Id:       id,
+			Url:      item.Link,
+			Title:    item.Title,
+			Domain:   domain,
+			Content:  item.Summary,
+			Date:     item.Date.Unix(),
+			Category: f.Category,
 		})
 		if err != nil {
 			return fmt.Errorf("Error saving item: %v", err)
 		}
+
+		var tags []string
+		if len(f.Category) > 0 {
+			tags = append(tags, f.Category)
+		}
+
 		// @todo make this optional
 		_, err := e.postsService.Save(context.TODO(), &posts.SaveRequest{
 			Id:        id,
@@ -63,11 +73,13 @@ func (e *Feeds) fetch(url string) error {
 				"domain": domain,
 				"link":   item.Link,
 			},
+			Tags: tags,
 		})
 		if err != nil {
 			return err
 		}
 	}
+
 	return nil
 }
 

feeds/handler/feeds.go

@@ -72,19 +72,24 @@ func (e *Feeds) crawl() {
 
 func (e *Feeds) Add(ctx context.Context, req *feeds.AddRequest, rsp *feeds.AddResponse) error {
 	log.Info("Received Feeds.New request")
-	e.feeds.Create(feeds.Feed{
-		Name: req.Name,
-		Url:  req.Url,
-	})
+
+	f := feeds.Feed{
+		Name:     req.Name,
+		Url:      req.Url,
+		Category: req.Category,
+	}
+
+	// create the feed
+	e.feeds.Create(f)
+
+	// schedule immediate fetch
+	go e.fetch(&f)
+
 	return nil
 }
 
 func (e *Feeds) Entries(ctx context.Context, req *feeds.EntriesRequest, rsp *feeds.EntriesResponse) error {
-	log.Info("Received Feeds.New request")
-	err := e.fetch(req.Url)
-	if err != nil {
-		return err
-	}
+	log.Info("Received Feeds.Entries request")
 	return e.entries.Read(e.entriesURLIndex.ToQuery(req.Url), &rsp.Entries)
 }
 
@@ -108,3 +113,24 @@ func (e *Feeds) Remove(ctx context.Context, req *feeds.RemoveRequest, rsp *feeds
 	e.feeds.Delete(model.QueryEquals("name", req.Name))
 	return nil
 }
+
+func (e *Feeds) List(ctx context.Context, req *feeds.ListRequest, rsp *feeds.ListResponse) error {
+	var feeds []*feeds.Feed
+
+	err := e.feeds.Read(model.QueryAll(), &feeds)
+	if err != nil {
+		return errors.InternalServerError("feeds.list", "failed to read list of feeds: %v", err)
+	}
+
+	rsp.Feeds = feeds
+	return nil
+}
+
+func (e *Feeds) Remove(ctx context.Context, req *feeds.RemoveRequest, rsp *feeds.RemoveResponse) error {
+	if len(req.Name) == 0 {
+		return errors.BadRequest("feeds.remove", "blank name provided")
+	}
+
+	e.feeds.Delete(model.QueryEquals("name", req.Name))
+	return nil
+}