Skip to content

RSS Reader improvements: erase previous errors on successful fetch and use context to download the feed #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
can3p merged 2 commits into from
Jan 4, 2026
Merged

RSS Reader improvements: erase previous errors on successful fetch and use context to download the feed #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b28658
feeder: pass context to fetch the feed
can3p Jan 4, 2026
b2eebf4
feeder: successful fetch should erase any previous errors
can3p Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/feedops/feeder/feeder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
)

type fetcher interface {
Fetch(urL string) (*reader.Feed, error)
Fetch(ctx context.Context, url string) (*reader.Feed, error)
FetchMedia(ctx context.Context, mediaURL string) (io.ReadCloser, error)
}

Expand Down Expand Up @@ -105,7 +105,7 @@ func (f *Feeder) refreshFeeds(ctx context.Context) (err error) {
}

func (f *Feeder) tryFetchFeed(ctx context.Context, exec boil.ContextExecutor, feed *core.RSSFeed) (err error) {
rssFeed, fetchErr := f.fetcher.Fetch(feed.URL)
rssFeed, fetchErr := f.fetcher.Fetch(ctx, feed.URL)

if fetchErr != nil {
err := SaveFetchFailure(ctx, exec, feed, fetchErr)
Expand Down Expand Up @@ -276,6 +276,7 @@ func SaveFeed(ctx context.Context, exec boil.ContextExecutor, feed *core.RSSFeed
}

feed.LastFetchedAt = null.TimeFrom(time.Now())
feed.LastFetchError = null.String{}

_, err = feed.Update(ctx, exec, boil.Infer())

Expand Down
8 changes: 7 additions & 1 deletion pkg/feedops/feeder/feeder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func TestLockFeed(t *testing.T) {
}

type fetcher interface {
Fetch(urL string) (*reader.Feed, error)
Fetch(ctx context.Context, url string) (*reader.Feed, error)
FetchMedia(ctx context.Context, mediaURL string) (io.ReadCloser, error)
}

Expand Down Expand Up @@ -196,6 +196,7 @@ func TestSaveFeedInitialAndFollowUp(t *testing.T) {

feed1, err := testutil.CreateRSSFeed(ctx, testDB.DB, "https://example.com/feed1", "Feed 1")
require.NoError(t, err)
feed1.LastFetchError = null.StringFrom("error fetching")
feed1.NextFetchAt = null.TimeFrom(pastTime)
_, err = feed1.Update(ctx, testDB.DB, boil.Infer())
require.NoError(t, err)
Expand All @@ -221,6 +222,11 @@ func TestSaveFeedInitialAndFollowUp(t *testing.T) {
err = feeder.SaveFeed(ctx, testDB.DB, feed1, feedContent, cleaner, fetcher, nil)
require.NoError(t, err)

err = feed1.Reload(ctx, testDB.DB)
require.NoError(t, err)

assert.Empty(t, feed1.LastFetchError.String, "successful fetch should erase any previous error")

fetchedFeeds, err := feedops.GetRssFeedItems(ctx, testDB.DB, user.ID)
require.NoError(t, err)
require.Len(t, fetchedFeeds, 5)
Expand Down
4 changes: 2 additions & 2 deletions pkg/feedops/reader/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func NewFetcher(httpClient *http.Client) *Fetcher {
}
}

func (f *Fetcher) Fetch(rssURL string) (*Feed, error) {
feed, err := f.parser.ParseURL(rssURL)
func (f *Fetcher) Fetch(ctx context.Context, rssURL string) (*Feed, error) {
feed, err := f.parser.ParseURLWithContext(rssURL, ctx)
if err != nil {
return nil, err
}
Expand Down
Loading