diff options
Diffstat (limited to 'internal/reader')
| -rw-r--r-- | internal/reader/handler/handler.go | 64 | ||||
| -rw-r--r-- | internal/reader/icon/checker.go | 84 |
2 files changed, 98 insertions, 50 deletions
diff --git a/internal/reader/handler/handler.go b/internal/reader/handler/handler.go index 04275598..aa9d9704 100644 --- a/internal/reader/handler/handler.go +++ b/internal/reader/handler/handler.go @@ -93,13 +93,7 @@ func CreateFeedFromSubscriptionDiscovery(store *storage.Storage, userID int64, f requestBuilder.IgnoreTLSErrors(feedCreationRequest.AllowSelfSignedCertificates) requestBuilder.DisableHTTP2(feedCreationRequest.DisableHTTP2) - checkFeedIcon( - store, - requestBuilder, - subscription.ID, - subscription.SiteURL, - subscription.IconURL, - ) + icon.NewIconChecker(store, subscription).UpdateOrCreateFeedIcon() return subscription, nil } @@ -188,13 +182,8 @@ func CreateFeed(store *storage.Storage, userID int64, feedCreationRequest *model slog.String("feed_url", subscription.FeedURL), ) - checkFeedIcon( - store, - requestBuilder, - subscription.ID, - subscription.SiteURL, - subscription.IconURL, - ) + icon.NewIconChecker(store, subscription).UpdateOrCreateFeedIcon() + return subscription, nil } @@ -270,6 +259,8 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool slog.Debug("Feed modified", slog.Int64("user_id", userID), slog.Int64("feed_id", feedID), + slog.String("etag_header", originalFeed.EtagHeader), + slog.String("last_modified_header", originalFeed.LastModifiedHeader), ) responseBody, localizedError := responseHandler.ReadBody(config.Opts.HTTPClientMaxBodySize()) @@ -293,8 +284,10 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool // If the feed has a TTL defined, we use it to make sure we don't check it too often. newTTL = updatedFeed.TTL + // Set the next check at with updated arguments. originalFeed.ScheduleNextCheck(weeklyEntryCount, newTTL) + slog.Debug("Updated next check date", slog.Int64("user_id", userID), slog.Int64("feed_id", feedID), @@ -329,18 +322,18 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool originalFeed.EtagHeader = responseHandler.ETag() originalFeed.LastModifiedHeader = responseHandler.LastModified() - checkFeedIcon( - store, - requestBuilder, - originalFeed.ID, - originalFeed.SiteURL, - updatedFeed.IconURL, - ) + iconChecker := icon.NewIconChecker(store, originalFeed) + if forceRefresh { + iconChecker.UpdateOrCreateFeedIcon() + } else { + iconChecker.CreateFeedIconIfMissing() + } } else { slog.Debug("Feed not modified", slog.Int64("user_id", userID), slog.Int64("feed_id", feedID), ) + // Last-Modified may be updated even if ETag is not. In this case, per // RFC9111 sections 3.2 and 4.3.4, the stored response must be updated. if responseHandler.LastModified() != "" { @@ -359,32 +352,3 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool return nil } - -func checkFeedIcon(store *storage.Storage, requestBuilder *fetcher.RequestBuilder, feedID int64, websiteURL, feedIconURL string) { - if !store.HasIcon(feedID) { - iconFinder := icon.NewIconFinder(requestBuilder, websiteURL, feedIconURL) - if icon, err := iconFinder.FindIcon(); err != nil { - slog.Debug("Unable to find feed icon", - slog.Int64("feed_id", feedID), - slog.String("website_url", websiteURL), - slog.String("feed_icon_url", feedIconURL), - slog.Any("error", err), - ) - } else if icon == nil { - slog.Debug("No icon found", - slog.Int64("feed_id", feedID), - slog.String("website_url", websiteURL), - slog.String("feed_icon_url", feedIconURL), - ) - } else { - if err := store.CreateFeedIcon(feedID, icon); err != nil { - slog.Error("Unable to store feed icon", - slog.Int64("feed_id", feedID), - slog.String("website_url", websiteURL), - slog.String("feed_icon_url", feedIconURL), - slog.Any("error", err), - ) - } - } - } -} diff --git a/internal/reader/icon/checker.go b/internal/reader/icon/checker.go new file mode 100644 index 00000000..4ec63635 --- /dev/null +++ b/internal/reader/icon/checker.go @@ -0,0 +1,84 @@ +// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +package icon // import "miniflux.app/v2/internal/reader/icon" + +import ( + "log/slog" + + "miniflux.app/v2/internal/config" + "miniflux.app/v2/internal/model" + "miniflux.app/v2/internal/reader/fetcher" + "miniflux.app/v2/internal/storage" +) + +type IconChecker struct { + store *storage.Storage + feed *model.Feed +} + +func NewIconChecker(store *storage.Storage, feed *model.Feed) *IconChecker { + return &IconChecker{ + store: store, + feed: feed, + } +} + +func (c *IconChecker) fetchAndStoreIcon() { + requestBuilder := fetcher.NewRequestBuilder() + requestBuilder.WithUserAgent(c.feed.UserAgent, config.Opts.HTTPClientUserAgent()) + requestBuilder.WithCookie(c.feed.Cookie) + requestBuilder.WithTimeout(config.Opts.HTTPClientTimeout()) + requestBuilder.WithProxy(config.Opts.HTTPClientProxy()) + requestBuilder.UseProxy(c.feed.FetchViaProxy) + requestBuilder.IgnoreTLSErrors(c.feed.AllowSelfSignedCertificates) + requestBuilder.DisableHTTP2(c.feed.DisableHTTP2) + + iconFinder := NewIconFinder(requestBuilder, c.feed.FeedURL, c.feed.IconURL) + if icon, err := iconFinder.FindIcon(); err != nil { + slog.Debug("Unable to find feed icon", + slog.Int64("feed_id", c.feed.ID), + slog.String("website_url", c.feed.FeedURL), + slog.String("feed_icon_url", c.feed.IconURL), + slog.Any("error", err), + ) + } else if icon == nil { + slog.Debug("No icon found", + slog.Int64("feed_id", c.feed.ID), + slog.String("website_url", c.feed.FeedURL), + slog.String("feed_icon_url", c.feed.IconURL), + ) + } else { + if err := c.store.StoreFeedIcon(c.feed.ID, icon); err != nil { + slog.Error("Unable to store feed icon", + slog.Int64("feed_id", c.feed.ID), + slog.String("website_url", c.feed.FeedURL), + slog.String("feed_icon_url", c.feed.IconURL), + slog.Any("error", err), + ) + } else { + slog.Debug("Feed icon stored", + slog.Int64("feed_id", c.feed.ID), + slog.String("website_url", c.feed.FeedURL), + slog.String("feed_icon_url", c.feed.IconURL), + slog.Int64("icon_id", icon.ID), + slog.String("icon_hash", icon.Hash), + ) + } + } +} + +func (c *IconChecker) CreateFeedIconIfMissing() { + if c.store.HasFeedIcon(c.feed.ID) { + slog.Debug("Feed icon already exists", + slog.Int64("feed_id", c.feed.ID), + ) + return + } + + c.fetchAndStoreIcon() +} + +func (c *IconChecker) UpdateOrCreateFeedIcon() { + c.fetchAndStoreIcon() +} |