Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Edit Book: Fix smarten punctuation not working for books with non-ascii characters in internal file names on OS X

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-20 14:06:57 +05:30
parent c9004c1e98
commit 72fd1567df
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/ebooks/oeb/polish/container.py
View File

@ -159,15 +159,6 @@ class Container(object): # {{{
for f in filenames: for f in filenames:
path = join(dirpath, f) path = join(dirpath, f)
name = self.abspath_to_name(path) name = self.abspath_to_name(path)
# OS X silently changes all file names to NFD form. The EPUB
# spec requires all text including filenames to be in NFC form.
# The proper fix is to implement a VFS that maps between
# canonical names and their file system representation, however,
# I dont have the time for that now. Note that the container
# ensures that all text files are normalized to NFC when
# decoding them anyway, so there should be no mismatch between
# names in the text and NFC canonical file names.
name = unicodedata.normalize('NFC', name)
self.name_path_map[name] = path self.name_path_map[name] = path
self.mime_map[name] = guess_type(path) self.mime_map[name] = guess_type(path)
# Special case if we have stumbled onto the opf # Special case if we have stumbled onto the opf
@ -373,7 +364,15 @@ class Container(object): # {{{
:param root: The base directory. By default the root for this container object is used. :param root: The base directory. By default the root for this container object is used.
''' '''
return abspath_to_name(fullpath, root or self.root) # OS X silently changes all file names to NFD form. The EPUB
# spec requires all text including filenames to be in NFC form.
# The proper fix is to implement a VFS that maps between
# canonical names and their file system representation, however,
# I dont have the time for that now. Note that the container
# ensures that all text files are normalized to NFC when
# decoding them anyway, so there should be no mismatch between
# names in the text and NFC canonical file names.
return unicodedata.normalize('NFC', abspath_to_name(fullpath, root or self.root))
def name_to_abspath(self, name): def name_to_abspath(self, name):
' Convert a canonical name to an absolute OS dependant path ' ' Convert a canonical name to an absolute OS dependant path '