8000 [pull] main from miniflux:main by pull[bot] · Pull Request #308 · suhaoGe/miniflux · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions internal/api/category_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,14 @@ func (h *handler) refreshCategoryHandler(w http.ResponseWriter, r *http.Request)
return
}

batchBuilder := h.store.NewBatchBuilder()
batchBuilder.WithErrorLimit(config.Opts.PollingParsingErrorLimit())
batchBuilder.WithoutDisabledFeeds()
batchBuilder.WithUserID(userID)
batchBuilder.WithCategoryID(categoryID)
batchBuilder.WithNextCheckExpired()
batchBuilder.WithLimitPerHost(config.Opts.PollingLimitPerHost())

jobs, err := batchBuilder.FetchJobs()
jobs, err := h.store.NewBatchBuilder().
WithErrorLimit(config.Opts.PollingParsingErrorLimit()).
WithoutDisabledFeeds().
WithUserID(userID).
WithCategoryID(categoryID).
WithNextCheckExpired().
WithLimitPerHost(config.Opts.PollingLimitPerHost()).
FetchJobs()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
60 changes: 29 additions & 31 deletions internal/api/entry_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ func (h *handler) getFeedEntryHandler(w http.ResponseWriter, r *http.Request) {
return
}

builder := h.store.NewEntryQueryBuilder(request.UserID(r))
builder.WithFeedID(feedID)
builder.WithEntryID(entryID)
builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithFeedID(feedID).
WithEntryID(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand All @@ -75,9 +75,9 @@ func (h *handler) getCategoryEntryHandler(w http.ResponseWriter, r *http.Request
return
}

builder := h.store.NewEntryQueryBuilder(request.UserID(r))
builder.WithCategoryID(categoryID)
builder.WithEntryID(entryID)
builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithCategoryID(categoryID).
WithEntryID(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand All @@ -89,8 +89,8 @@ func (h *handler) getEntryHandler(w http.ResponseWriter, r *http.Request) {
return
}

builder := h.store.NewEntryQueryBuilder(request.UserID(r))
builder.WithEntryID(entryID)
builder := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithEntryID(entryID)

h.getEntryFromBuilder(w, r, builder)
}
Expand Down Expand Up @@ -161,15 +161,15 @@ func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int

tags := request.QueryStringParamList(r, "tags")

builder := h.store.NewEntryQueryBuilder(userID)
builder.WithFeedID(feedID)
builder.WithCategoryID(categoryID)
builder.WithStatuses(statuses)
builder.WithSorting(order, direction)
builder.WithOffset(offset)
builder.WithLimit(limit)
builder.WithTags(tags)
builder.WithEnclosures()
builder := h.store.NewEntryQueryBuilder(userID).
WithFeedID(feedID).
WithCategoryID(categoryID).
WithStatuses(statuses).
WithSorting(order, direction).
WithOffset(offset).
WithLimit(limit).
WithTags(tags).
WithEnclosures()

if request.HasQueryParam(r, "globally_visible") {
globallyVisible := request.QueryBoolParam(r, "globally_visible", true)
Expand Down Expand Up @@ -236,15 +236,14 @@ func (h *handler) saveEntryHandler(w http.ResponseWriter, r *http.Request) {
return
}

builder := h.store.NewEntryQueryBuilder(request.UserID(r))
builder.WithEntryID(entryID)

if !h.store.HasSaveEntry(request.UserID(r)) {
response.JSONBadRequest(w, r, errors.New("no third-party integration enabled"))
return
}

entry, err := builder.GetEntry()
entry, err := h.store.NewEntryQueryBuilder(request.UserID(r)).
WithEntryID(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
return 8BD0
Expand Down Expand Up @@ -285,10 +284,10 @@ func (h *handler) updateEntryHandler(w http.ResponseWriter, r *http.Request) {
}

loggedUserID := request.UserID(r)
entryBuilder := h.store.NewEntryQueryBuilder(loggedUserID)
entryBuilder.WithEntryID(entryID)

entry, err := entryBuilder.GetEntry()
entry, err := h.store.NewEntryQueryBuilder(loggedUserID).
WithEntryID(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down Expand Up @@ -445,10 +444,9 @@ func (h *handler) fetchContentHandler(w http.ResponseWriter, r *http.Request) {
return
}

entryBuilder := h.store.NewEntryQueryBuilder(loggedUserID)
entryBuilder.WithEntryID(entryID)

entry, err := entryBuilder.GetEntry()
entry, err := h.store.NewEntryQueryBuilder(loggedUserID).
WithEntryID(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand All @@ -470,9 +468,9 @@ func (h *handler) fetchContentHandler(w http.ResponseWriter, r *http.Request) {
return
}

feedBuilder := storage.NewFeedQueryBuilder(h.store, loggedUserID)
feedBuilder.WithFeedID(entry.FeedID)
feed, err := feedBuilder.GetFeed()
feed, err := h.store.NewFeedQueryBuilder(loggedUserID).
WithFeedID(entry.FeedID).
GetFeed()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
15 changes: 7 additions & 8 deletions internal/api/feed_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,13 @@ func (h *handler) refreshFeedHandler(w http.ResponseWriter, r *http.Request) {
func (h *handler) refreshAllFeedsHandler(w http.ResponseWriter, r *http.Request) {
userID := request.UserID(r)

batchBuilder := h.store.NewBatchBuilder()
batchBuilder.WithErrorLimit(config.Opts.PollingParsingErrorLimit())
batchBuilder.WithoutDisabledFeeds()
batchBuilder.WithNextCheckExpired()
batchBuilder.WithUserID(userID)
batchBuilder.WithLimitPerHost(config.Opts.PollingLimitPerHost())

jobs, err := batchBuilder.FetchJobs()
jobs, err := h.store.NewBatchBuilder().
WithErrorLimit(config.Opts.PollingParsingErrorLimit()).
WithoutDisabledFeeds().
WithNextCheckExpired().
WithUserID(userID).
WithLimitPerHost(config.Opts.PollingLimitPerHost()).
FetchJobs()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
17 changes: 8 additions & 9 deletions internal/cli/refresh_feeds.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ func refreshFeeds(store *storage.Storage) {
startTime := time.Now()

// Generate a batch of feeds for any user that has feeds to refresh.
batchBuilder := store.NewBatchBuilder()
batchBuilder.WithBatchSize(config.Opts.BatchSize())
batchBuilder.WithErrorLimit(config.Opts.PollingParsingErrorLimit())
batchBuilder.WithoutDisabledFeeds()
batchBuilder.WithNextCheckExpired()
batchBuilder.WithLimitPerHost(config.Opts.PollingLimitPerHost())

jobs, err := batchBuilder.FetchJobs()
jobs, err := store.NewBatchBuilder().
WithBatchSize(config.Opts.BatchSize()).
WithErrorLimit(config.Opts.PollingParsingErrorLimit()).
WithoutDisabledFeeds().
WithNextCheckExpired().
WithLimitPerHost(config.Opts.PollingLimitPerHost()).
FetchJobs()
if err != nil {
slog.Error("Unable to fetch jobs from database", slog.Any("error", err))
return
Expand All @@ -36,7 +35,7 @@ func refreshFeeds(store *storage.Storage) {
slog.Debug("Feed URLs in this batch", slog.Any("feed_urls", jobs.FeedURLs()))

nbJobs := len(jobs)
var jobQueue = make(chan model.Job, nbJobs)
jobQueue := make(chan model.Job, nbJobs)

slog.Info("Starting a pool of workers",
slog.Int("nb_workers", config.Opts.WorkerPoolSize()),
Expand Down
17 changes: 9 additions & 8 deletions internal/cli/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@ func runScheduler(store *storage.Storage, pool *worker.Pool) {
func feedScheduler(store *storage.Storage, pool *worker.Pool, frequency time.Duration, batchSize, errorLimit, limitPerHost int) {
for range time.Tick(frequency) {
// Generate a batch of feeds for any user that has feeds to refresh.
batchBuilder := store.NewBatchBuilder()
batchBuilder.WithBatchSize(batchSize)
batchBuilder.WithErrorLimit(errorLimit)
batchBuilder.WithoutDisabledFeeds()
batchBuilder.WithNextCheckExpired()
batchBuilder.WithLimitPerHost(limitPerHost)

if jobs, err := batchBuilder.FetchJobs(); err != nil {
jobs, err := store.NewBatchBuilder().
WithBatchSize(batchSize).
WithErrorLimit(errorLimit).
WithoutDisabledFeeds().
WithNextCheckExpired().
WithLimitPerHost(limitPerHost).
FetchJobs()

if err != nil {
slog.Error("Unable to fetch jobs from database", slog.Any("error", err))
} else if len(jobs) > 0 {
slog.Debug("Feed URLs in this batch", slog.Any("feed_urls", jobs.FeedURLs()))
Expand Down
28 changes: 13 additions & 15 deletions internal/fever/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ func (h *feverHandler) handleItems(w http.ResponseWriter, r *http.Request) {

userID := request.UserID(r)

builder := h.store.NewEntryQueryBuilder(userID)
builder.WithLimit(50)
builder := h.store.NewEntryQueryBuilder(userID).
WithLimit(50)

switch {
case request.HasQueryParam(r, "since_id"):
Expand Down Expand Up @@ -292,8 +292,8 @@ func (h *feverHandler) handleItems(w http.ResponseWriter, r *http.Request) {
return
}

builder = h.store.NewEntryQueryBuilder(userID)
result.Total, err = builder.CountEntries()
result.Total, err = h.store.NewEntryQueryBuilder(userID).
CountEntries()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down Expand Up @@ -342,9 +342,9 @@ func (h *feverHandler) handleUnreadItems(w http.ResponseWriter, r *http.Request)
slog.Int64("user_id", userID),
)

builder := h.store.NewEntryQueryBuilder(userID)
builder.WithStatus(model.EntryStatusUnread)
rawEntryIDs, err := builder.GetEntryIDs()
rawEntryIDs, err := h.store.NewEntryQueryBuilder(userID).
WithStatus(model.EntryStatusUnread).
GetEntryIDs()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down Expand Up @@ -375,10 +375,9 @@ func (h *feverHandler) handleSavedItems(w http.ResponseWriter, r *http.Request)
slog.Int64("user_id", userID),
)

builder := h.store.NewEntryQueryBuilder(userID)
builder.WithStarred(true)

entryIDs, err := builder.GetEntryIDs()
entryIDs, err := h.store.NewEntryQueryBuilder(userID).
WithStarred(true).
GetEntryIDs()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down Expand Up @@ -410,10 +409,9 @@ func (h *feverHandler) handleWriteItems(w http.ResponseWriter, r *http.Request)
return
}

builder := h.store.NewEntryQueryBuilder(userID)
builder.WithEntryID(entryID)

entry, err := builder.GetEntry()
entry, err := h.store.NewEntryQueryBuilder(userID).
WithEntryID(entryID).
GetEntry()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
Loading
Loading
0