diff options
| -rw-r--r-- | server/ui/controller/feed.go | 4 | ||||
| -rw-r--r-- | storage/job.go | 19 |
2 files changed, 20 insertions, 3 deletions
diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go index 69596b8..99bb956 100644 --- a/server/ui/controller/feed.go +++ b/server/ui/controller/feed.go @@ -13,10 +13,10 @@ import ( "github.com/miniflux/miniflux/server/ui/form" ) -// RefreshAllFeeds refresh all feeds in the background. +// RefreshAllFeeds refresh all feeds in the background for the current user. func (c *Controller) RefreshAllFeeds(ctx *core.Context, request *core.Request, response *core.Response) { user := ctx.LoggedUser() - jobs, err := c.store.NewBatch(c.store.CountFeeds(user.ID)) + jobs, err := c.store.NewUserBatch(user.ID, c.store.CountFeeds(user.ID)) if err != nil { response.HTML().ServerError(err) return diff --git a/storage/job.go b/storage/job.go index b66ae3b..f8b11d8 100644 --- a/storage/job.go +++ b/storage/job.go @@ -24,7 +24,24 @@ func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) { WHERE parsing_error_count < $1 ORDER BY checked_at ASC LIMIT %d` - rows, err := s.db.Query(fmt.Sprintf(query, batchSize), maxParsingError) + return s.fetchBatchRows(fmt.Sprintf(query, batchSize), maxParsingError) +} + +// NewUserBatch returns a serie of jobs but only for a given user. +func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) { + defer helper.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:GetUserJobs] batchSize=%d, userID=%d", batchSize, userID)) + query := ` + SELECT + id, user_id + FROM feeds + WHERE user_id=$1 AND parsing_error_count < $2 + ORDER BY checked_at ASC LIMIT %d` + + return s.fetchBatchRows(fmt.Sprintf(query, batchSize), userID, maxParsingError) +} + +func (s *Storage) fetchBatchRows(query string, args ...interface{}) (jobs model.JobList, err error) { + rows, err := s.db.Query(query, args...) if err != nil { return nil, fmt.Errorf("unable to fetch batch of jobs: %v", err) } |