Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify API a bit by removing unused restrict_to_ids

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-18 10:15:25 +05:30
parent 9ad2ff8581
commit 64c8b52744
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/srv/handler.py
View File

@ -84,9 +84,8 @@ class Context(object):
if self.user_manager.is_readonly(data.username): if self.user_manager.is_readonly(data.username):
raise HTTPForbidden('The user {} does not have permission to make changes'.format(data.username)) raise HTTPForbidden('The user {} does not have permission to make changes'.format(data.username))
def get_categories(self, data, db, restrict_to_ids=None, sort='name', first_letter_sort=True, vl=''): def get_categories(self, data, db, sort='name', first_letter_sort=True, vl=''):
if restrict_to_ids is None: restrict_to_ids = db.books_in_virtual_library(vl)
restrict_to_ids = db.books_in_virtual_library(vl)
key = (restrict_to_ids, sort, first_letter_sort) key = (restrict_to_ids, sort, first_letter_sort)
with self.lock: with self.lock:
cache = self.library_broker.category_caches[db.server_library_id] cache = self.library_broker.category_caches[db.server_library_id]
@ -100,9 +99,8 @@ class Context(object):
cache[key] = old cache[key] = old
return old[1] return old[1]
def get_tag_browser(self, data, db, opts, render, restrict_to_ids=None, vl=''): def get_tag_browser(self, data, db, opts, render, vl=''):
if restrict_to_ids is None: restrict_to_ids = db.books_in_virtual_library(vl)
restrict_to_ids = db.books_in_virtual_library(vl)
key = (restrict_to_ids, opts) key = (restrict_to_ids, opts)
with self.lock: with self.lock:
cache = self.library_broker.category_caches[db.server_library_id] cache = self.library_broker.category_caches[db.server_library_id]
@ -119,14 +117,14 @@ class Context(object):
cache[key] = old cache[key] = old
return old[1] return old[1]
def search(self, data, db, query, restrict_to_ids=None, vl=''): def search(self, data, db, query, vl=''):
with self.lock: with self.lock:
cache = self.library_broker.search_caches[db.server_library_id] cache = self.library_broker.search_caches[db.server_library_id]
vl = db.pref('virtual_libraries', {}).get(vl) or '' vl = db.pref('virtual_libraries', {}).get(vl) or ''
key = query, restrict_to_ids, vl key = query, vl
old = cache.pop(key, None) old = cache.pop(key, None)
if old is None or old[0] < db.clear_search_cache_count: if old is None or old[0] < db.clear_search_cache_count:
matches = db.search(query, restriction=vl, book_ids=restrict_to_ids) matches = db.search(query, restriction=vl)
cache[key] = old = (db.clear_search_cache_count, matches) cache[key] = old = (db.clear_search_cache_count, matches)
if len(cache) > self.SEARCH_CACHE_SIZE: if len(cache) > self.SEARCH_CACHE_SIZE:
cache.popitem(last=False) cache.popitem(last=False)