mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Fix a regression in 0.8.7 that broke reading metadata from MOBI files in the Edit metadata dialog. Fixes #801981 (Private bug)
This commit is contained in:
parent
64426fb0ea
commit
7d5fd85c53
@ -957,7 +957,10 @@ def get_metadata(stream):
|
|||||||
return get_metadata(stream)
|
return get_metadata(stream)
|
||||||
from calibre.utils.logging import Log
|
from calibre.utils.logging import Log
|
||||||
log = Log()
|
log = Log()
|
||||||
mi = MetaInformation(os.path.basename(stream.name), [_('Unknown')])
|
try:
|
||||||
|
mi = MetaInformation(os.path.basename(stream.name), [_('Unknown')])
|
||||||
|
except:
|
||||||
|
mi = MetaInformation(_('Unknown'), [_('Unknown')])
|
||||||
mh = MetadataHeader(stream, log)
|
mh = MetadataHeader(stream, log)
|
||||||
if mh.title and mh.title != _('Unknown'):
|
if mh.title and mh.title != _('Unknown'):
|
||||||
mi.title = mh.title
|
mi.title = mh.title
|
||||||
|
@ -1245,6 +1245,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
|||||||
ret = tempfile.SpooledTemporaryFile(max_size=SPOOL_SIZE)
|
ret = tempfile.SpooledTemporaryFile(max_size=SPOOL_SIZE)
|
||||||
shutil.copyfileobj(f, ret)
|
shutil.copyfileobj(f, ret)
|
||||||
ret.seek(0)
|
ret.seek(0)
|
||||||
|
ret.name = f.name
|
||||||
else:
|
else:
|
||||||
ret = f.read()
|
ret = f.read()
|
||||||
return ret
|
return ret
|
||||||
|
Loading…
x
Reference in New Issue
Block a user