gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-07 21:43:31 +02:00
Code Issues Projects Releases Wiki Activity

Sorted out mime initialization.

Browse Source 
Every mime related function in main __init__.py has a flag check for the
check if initialization has already done. This is nonsense, since it
should be done implicitly early on the converter is starting.

This commit straight the things out, and initialization is done in cli
module.

Also, function guess_type was removed, since it's just a proxy for
mimetypes.guess_type function.
This commit is contained in:
gryf
2020-06-14 15:41:18 +02:00
parent b23a59f223
commit 1465e4267f
22 changed files with 94 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ebook_converter/ebooks/metadata/__init__.py
View File

@@ -2,22 +2,18 @@
Provides abstraction for metadata reading.writing from a variety of ebook
formats.
"""
import mimetypes
import os
import re
import sys
import urllib.parse
from ebook_converter import relpath, guess_type, prints, force_unicode
from ebook_converter import relpath, prints, force_unicode
from ebook_converter.utils.config_base import tweaks
from ebook_converter.polyglot.builtins import as_unicode
from ebook_converter.polyglot.urllib import unquote
__license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
try:
_author_pat = re.compile(tweaks['authors_split_regex'])
except Exception:
@@ -231,7 +227,7 @@ class Resource(object):
self.path = None
self.fragment = ''
try:
self.mime_type = guess_type(href_or_path)[0]
self.mime_type = mimetypes.guess_type(href_or_path)[0]
except:
self.mime_type = None
if self.mime_type is None: