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

Partial fix for check book with epub files with non-ascii internal filenames on os x

Browse Source
This commit is contained in:
Kovid Goyal 2014-06-22 10:39:49 +05:30
parent 41520c443d
commit cad2a50df9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ __license__ = 'GPL v3'
__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, logging, sys, hashlib, uuid, re, shutil import os, logging, sys, hashlib, uuid, re, shutil, unicodedata
from collections import defaultdict from collections import defaultdict
from io import BytesIO from io import BytesIO
from urlparse import urlparse from urlparse import urlparse
@ -17,6 +17,7 @@ from lxml import etree
from cssutils import replaceUrls, getUrls from cssutils import replaceUrls, getUrls
from calibre import CurrentDir from calibre import CurrentDir
from calibre.constants import isosx
from calibre.customize.ui import (plugin_for_input_format, from calibre.customize.ui import (plugin_for_input_format,
plugin_for_output_format) plugin_for_output_format)
from calibre.ebooks.chardet import xml_to_unicode from calibre.ebooks.chardet import xml_to_unicode
@ -125,6 +126,17 @@ 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)
if isosx:
# 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 filesystem
# representation, however, I dont have the time for that
# now, so this will at least fix the problem for books that
# properly use the NFC form. Books that use the NFD form
# will be broken by this, but that's the price you pay for
# using OS X.
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