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

AJAX endpoint for deleting books from server

Browse Source
This commit is contained in:
Kovid Goyal 2018-01-25 15:13:48 +05:30
parent 72deb18b6f
commit ce22a0da00
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/srv/cdb.py
View File

@ -11,7 +11,7 @@ from io import BytesIO
from calibre import as_unicode, sanitize_file_name_unicode from calibre import as_unicode, sanitize_file_name_unicode
from calibre.db.cli import module_for_cmd from calibre.db.cli import module_for_cmd
from calibre.ebooks.metadata.meta import get_metadata from calibre.ebooks.metadata.meta import get_metadata
from calibre.srv.changes import books_added from calibre.srv.changes import books_added, books_deleted
from calibre.srv.errors import HTTPBadRequest, HTTPForbidden, HTTPNotFound from calibre.srv.errors import HTTPBadRequest, HTTPForbidden, HTTPNotFound
from calibre.srv.routes import endpoint, json, msgpack_or_json from calibre.srv.routes import endpoint, json, msgpack_or_json
from calibre.srv.utils import get_db, get_library_data from calibre.srv.utils import get_db, get_library_data
@ -91,3 +91,18 @@ def cdb_add_book(ctx, rd, job_id, add_duplicates, filename, library_id):
ans['book_id'] = ids[0] ans['book_id'] = ids[0]
books_added(ids) books_added(ids)
return ans return ans
@endpoint('/cdb/delete-books/{book_ids}/{library_id=None}',
needs_db_write=True, postprocess=json, methods=receive_data_methods, cache_control='no-cache')
def cdb_delete_book(ctx, rd, book_ids, library_id):
db = get_db(ctx, rd, library_id)
if ctx.restriction_for(rd, db):
raise HTTPForbidden('Cannot use the delete book interface with a user who has per library restrictions')
try:
ids = {int(x) for x in book_ids.split(',')}
except Exception:
raise HTTPBadRequest('invalid book_ids: {}'.format(book_ids))
db.remove_books(ids)
books_deleted(ids)
return {}

17
src/calibre/srv/tests/ajax.py
View File

@ -139,6 +139,7 @@ class ContentTest(LibraryBaseTest):
# cdb.py # cdb.py
r(url_for('/cdb/cmd', which='list'), status=FORBIDDEN) r(url_for('/cdb/cmd', which='list'), status=FORBIDDEN)
r(url_for('/cdb/add-book', job_id=1, add_duplicates='n', filename='test.epub'), status=FORBIDDEN) r(url_for('/cdb/add-book', job_id=1, add_duplicates='n', filename='test.epub'), status=FORBIDDEN)
r(url_for('/cdb/delete-books', book_ids='1'), status=FORBIDDEN)
# code.py # code.py
def sr(path, **k): def sr(path, **k):
@ -165,16 +166,23 @@ class ContentTest(LibraryBaseTest):
ae = self.assertEqual ae = self.assertEqual
def r(filename, data=None, status=OK, method='POST', username='12', add_duplicates='n', job_id=1): def a(filename, data=None, status=OK, method='POST', username='12', add_duplicates='n', job_id=1):
r, data = make_request(conn, '/cdb/add-book/{}/{}/{}'.format(job_id, add_duplicates, quote(filename.encode('utf-8')).decode('ascii')), r, data = make_request(conn, '/cdb/add-book/{}/{}/{}'.format(job_id, add_duplicates, quote(filename.encode('utf-8')).decode('ascii')),
username=username, password='test', prefix='', method=method, data=data) username=username, password='test', prefix='', method=method, data=data)
ae(status, r.status) ae(status, r.status)
return data return data
r('test.epub', None, username='ro', status=FORBIDDEN) def d(book_ids, username='12', status=OK):
book_ids = ','.join(map(str, book_ids))
r, data = make_request(conn, '/cdb/delete-books/{}'.format(book_ids),
username=username, password='test', prefix='', method='POST')
ae(status, r.status)
return data
a('test.epub', None, username='ro', status=FORBIDDEN)
content = b'content' content = b'content'
filename = 'test add - XXX.txt' filename = 'test add - XXX.txt'
data = r(filename, content) data = a(filename, content)
s = BytesIO(content) s = BytesIO(content)
s.name = filename s.name = filename
mi = get_metadata(s, stream_type='txt') mi = get_metadata(s, stream_type='txt')
@ -182,5 +190,6 @@ class ContentTest(LibraryBaseTest):
r, q = make_request(conn, '/get/txt/{}'.format(data['book_id']), username='12', password='test', prefix='') r, q = make_request(conn, '/get/txt/{}'.format(data['book_id']), username='12', password='test', prefix='')
ae(r.status, OK) ae(r.status, OK)
ae(q, content) ae(q, content)
d((1,), username='ro', status=FORBIDDEN)
d((1, data['book_id']))
# }}} # }}}