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

Nicer error message for /cdb/set-fields with invalid data

Browse Source
This commit is contained in:
Kovid Goyal 2019-01-22 12:29:37 +05:30
parent d7d7810a44
commit eab43eb63e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,9 +140,15 @@ def cdb_set_fields(ctx, rd, book_id, library_id):
data = json_loads(raw) data = json_loads(raw)
else: else:
raise HTTPBadRequest('Only JSON or msgpack requests are supported') raise HTTPBadRequest('Only JSON or msgpack requests are supported')
changes, loaded_book_ids = data['changes'], frozenset(map(int, data['loaded_book_ids']))
except Exception: except Exception:
raise HTTPBadRequest('Invalid encoded data') raise HTTPBadRequest('Invalid encoded data')
try:
changes, loaded_book_ids = data['changes'], frozenset(map(int, data.get('loaded_book_ids', ())))
if not isinstance(changes, dict):
raise TypeError('changes must be a dict')
except Exception:
raise HTTPBadRequest(
'''Data must be of the form {'changes': {'title': 'New Title', ...}, 'loaded_book_ids':[book_id1, book_id2, ...]'}''')
dirtied = set() dirtied = set()
cdata = changes.pop('cover', False) cdata = changes.pop('cover', False)
if cdata is not False: if cdata is not False: