mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-20 23:20:32 +00:00
Add title tag to opds feed
Enable Kepub format for epub Reader
This commit is contained in:
commit
d977d1b81b
@ -199,7 +199,7 @@ def check_send_to_ereader(entry):
|
|||||||
# Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
|
# Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
|
||||||
# list with supported formats
|
# list with supported formats
|
||||||
def check_read_formats(entry):
|
def check_read_formats(entry):
|
||||||
extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
|
extensions_reader = {'TXT', 'PDF', 'EPUB', 'KEPUB', 'CBZ', 'CBT', 'CBR', 'DJVU', 'DJV'}
|
||||||
book_formats = list()
|
book_formats = list()
|
||||||
if len(entry.data):
|
if len(entry.data):
|
||||||
for ele in iter(entry.data):
|
for ele in iter(entry.data):
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% for format in entry.Books.data %}
|
{% for format in entry.Books.data %}
|
||||||
<link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.Books.id, book_format=format.format|lower)}}"
|
<link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.Books.id, book_format=format.format|lower)}}"
|
||||||
length="{{format.uncompressed_size}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
|
length="{{format.uncompressed_size}}" title="{{format.format}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</entry>
|
</entry>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -126,8 +126,8 @@
|
|||||||
window.calibre = {
|
window.calibre = {
|
||||||
filePath: "{{ url_for('static', filename='js/libs/') }}",
|
filePath: "{{ url_for('static', filename='js/libs/') }}",
|
||||||
cssPath: "{{ url_for('static', filename='css/') }}",
|
cssPath: "{{ url_for('static', filename='css/') }}",
|
||||||
bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
|
bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format=book_format) }}",
|
||||||
bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
|
bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format=book_format, anyname='file.epub') }}",
|
||||||
bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
|
bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
|
||||||
useBookmarks: "{{ current_user.is_authenticated | tojson }}"
|
useBookmarks: "{{ current_user.is_authenticated | tojson }}"
|
||||||
};
|
};
|
||||||
|
12
cps/web.py
12
cps/web.py
@ -1581,9 +1581,10 @@ def read_book(book_id, book_format):
|
|||||||
bookmark = ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
|
bookmark = ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
|
||||||
ub.Bookmark.book_id == book_id,
|
ub.Bookmark.book_id == book_id,
|
||||||
ub.Bookmark.format == book_format.upper())).first()
|
ub.Bookmark.format == book_format.upper())).first()
|
||||||
if book_format.lower() == "epub":
|
if book_format.lower() == "epub" or book_format.lower() == "kepub":
|
||||||
log.debug("Start epub reader for %d", book_id)
|
log.debug("Start [k]epub reader for %d", book_id)
|
||||||
return render_title_template('read.html', bookid=book_id, title=book.title, bookmark=bookmark)
|
return render_title_template('read.html', bookid=book_id, title=book.title, bookmark=bookmark,
|
||||||
|
book_format=book_format)
|
||||||
elif book_format.lower() == "pdf":
|
elif book_format.lower() == "pdf":
|
||||||
log.debug("Start pdf reader for %d", book_id)
|
log.debug("Start pdf reader for %d", book_id)
|
||||||
return render_title_template('readpdf.html', pdffile=book_id, title=book.title)
|
return render_title_template('readpdf.html', pdffile=book_id, title=book.title)
|
||||||
@ -1644,6 +1645,11 @@ def show_book(book_id):
|
|||||||
entry.email_share_list = check_send_to_ereader(entry)
|
entry.email_share_list = check_send_to_ereader(entry)
|
||||||
entry.reader_list = check_read_formats(entry)
|
entry.reader_list = check_read_formats(entry)
|
||||||
|
|
||||||
|
entry.reader_list_sizes = dict()
|
||||||
|
for data in entry.data:
|
||||||
|
if data.format.lower() in entry.reader_list:
|
||||||
|
entry.reader_list_sizes[data.format.lower()] = data.uncompressed_size
|
||||||
|
|
||||||
entry.audio_entries = []
|
entry.audio_entries = []
|
||||||
for media_format in entry.data:
|
for media_format in entry.data:
|
||||||
if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
|
if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
|
||||||
|
Loading…
Reference in New Issue
Block a user