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

Workaround python returning bytes based filenames on some windows systems

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-23 08:00:57 +05:30
parent 506022b5aa
commit fb5e14046c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/ebooks/conversion/plugins/html_input.py
View File

@ -11,7 +11,7 @@ import tempfile
from functools import partial from functools import partial
from urllib.parse import quote from urllib.parse import quote
from calibre.constants import isbsd, islinux from calibre.constants import isbsd, islinux, filesystem_encoding
from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation
from calibre.utils.filenames import ascii_filename, get_long_path_name from calibre.utils.filenames import ascii_filename, get_long_path_name
from calibre.utils.imghdr import what from calibre.utils.imghdr import what
@ -88,8 +88,11 @@ class HTMLInput(InputFormatPlugin):
fname = None fname = None
if hasattr(stream, 'name'): if hasattr(stream, 'name'):
basedir = os.path.dirname(stream.name) sname = stream.name
fname = os.path.basename(stream.name) if isinstance(sname, bytes):
sname = sname.decode(filesystem_encoding)
basedir = os.path.dirname(sname)
fname = os.path.basename(sname)
self.set_root_dir_of_input(basedir) self.set_root_dir_of_input(basedir)
if file_ext != 'opf': if file_ext != 'opf':