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

Fix #2043248 [Embed metadata spawns infinite error popups](https://bugs.launchpad.net/calibre/+bug/2043248)

Browse Source
This commit is contained in:
Kovid Goyal 2023-11-11 12:22:11 +05:30
parent d266fe5447
commit ec6918a790
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/db/cache.py
View File

@ -2902,7 +2902,26 @@ class Cache:
except: except:
continue continue
if name and path: if name and path:
new_size = self.backend.apply_to_format(book_id, path, name, fmt, partial(doit, fmt, mi)) try:
new_size = self.backend.apply_to_format(book_id, path, name, fmt, partial(doit, fmt, mi))
except Exception as e:
if report_error is not None:
tb = traceback.format_exc()
if iswindows and isinstance(e, PermissionError) and e.filename and isinstance(e.filename, str):
from calibre_extensions import winutil
try:
p = winutil.get_processes_using_files(e.filename)
except OSError:
pass
else:
path_map = {x['path']: x for x in p}
tb = _('Could not open the file: "{}". It is already opened in the following programs:').format(e.filename)
for path, x in path_map.items():
tb += '\n' + f'{x["app_name"]}: {path}'
report_error(mi, fmt, tb)
new_size = None
else:
raise
if new_size is not None: if new_size is not None:
self.format_metadata_cache[book_id].get(fmt, {})['size'] = new_size self.format_metadata_cache[book_id].get(fmt, {})['size'] = new_size
max_size = self.fields['formats'].table.update_fmt(book_id, fmt, name, new_size, self.backend) max_size = self.fields['formats'].table.update_fmt(book_id, fmt, name, new_size, self.backend)

7
src/calibre/gui2/actions/embed.py
View File

@ -124,5 +124,10 @@ class EmbedAction(InterfaceAction):
def report_error(mi, fmt, tb): def report_error(mi, fmt, tb):
mi.book_id = book_id mi.book_id = book_id
errors.append((mi, fmt, tb)) errors.append((mi, fmt, tb))
db.embed_metadata((book_id,), only_fmts=only_fmts, report_error=report_error) try:
db.embed_metadata((book_id,), only_fmts=only_fmts, report_error=report_error)
except Exception:
import traceback
mi = db.get_metadata(book_id)
report_error(mi, '', traceback.format_exc())
self.job_data = (i + 1, book_ids, pd, only_fmts, errors) self.job_data = (i + 1, book_ids, pd, only_fmts, errors)