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

Skip to content
8000
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
8 changes: 1 addition & 7 deletions internal/api/entry_handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,7 @@ func (h *handler) findEntries(w http.ResponseWriter, r *http.Request, feedID int

configureFilters(builder, r)

entries, err := builder.GetEntries()
if err != nil {
response.JSONServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.JSONServerError(w, r, err)
return
Expand Down
40 changes: 34 additions & 6 deletions internal/storage/entry_query_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,29 @@ func (e *EntryQueryBuilder) GetEntry() (*model.Entry, error) {

// GetEntries returns a list of entries that match the condition.
func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
entries, _, err := e.fetchEntries(false)
return entries, err
}

// GetEntriesWithCount returns a list of entries and the total count of matching
// rows (ignoring limit/offset) in a single query using a window function.
// This avoids a separate CountEntries() round-trip.
func (e *EntryQueryBuilder) GetEntriesWithCount() (model.Entries, int, error) {
return e.fetchEntries(true)
}

// fetchEntries is the shared implementation for GetEntries and GetEntriesWithCount.
// When withCount is true, count(*) OVER() is included in the SELECT and the total
// count of matching rows is returned; otherwise the returned count is 0.
func (e *EntryQueryBuilder) fetchEntries(withCount bool) (model.Entries, int, error) {
countColumn := ""
if withCount {
countColumn = "count(*) OVER(),"
}

query := `
SELECT
` + countColumn + `
e.id,
e.user_id,
e.feed_id,
Expand Down Expand Up @@ -311,13 +332,14 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {

rows, err := e.store.db.Query(query, e.args...)
if err != nil {
return nil, fmt.Errorf("store: unable to get entries: %v", err)
return nil, 0, fmt.Errorf("store: unable to get entries: %v", err)
}
defer rows.Close()

entries := make(model.Entries, 0)
entryMap := make(map[int64]*model.Entry)
var entryIDs []int64
var totalCount int

for rows.Next() {
var iconID sql.NullInt64
Expand All @@ -326,7 +348,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {

entry := model.NewEntry()

err := rows.Scan(
dest := []any{
&entry.ID,
&entry.UserID,
&entry.FeedID,
Expand Down Expand Up @@ -363,10 +385,16 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
&iconID,
&externalIconID,
&tz,
)
}

if withCount {
dest = append([]any{&totalCount}, dest...)
}

err := rows.Scan(dest...)

if err != nil {
return nil, fmt.Errorf("store: unable to fetch entry row: %v", err)
return nil, 0, fmt.Errorf("store: unable to fetch entry row: %v", err)
}

if iconID.Valid && externalIconID.Valid && externalIconID.String != "" {
Expand Down Expand Up @@ -396,7 +424,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
if e.fetchEnclosures && len(entryIDs) > 0 {
enclosures, err := e.store.GetEnclosuresForEntries(entryIDs)
if err != nil {
return nil, fmt.Errorf("store: unable to fetch enclosures: %w", err)
return nil, 0, fmt.Errorf("store: unable to fetch enclosures: %w", err)
}

for entryID, entryEnclosures := range enclosures {
Expand All @@ -406,7 +434,7 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
}
}

return entries, nil
return entries, totalCount, nil
}

// GetEntryIDs returns a list of entry IDs that match the condition.
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/category_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ func (h *handler) showCategoryEntriesPage(w http.ResponseWriter, r *http.Request
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/category_entries_all.go
Original file line number Diff line number Diff line change
E 8000 xpand Up @@ -41,13 +41,7 @@ func (h *handler) showCategoryEntriesAllPage(w http.ResponseWriter, r *http.Requ
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/category_entries_starred.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,7 @@ func (h *handler) showCategoryEntriesStarredPage(w http.ResponseWriter, r *http.
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/feed_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ func (h *handler) showFeedEntriesPage(w http.ResponseWriter, r *http.Request) {
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/feed_entries_all.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ func (h *handler) showFeedEntriesAllPage(w http.ResponseWriter, r *http.Request)
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/history_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ func (h *handler) showHistoryPage(w http.ResponseWriter, r *http.Request) {
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@ func (h *handler) showSearchPage(w http.ResponseWriter, r *http.Request) {
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err = builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

entriesCount, err = builder.CountEntries()
entries, entriesCount, err = builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/shared_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@ func (h *handler) sharedEntries(w http.ResponseWriter, r *http.Request) {
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/starred_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@ func (h *handler) showStarredPage(w http.ResponseWriter, r *http.Request) {
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
8 changes: 1 addition & 7 deletions internal/ui/tag_entries_all.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,7 @@ func (h *handler) showTagEntriesAllPage(w http.ResponseWriter, r *http.Request)
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)

entries, err := builder.GetEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

count, err := builder.CountEntries()
entries, count, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
Expand Down
32 changes: 18 additions & 14 deletions internal/ui/unread_entries.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,34 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
offset := request.QueryIntParam(r, "offset", 0)
builder := h.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
builder.WithGloballyVisible()
countUnread, err := builder.CountEntries()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

if offset >= countUnread {
offset = 0
}

builder = h.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
builder.WithSorting(user.EntryOrder, user.EntryDirection)
builder.WithSorting("id", user.EntryDirection)
builder.WithOffset(offset)
builder.WithLimit(user.EntriesPerPage)
builder.WithGloballyVisible()
entries, err := builder.GetEntries()

entries, countUnread, err := builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
}

if offset >= countUnread && countUnread > 0 {
offset = 0
builder = h.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
builder.WithSorting(user.EntryOrder, user.EntryDirection)
builder.WithSorting("id", user.EntryDirection)
builder.WithLimit(user.EntriesPerPage)
builder.WithGloballyVisible()

entries, countUnread, err = builder.GetEntriesWithCount()
if err != nil {
response.HTMLServerError(w, r, err)
return
}
}

sess := session.New(h.store, request.SessionID(r))
view := view.New(h.tpl, r, sess)
view.Set("entries", entries)
Expand Down
Loading
0