abuse: полный пересчёт индекса только по явному вызову (env не тормозит scan)
This commit is contained in:
@@ -182,13 +182,24 @@ def browse(category=None, q="", limit=60, offset=0):
|
||||
return [dict(zip(keys, r)) for r in rows]
|
||||
|
||||
|
||||
def browse2(q="", names=None, limit=60, offset=0, sort="score", priced=False, typ=None):
|
||||
"""Записи для панели: фильтр по списку источников (категория), подстрока, пагинация + total."""
|
||||
def browse2(q="", names=None, limit=60, offset=0, sort="score", priced=False, typ=None,
|
||||
since=None, src=None):
|
||||
"""Записи для панели: фильтр по списку источников (категория), подстрока, пагинация + total.
|
||||
|
||||
since — дата YYYY-MM-DD (включительно), src — точное имя источника.
|
||||
"""
|
||||
where = "WHERE 1=1 "
|
||||
args = []
|
||||
if names:
|
||||
where += "AND source IN (%s) " % ",".join("?" * len(names))
|
||||
args += list(names)
|
||||
if src:
|
||||
where += "AND source = ? "
|
||||
args += [src]
|
||||
if since:
|
||||
where += ("AND (CASE WHEN published GLOB '[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]*' "
|
||||
"THEN substr(published,1,10) ELSE date(seen,'unixepoch') END) >= ? ")
|
||||
args += [str(since)[:10]]
|
||||
if q:
|
||||
where += "AND (title LIKE ? OR text LIKE ?) "
|
||||
args += [f"%{q}%", f"%{q}%"]
|
||||
@@ -202,10 +213,10 @@ def browse2(q="", names=None, limit=60, offset=0, sort="score", priced=False, ty
|
||||
"old": "ORDER BY published ASC, id ASC"}.get(sort, "ORDER BY score DESC, id DESC")
|
||||
with db() as c:
|
||||
total = c.execute("SELECT COUNT(*) FROM items " + where, args).fetchone()[0]
|
||||
rows = c.execute("SELECT provider,kind,source,title,text,author,published,score,price,currency,url,types "
|
||||
rows = c.execute("SELECT id,provider,kind,source,title,text,author,published,score,price,currency,url,types "
|
||||
"FROM items " + where + order + " LIMIT ? OFFSET ?",
|
||||
args + [limit, offset]).fetchall()
|
||||
keys = ("provider", "kind", "source", "title", "text", "author", "published", "score", "price", "currency", "url", "types")
|
||||
keys = ("id", "provider", "kind", "source", "title", "text", "author", "published", "score", "price", "currency", "url", "types")
|
||||
return [dict(zip(keys, r)) for r in rows], total
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user