mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
DOCX Input: Fix image name generation
DOCX Input: When converting docx files with large numbers of unnamed images, do not crash on windows. Fixes #1191354 [Word docx conversion](https://bugs.launchpad.net/calibre/+bug/1191354)
This commit is contained in:
parent
bf9263b007
commit
b63e0df73f
@ -112,15 +112,16 @@ class Images(object):
|
|||||||
base += '.' + ext
|
base += '.' + ext
|
||||||
exists = frozenset(self.used.itervalues())
|
exists = frozenset(self.used.itervalues())
|
||||||
c = 1
|
c = 1
|
||||||
while base in exists:
|
name = base
|
||||||
|
while name in exists:
|
||||||
n, e = base.rpartition('.')[0::2]
|
n, e = base.rpartition('.')[0::2]
|
||||||
base = '%s-%d.%s' % (n, c, e)
|
name = '%s-%d.%s' % (n, c, e)
|
||||||
c += 1
|
c += 1
|
||||||
self.used[rid] = base
|
self.used[rid] = name
|
||||||
with open(os.path.join(self.dest_dir, base), 'wb') as f:
|
with open(os.path.join(self.dest_dir, name), 'wb') as f:
|
||||||
f.write(raw)
|
f.write(raw)
|
||||||
self.all_images.add('images/' + base)
|
self.all_images.add('images/' + name)
|
||||||
return base
|
return name
|
||||||
|
|
||||||
def pic_to_img(self, pic, alt=None):
|
def pic_to_img(self, pic, alt=None):
|
||||||
name = None
|
name = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user