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

Clearer argument name

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

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

@ -55,36 +55,36 @@ class Context(object):
def finalize_session(self, endpoint, data, output): def finalize_session(self, endpoint, data, output):
pass pass
def get_library(self, data, library_id=None): def get_library(self, request_data, library_id=None):
if not data.username: if not request_data.username:
return self.library_broker.get(library_id) return self.library_broker.get(library_id)
lf = partial(self.user_manager.allowed_library_names, data.username) lf = partial(self.user_manager.allowed_library_names, request_data.username)
allowed_libraries = self.library_broker.allowed_libraries(lf) allowed_libraries = self.library_broker.allowed_libraries(lf)
if not allowed_libraries: if not allowed_libraries:
raise HTTPForbidden('The user {} is not allowed to access any libraries on this server'.format(data.username)) raise HTTPForbidden('The user {} is not allowed to access any libraries on this server'.format(request_data.username))
library_id = library_id or next(allowed_libraries.iterkeys()) library_id = library_id or next(allowed_libraries.iterkeys())
if library_id in allowed_libraries: if library_id in allowed_libraries:
return self.library_broker.get(library_id) return self.library_broker.get(library_id)
raise HTTPForbidden('The user {} is not allowed to access the library {}'.format(data.username, library_id)) raise HTTPForbidden('The user {} is not allowed to access the library {}'.format(request_data.username, library_id))
def library_info(self, data): def library_info(self, request_data):
if not data.username: if not request_data.username:
return self.library_broker.library_map, self.library_broker.default_library return self.library_broker.library_map, self.library_broker.default_library
lf = partial(self.user_manager.allowed_library_names, data.username) lf = partial(self.user_manager.allowed_library_names, request_data.username)
allowed_libraries = self.library_broker.allowed_libraries(lf) allowed_libraries = self.library_broker.allowed_libraries(lf)
if not allowed_libraries: if not allowed_libraries:
raise HTTPForbidden('The user {} is not allowed to access any libraries on this server'.format(data.username)) raise HTTPForbidden('The user {} is not allowed to access any libraries on this server'.format(request_data.username))
return dict(allowed_libraries), next(allowed_libraries.iterkeys()) return dict(allowed_libraries), next(allowed_libraries.iterkeys())
def check_for_write_access(self, data): def check_for_write_access(self, request_data):
if not data.username: if not request_data.username:
if data.is_local_connection and self.opts.local_write: if request_data.is_local_connection and self.opts.local_write:
return return
raise HTTPForbidden('Anonymous users are not allowed to make changes') raise HTTPForbidden('Anonymous users are not allowed to make changes')
if self.user_manager.is_readonly(data.username): if self.user_manager.is_readonly(request_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(request_data.username))
def get_categories(self, data, db, sort='name', first_letter_sort=True, vl=''): def get_categories(self, request_data, db, sort='name', first_letter_sort=True, vl=''):
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:
@ -99,7 +99,7 @@ class Context(object):
cache[key] = old cache[key] = old
return old[1] return old[1]
def get_tag_browser(self, data, db, opts, render, vl=''): def get_tag_browser(self, request_data, db, opts, render, vl=''):
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:
@ -117,7 +117,7 @@ class Context(object):
cache[key] = old cache[key] = old
return old[1] return old[1]
def search(self, data, db, query, vl=''): def search(self, request_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 ''