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

Content server: Fix newly added books on homepage not restricted to the books the logged in user is allowed to access

Browse Source
This commit is contained in:
Kovid Goyal 2023-11-18 05:59:36 +05:30
parent 7fc0952a6a
commit 8d67ae5f24
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/db/cache.py
View File

@ -1405,8 +1405,8 @@ class Cache:
return ret return ret
@read_api @read_api
def newly_added_book_ids(self, count=5) -> list[int]: def newly_added_book_ids(self, count=5, book_ids=None) -> list[int]:
ids_to_sort = self._all_book_ids(list) ids_to_sort = self._all_book_ids(list) if book_ids is None else list(book_ids)
ids_to_sort.sort(reverse=True) ids_to_sort.sort(reverse=True)
return ids_to_sort[:count] return ids_to_sort[:count]

4
src/calibre/srv/code.py
View File

@ -309,11 +309,11 @@ def newly_added(ctx, rd):
''' '''
db, library_id = get_library_data(ctx, rd)[:2] db, library_id = get_library_data(ctx, rd)[:2]
count = int(rd.query.get('num', 3)) count = int(rd.query.get('num', 3))
nbids = ctx.newest_book_ids(rd, db, count=count)
with db.safe_read_lock: with db.safe_read_lock:
nbids = db._newly_added_book_ids(count)
titles = db._all_field_for('title', nbids) titles = db._all_field_for('title', nbids)
authors = db._all_field_for('authors', nbids) authors = db._all_field_for('authors', nbids)
return {'library_id': library_id, 'books': nbids, 'titles': titles, 'authors': authors} return {'library_id': library_id, 'books': nbids, 'titles': titles, 'authors': authors}
@endpoint('/interface-data/more-books', postprocess=json, methods=POSTABLE) @endpoint('/interface-data/more-books', postprocess=json, methods=POSTABLE)

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

@ -92,6 +92,13 @@ class Context:
return False return False
return db.has_id(book_id) return db.has_id(book_id)
def newest_book_ids(self, request_data, db, count=5):
restriction = self.restriction_for(request_data, db)
allowed_book_ids = None
if restriction:
allowed_book_ids = db.search('', restriction=restriction)
return db.newly_added_book_ids(count=count, book_ids=allowed_book_ids)
def get_allowed_book_ids_from_restriction(self, request_data, db): def get_allowed_book_ids_from_restriction(self, request_data, db):
restriction = self.restriction_for(request_data, db) restriction = self.restriction_for(request_data, db)
return frozenset(db.search('', restriction=restriction)) if restriction else None return frozenset(db.search('', restriction=restriction)) if restriction else None