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

Merge branch 'master' of https://github.com/yurikaka/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-14 08:17:55 +05:30
commit dc64f044db
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/srv/content.py
View File

@ -160,8 +160,6 @@ def book_filename(rd, book_id, mi, fmt, as_encoded_unicode=False):
au = authors_to_string(mi.authors or [_('Unknown')]) au = authors_to_string(mi.authors or [_('Unknown')])
title = mi.title or _('Unknown') title = mi.title or _('Unknown')
ext = (fmt or '').lower() ext = (fmt or '').lower()
if ext == 'kepub' and 'Kobo Touch' in rd.inheaders.get('User-Agent', ''):
ext = 'kepub.epub'
fname = '%s - %s_%s.%s' % (title[:30], au[:30], book_id, ext) fname = '%s - %s_%s.%s' % (title[:30], au[:30], book_id, ext)
if as_encoded_unicode: if as_encoded_unicode:
# See https://tools.ietf.org/html/rfc6266 # See https://tools.ietf.org/html/rfc6266
@ -169,6 +167,9 @@ def book_filename(rd, book_id, mi, fmt, as_encoded_unicode=False):
fname = unicode_type(quote(fname)) fname = unicode_type(quote(fname))
else: else:
fname = ascii_filename(fname).replace('"', '_') fname = ascii_filename(fname).replace('"', '_')
if ext == 'kepub' and 'Kobo Touch' in rd.inheaders.get('User-Agent', ''):
fname = fname.replace('!', '_')
fname += '.epub'
return fname return fname