Cover upload gives Error 500 fix #972 (leftover from refactoring)
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type) Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
This commit is contained in:
parent
fc4dc36c65
commit
cf00b4eebf
|
@ -509,7 +509,7 @@ def save_cover(img, book_path):
|
|||
log.error("Only jpg/jpeg files are supported as coverfile")
|
||||
return False
|
||||
|
||||
if ub.config.config_use_google_drive:
|
||||
if config.config_use_google_drive:
|
||||
tmpDir = gettempdir()
|
||||
if save_cover_from_filestorage(tmpDir, "uploaded_cover.jpg", img) is True:
|
||||
gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg'),
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
<link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
|
||||
{% endif %}
|
||||
{% for format in entry.data %}
|
||||
<link rel="http://opds-spec.org/acquisition" href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower)}}"
|
||||
<link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
|
||||
length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
|
||||
{% endfor %}
|
||||
</entry>
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
"timestamp": "{{entry.timestamp}}",
|
||||
"thumbnail": "{{url_for('opds.feed_get_cover', book_id=entry.id)}}",
|
||||
"main_format": {
|
||||
"{{entry.data[0].format|lower}}": "{{ url_for('web.download_link', book_id=entry.id, book_format=entry.data[0].format|lower)}}"
|
||||
"{{entry.data[0].format|lower}}": "{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=entry.data[0].format|lower)}}"
|
||||
},
|
||||
"rating":{% if entry.ratings.__len__() > 0 %} "{{entry.ratings[0].rating}}.0"{% else %}0.0{% endif %},
|
||||
"authors": [
|
||||
|
@ -47,7 +47,7 @@
|
|||
"other_formats": {
|
||||
{% if entry.data.__len__() > 1 %}
|
||||
{% for format in entry.data[1:] %}
|
||||
"{{format.format|lower}}": "{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower)}}"{% if not loop.last %},{% endif %}
|
||||
"{{format.format|lower}}": "{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"{% if not loop.last %},{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %} },
|
||||
"title_sort": "{{entry.sort}}"
|
||||
|
|
|
@ -947,7 +947,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
|
|||
else:
|
||||
try:
|
||||
readBooks = db.session.query(db.cc_classes[config.config_read_column])\
|
||||
.filter(db.cc_classes[config.config_read_column].value is True).all()
|
||||
.filter(db.cc_classes[config.config_read_column].value == True).all()
|
||||
readBookIds = [x.book for x in readBooks]
|
||||
except KeyError:
|
||||
log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
|
||||
|
|
Loading…
Reference in New Issue
Block a user