mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-08 02:34:06 -04:00
DOCX: Ensure images always have filenames
This commit is contained in:
parent
925726e166
commit
76fa3a16b3
@ -104,9 +104,12 @@ class Images(object):
|
|||||||
if rid in self.used:
|
if rid in self.used:
|
||||||
return self.used[rid]
|
return self.used[rid]
|
||||||
raw = self.docx.read(self.rid_map[rid])
|
raw = self.docx.read(self.rid_map[rid])
|
||||||
base = base or ascii_filename(self.rid_map[rid].rpartition('/')[-1]).replace(' ', '_')
|
base = base or ascii_filename(self.rid_map[rid].rpartition('/')[-1]).replace(' ', '_') or 'image'
|
||||||
ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
|
ext = what(None, raw) or base.rpartition('.')[-1] or 'jpeg'
|
||||||
base = base.rpartition('.')[0] + '.' + ext
|
base = base.rpartition('.')[0]
|
||||||
|
if not base:
|
||||||
|
base = 'image'
|
||||||
|
base += '.' + ext
|
||||||
exists = frozenset(self.used.itervalues())
|
exists = frozenset(self.used.itervalues())
|
||||||
c = 1
|
c = 1
|
||||||
while base in exists:
|
while base in exists:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user