Compare commits
No commits in common. "0c2876633691097e4a54c2e1c71c84068ca5fc6c" and "b2f88c18c052e8c75ee7451f1b3c9d0ba0a84223" have entirely different histories.
0c28766336
...
b2f88c18c0
@ -13,14 +13,15 @@ func adminTriggerScanTask(c *fiber.Ctx) error {
|
||||
}
|
||||
|
||||
var data struct {
|
||||
Eager bool `json:"eager"`
|
||||
Eager bool `json:"eager"`
|
||||
Sources []string `json:"sources"`
|
||||
}
|
||||
|
||||
if err := exts.BindAndValidate(c, &data); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
go services.FetchFeed(data.Eager)
|
||||
go services.FetchFeedTimed()
|
||||
|
||||
return c.SendStatus(fiber.StatusOK)
|
||||
}
|
||||
|
@ -22,18 +22,9 @@ func FetchFeedTimed() {
|
||||
|
||||
func FetchFeed(eager ...bool) {
|
||||
var feeds []models.SubscriptionFeed
|
||||
if len(eager) > 0 && eager[0] {
|
||||
if err := database.C.Where("is_enabled = ?", true).Find(&feeds).Error; err != nil {
|
||||
log.Warn().Err(err).Msg("An error occurred when fetching feeds.")
|
||||
return
|
||||
}
|
||||
} else {
|
||||
if err := database.C.
|
||||
Where("last_fetched_at IS NULL OR NOW() >= last_fetched_at + (pull_interval || ' hours')::interval").
|
||||
Find(&feeds).Error; err != nil {
|
||||
log.Warn().Err(err).Msg("An error occurred when fetching due feeds.")
|
||||
return
|
||||
}
|
||||
if err := database.C.Where("is_enabled = ?", true).Find(&feeds).Error; err != nil {
|
||||
log.Warn().Err(err).Msg("An error occurred when fetching feeds.")
|
||||
return
|
||||
}
|
||||
|
||||
log.Info().Int("count", len(feeds)).Msg("Ready to fetch feeds...")
|
||||
@ -65,10 +56,7 @@ func FetchFeed(eager ...bool) {
|
||||
count += len(result)
|
||||
}
|
||||
|
||||
database.C.
|
||||
Model(&models.SubscriptionFeed{}).
|
||||
Where("id IN ?", scannedFeed).
|
||||
Update("last_fetched_at", time.Now())
|
||||
database.C.Where("id IN ?", scannedFeed).Update("last_fetched_at", time.Now())
|
||||
|
||||
log.Info().Int("count", count).Msg("Scanned all feeds.")
|
||||
}
|
||||
@ -98,8 +86,6 @@ func feedReadWordpress(src models.SubscriptionFeed, eager ...bool) ([]models.Sub
|
||||
date, err := time.Parse("2006-01-02T15:04:05", post.DateGMT)
|
||||
if err == nil {
|
||||
article.PublishedAt = date
|
||||
} else {
|
||||
article.PublishedAt = time.Now()
|
||||
}
|
||||
article.GenHash()
|
||||
return *article
|
||||
@ -176,8 +162,6 @@ func feedReadGuidedFeed(src models.SubscriptionFeed, eager ...bool) ([]models.Su
|
||||
}
|
||||
if item.PublishedParsed != nil {
|
||||
parent.PublishedAt = *item.PublishedParsed
|
||||
} else {
|
||||
parent.PublishedAt = time.Now()
|
||||
}
|
||||
if item.Image != nil {
|
||||
parent.Thumbnail = item.Image.URL
|
||||
@ -201,7 +185,6 @@ func feedReadWebpage(src models.SubscriptionFeed, eager ...bool) ([]models.Subsc
|
||||
art := &article
|
||||
art.GenHash()
|
||||
art.FeedID = src.ID
|
||||
art.PublishedAt = time.Now()
|
||||
article = *art
|
||||
return article
|
||||
}
|
||||
|
@ -75,7 +75,7 @@ func main() {
|
||||
// Configure timed tasks
|
||||
quartz := cron.New(cron.WithLogger(cron.VerbosePrintfLogger(&log.Logger)))
|
||||
quartz.AddFunc("@every 60m", services.DoAutoDatabaseCleanup)
|
||||
quartz.AddFunc("@every 60m", services.FetchFeedTimed)
|
||||
quartz.AddFunc("@midnight", services.FetchFeedTimed)
|
||||
quartz.Start()
|
||||
|
||||
// Server
|
||||
|
Loading…
x
Reference in New Issue
Block a user