gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-08 02:25:57 +01:00
Code Issues Projects Releases Wiki Activity

Removed guess_all_extensions

Browse Source
This commit is contained in:
gryf
2020-06-14 15:54:38 +02:00
parent e35bd46422
commit dd60a1cd26
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ebook_converter/__init__.py
View File

@@ -32,10 +32,6 @@ def init_mimetypes():
'data/mime.types')]) 'data/mime.types')])
def guess_all_extensions(*args, **kwargs):
return mimetypes.guess_all_extensions(*args, **kwargs)
def guess_extension(*args, **kwargs): def guess_extension(*args, **kwargs):
ext = mimetypes.guess_extension(*args, **kwargs) ext = mimetypes.guess_extension(*args, **kwargs)
if not ext and args and args[0] == 'application/x-palmreader': if not ext and args and args[0] == 'application/x-palmreader':

7
ebook_converter/ebooks/metadata/fb2.py
View File

@@ -12,7 +12,7 @@ from lxml import etree
from ebook_converter.utils.date import parse_only_date from ebook_converter.utils.date import parse_only_date
from ebook_converter.utils.img import save_cover_data_to from ebook_converter.utils.img import save_cover_data_to
from ebook_converter.utils.imghdr import identify from ebook_converter.utils.imghdr import identify
from ebook_converter import guess_all_extensions, prints, force_unicode from ebook_converter import prints, force_unicode
from ebook_converter.ebooks.metadata import MetaInformation, check_isbn from ebook_converter.ebooks.metadata import MetaInformation, check_isbn
from ebook_converter.ebooks.chardet import xml_to_unicode from ebook_converter.ebooks.chardet import xml_to_unicode
from ebook_converter.polyglot.binary import as_base64_unicode from ebook_converter.polyglot.binary import as_base64_unicode
@@ -222,12 +222,13 @@ def _parse_cover_data(root, imgid, mi, ctx):
elm_binary = ctx.XPath('//fb:binary[@id="%s"]' % imgid)(root) elm_binary = ctx.XPath('//fb:binary[@id="%s"]' % imgid)(root)
if elm_binary: if elm_binary:
mimetype = elm_binary[0].get('content-type', 'image/jpeg') mimetype = elm_binary[0].get('content-type', 'image/jpeg')
mime_extensions = guess_all_extensions(mimetype) mime_extensions = mimetypes.guess_all_extensions(mimetype)
if not mime_extensions and mimetype.startswith('image/'): if not mime_extensions and mimetype.startswith('image/'):
mimetype_fromid = mimetypes.guess_type(imgid)[0] mimetype_fromid = mimetypes.guess_type(imgid)[0]
if mimetype_fromid and mimetype_fromid.startswith('image/'): if mimetype_fromid and mimetype_fromid.startswith('image/'):
mime_extensions = guess_all_extensions(mimetype_fromid) mime_extensions = (mimetypes
.guess_all_extensions(mimetype_fromid))
if mime_extensions: if mime_extensions:
pic_data = elm_binary[0].text pic_data = elm_binary[0].text