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

Hopefully fixed

master
bel 2019-06-20 17:54:43 -06:00
parent a57dff60d8
commit 7e15610a34
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rss/feed.go
View File

@ -107,8 +107,11 @@ func (feed *Feed) fromGofeed(gofeed *gofeed.Feed) ([]*Item, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
feed.Updated = latest.Add(time.Second) //time.Now() //*updated //time.Now().UTC() //*updated if latest != feed.Updated {
feed.Updated = latest.Add(time.Second)
}
feed.Title = gofeed.Title feed.Title = gofeed.Title
log.Printf("found %v new items for %v", len(newitems), feed.Title)
return newitems, nil return newitems, nil
} }
@ -118,19 +121,19 @@ func (feed *Feed) appendNewItems(items []*gofeed.Item) ([]*Item, time.Time, erro
for i := range items { for i := range items {
t := gofeedItemTS(items[i]) t := gofeedItemTS(items[i])
if *t != (time.Time{}) && t.Before(feed.Updated) { if *t != (time.Time{}) && t.Before(feed.Updated) {
log.Printf("\tnot adding %v because its timestamp before %v", items[i].Link, feed.Updated) log.Printf("\tnot adding %v because its timestamp (%v) before updated (%v)", items[i].Link, *t, feed.Updated)
continue continue
} }
if t.After(latest) { if t.After(latest) {
latest = *t latest = *t
} }
if ok, _ := regexp.MatchString(feed.ItemFilter, items[i].Title); !ok { if ok, _ := regexp.MatchString(feed.ItemFilter, items[i].Title); !ok {
log.Printf("\tnot adding %v because its title doesnt match item filter %v", items[i].Link, feed.ItemFilter) //log.Printf("\tnot adding %v because its title doesnt match item filter %v", items[i].Link, feed.ItemFilter)
continue continue
} }
item := FromGofeedItem(items[i], feed.ContentFilter) item := FromGofeedItem(items[i], feed.ContentFilter)
newitems = append(newitems, item) newitems = append(newitems, item)
} }
log.Printf("\tnew latest is %v", latest) log.Printf("\tnew latest is %v from %v", latest, feed.Updated)
return newitems, latest, nil return newitems, latest, nil
} }