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

Change the implementation of manifest_has_name() to be robust against URI percent encoding

Browse Source
This commit is contained in:
Kovid Goyal 2016-12-12 10:31:11 +05:30
parent 3c77f00387
commit c8966e443b
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

@ -316,9 +316,8 @@ class Container(ContainerBase): # {{{
def manifest_has_name(self, name): def manifest_has_name(self, name):
''' Return True if the manifest has an entry corresponding to name ''' ''' Return True if the manifest has an entry corresponding to name '''
href = self.name_to_href(name, self.opf_name) all_names = {self.href_to_name(x.get('href'), self.opf_name) for x in self.opf_xpath('//opf:manifest/opf:item[@href]')}
all_hrefs = {x.get('href') for x in self.opf_xpath('//opf:manifest/opf:item[@href]')} return name in all_names
return href in all_hrefs
def add_file(self, name, data, media_type=None, spine_index=None, modify_name_if_needed=False, process_manifest_item=None): def add_file(self, name, data, media_type=None, spine_index=None, modify_name_if_needed=False, process_manifest_item=None):
''' Add a file to this container. Entries for the file are ''' Add a file to this container. Entries for the file are
@ -326,9 +325,8 @@ class Container(ContainerBase): # {{{
(if the file is a text document) ''' (if the file is a text document) '''
if '..' in name: if '..' in name:
raise ValueError('Names are not allowed to have .. in them') raise ValueError('Names are not allowed to have .. in them')
all_hrefs = {x.get('href') for x in self.opf_xpath('//opf:manifest/opf:item[@href]')}
href = self.name_to_href(name, self.opf_name) href = self.name_to_href(name, self.opf_name)
if self.has_name(name) or href in all_hrefs: if self.has_name(name) or self.manifest_has_name(name):
if not modify_name_if_needed: if not modify_name_if_needed:
raise ValueError(('A file with the name %s already exists' % name) if self.has_name(name) else raise ValueError(('A file with the name %s already exists' % name) if self.has_name(name) else
('An item with the href %s already exists in the manifest' % href)) ('An item with the href %s already exists in the manifest' % href))
@ -338,7 +336,7 @@ class Container(ContainerBase): # {{{
c += 1 c += 1
q = '%s-%d.%s' % (base, c, ext) q = '%s-%d.%s' % (base, c, ext)
href = self.name_to_href(q, self.opf_name) href = self.name_to_href(q, self.opf_name)
if not self.has_name(q) and href not in all_hrefs: if not self.has_name(q) and not self.manifest_has_name(q):
name = q name = q
break break
path = self.name_to_abspath(name) path = self.name_to_abspath(name)
@ -872,15 +870,14 @@ class Container(ContainerBase): # {{{
while item_id in all_ids: while item_id in all_ids:
c += 1 c += 1
item_id = id_prefix + '%d'%c item_id = id_prefix + '%d'%c
all_names = {x.get('href') for x in self.opf_xpath(
'//opf:manifest/opf:item[@href]')}
def exists(h): def exists(h):
return self.exists(self.href_to_name(h, self.opf_name)) n = self.href_to_name(h, self.opf_name)
return self.exists(n) or self.manifest_has_name(n)
if unique_href: if unique_href:
c = 0 c = 0
while href in all_names or exists(href): while exists(href):
c += 1 c += 1
href = '%s_%d.%s'%(base, c, ext) href = '%s_%d.%s'%(base, c, ext)
manifest = self.opf_xpath('//opf:manifest')[0] manifest = self.opf_xpath('//opf:manifest')[0]
@ -1027,6 +1024,7 @@ class InvalidEpub(InvalidBook):
class ObfuscationKeyMissing(InvalidEpub): class ObfuscationKeyMissing(InvalidEpub):
pass pass
OCF_NS = 'urn:oasis:names:tc:opendocument:xmlns:container' OCF_NS = 'urn:oasis:names:tc:opendocument:xmlns:container'
VCS_IGNORE_FILES = frozenset('.gitignore .hgignore .agignore .bzrignore'.split()) VCS_IGNORE_FILES = frozenset('.gitignore .hgignore .agignore .bzrignore'.split())
VCS_DIRS = frozenset(('.git', '.hg', '.svn', '.bzr')) VCS_DIRS = frozenset(('.git', '.hg', '.svn', '.bzr'))
@ -1458,5 +1456,6 @@ def test_roundtrip():
if diff is not None: if diff is not None:
print (diff) print (diff)
if __name__ == '__main__': if __name__ == '__main__':
test_roundtrip() test_roundtrip()