mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Search: use has_cover instead of cover.
This commit is contained in:
parent
4bf1a46acd
commit
88beebd0a3
@ -213,10 +213,16 @@ class ResultCache(SearchQueryParser):
|
|||||||
for item in self._data:
|
for item in self._data:
|
||||||
if item is None: continue
|
if item is None: continue
|
||||||
for loc in location:
|
for loc in location:
|
||||||
if query == 'false' and (not item[loc] or item[loc].strip() == ''):
|
if query == 'false' and not item[loc]:
|
||||||
|
if isinstance(item[loc], basestring):
|
||||||
|
if item[loc].strip() != '':
|
||||||
|
continue
|
||||||
matches.add(item[0])
|
matches.add(item[0])
|
||||||
break
|
break
|
||||||
if query == 'true' and (item[loc] and item[loc].strip() != ''):
|
if query == 'true' and item[loc]:
|
||||||
|
if isinstance(item[loc], basestring):
|
||||||
|
if item[loc].strip() == '':
|
||||||
|
continue
|
||||||
matches.add(item[0])
|
matches.add(item[0])
|
||||||
break
|
break
|
||||||
if rating_query and item[loc] and loc == MAP['rating'] and rating_query == int(item[loc]):
|
if rating_query and item[loc] and loc == MAP['rating'] and rating_query == int(item[loc]):
|
||||||
@ -266,7 +272,7 @@ class ResultCache(SearchQueryParser):
|
|||||||
try:
|
try:
|
||||||
self._data[id] = db.conn.get('SELECT * from meta WHERE id=?',
|
self._data[id] = db.conn.get('SELECT * from meta WHERE id=?',
|
||||||
(id,))[0]
|
(id,))[0]
|
||||||
self._data[id].append(db.cover(id, index_is_id=True, as_path=True))
|
self._data[id].append(db.has_cover(id, index_is_id=True))
|
||||||
except IndexError:
|
except IndexError:
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
@ -281,7 +287,7 @@ class ResultCache(SearchQueryParser):
|
|||||||
self._data.extend(repeat(None, max(ids)-len(self._data)+2))
|
self._data.extend(repeat(None, max(ids)-len(self._data)+2))
|
||||||
for id in ids:
|
for id in ids:
|
||||||
self._data[id] = db.conn.get('SELECT * from meta WHERE id=?', (id,))[0]
|
self._data[id] = db.conn.get('SELECT * from meta WHERE id=?', (id,))[0]
|
||||||
self._data[id].append(db.cover(id, index_is_id=True, as_path=True))
|
self._data[id].append(db.has_cover(id, index_is_id=True))
|
||||||
self._map[0:0] = ids
|
self._map[0:0] = ids
|
||||||
self._map_filtered[0:0] = ids
|
self._map_filtered[0:0] = ids
|
||||||
|
|
||||||
@ -301,7 +307,7 @@ class ResultCache(SearchQueryParser):
|
|||||||
self._data[r[0]] = r
|
self._data[r[0]] = r
|
||||||
for item in self._data:
|
for item in self._data:
|
||||||
if item is not None:
|
if item is not None:
|
||||||
item.append(db.cover(item[0], index_is_id=True, as_path=True))
|
item.append(db.has_cover(item[0], index_is_id=True))
|
||||||
self._map = [i[0] for i in self._data if i is not None]
|
self._map = [i[0] for i in self._data if i is not None]
|
||||||
if field is not None:
|
if field is not None:
|
||||||
self.sort(field, ascending)
|
self.sort(field, ascending)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user