forks/miniflux
1
0
Fork 0
Code Releases Activity

Clicking on refresh feeds should refresh only user feeds

Browse source
This commit is contained in:
Frédéric Guillot 2017-12-22 18:13:14 -08:00
parent e7afec7eca
commit f546552a1d
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/ui/controller/feed.go
View file

@ -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

19
storage/job.go
View file

@ -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)
}