mirror of
https://github.com/kevin-DL/services.git
synced 2026-01-20 14:35:07 +00:00
make the feeds service only update
This commit is contained in:
@@ -4,8 +4,8 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"sync"
|
||||||
|
|
||||||
"github.com/SlyMarbo/rss"
|
"github.com/SlyMarbo/rss"
|
||||||
log "github.com/micro/micro/v3/service/logger"
|
log "github.com/micro/micro/v3/service/logger"
|
||||||
@@ -14,6 +14,11 @@ import (
|
|||||||
posts "github.com/micro/services/posts/proto"
|
posts "github.com/micro/services/posts/proto"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
rssSync sync.RWMutex
|
||||||
|
rssFeeds = map[string]*rss.Feed{}
|
||||||
|
)
|
||||||
|
|
||||||
func (e *Feeds) fetchAll() {
|
func (e *Feeds) fetchAll() {
|
||||||
fs := []*feeds.Feed{}
|
fs := []*feeds.Feed{}
|
||||||
err := e.feeds.Read(e.feedsNameIndex.ToQuery(nil), &fs)
|
err := e.feeds.Read(e.feedsNameIndex.ToQuery(nil), &fs)
|
||||||
@@ -35,18 +40,40 @@ func (e *Feeds) fetchAll() {
|
|||||||
|
|
||||||
func (e *Feeds) fetch(f *feeds.Feed) error {
|
func (e *Feeds) fetch(f *feeds.Feed) error {
|
||||||
url := f.Url
|
url := f.Url
|
||||||
|
|
||||||
log.Infof("Fetching address %v", url)
|
log.Infof("Fetching address %v", url)
|
||||||
fd, err := rss.Fetch(url)
|
|
||||||
if err != nil {
|
// see if there's an existing rss feed
|
||||||
return fmt.Errorf("Error fetching address %v: %v", url, err)
|
rssSync.RLock()
|
||||||
|
fd, ok := rssFeeds[f.Name]
|
||||||
|
rssSync.RUnlock()
|
||||||
|
|
||||||
|
if !ok {
|
||||||
|
// create a new one if it doesn't exist
|
||||||
|
var err error
|
||||||
|
fd, err = rss.Fetch(f.Url)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Error fetching address %v: %v", url, err)
|
||||||
|
}
|
||||||
|
// save the feed
|
||||||
|
rssSync.Lock()
|
||||||
|
rssFeeds[f.Name] = fd
|
||||||
|
rssSync.Unlock()
|
||||||
|
} else {
|
||||||
|
// otherwise update the existing feed
|
||||||
|
fd.Items = []*rss.Item{}
|
||||||
|
fd.Unread = 0
|
||||||
|
if err := fd.Update(); err != nil {
|
||||||
|
return fmt.Errorf("Error updating address %v: %v", url, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
domain := getDomain(url)
|
domain := getDomain(url)
|
||||||
|
|
||||||
|
// range over the feed and save the items
|
||||||
for _, item := range fd.Items {
|
for _, item := range fd.Items {
|
||||||
id := fmt.Sprintf("%x", md5.Sum([]byte(item.ID)))
|
id := fmt.Sprintf("%x", md5.Sum([]byte(item.ID)))
|
||||||
|
|
||||||
err = e.entries.Create(feeds.Entry{
|
err := e.entries.Create(feeds.Entry{
|
||||||
Id: id,
|
Id: id,
|
||||||
Url: item.Link,
|
Url: item.Link,
|
||||||
Title: item.Title,
|
Title: item.Title,
|
||||||
|
|||||||
@@ -71,7 +71,19 @@ func (e *Feeds) crawl() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *Feeds) Add(ctx context.Context, req *feeds.AddRequest, rsp *feeds.AddResponse) error {
|
func (e *Feeds) Add(ctx context.Context, req *feeds.AddRequest, rsp *feeds.AddResponse) error {
|
||||||
log.Info("Received Feeds.New request")
|
log.Info("Received Feeds.Add request")
|
||||||
|
|
||||||
|
if len(req.Name) == 0 {
|
||||||
|
return errors.BadRequest("feeds.add", "require name")
|
||||||
|
}
|
||||||
|
|
||||||
|
rssSync.RLock()
|
||||||
|
defer rssSync.RUnlock()
|
||||||
|
|
||||||
|
// check if the feed already exists
|
||||||
|
if _, ok := rssFeeds[req.Name]; ok {
|
||||||
|
return errors.BadRequest("feeds.add", "%s already exists", req.Name)
|
||||||
|
}
|
||||||
|
|
||||||
f := feeds.Feed{
|
f := feeds.Feed{
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
|
|||||||
Reference in New Issue
Block a user