Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup previous PR

Browse Source 
Fixes #2025355 [Metadata wrong for books from gui.download_ebook](https://bugs.launchpad.net/calibre/+bug/2025355)
This commit is contained in:
Kovid Goyal 2023-07-09 16:44:47 +05:30
parent b85735f767
commit 1c743ac686
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calibre/gui2/ebook_download.py
View File

@ -6,7 +6,6 @@ import os
import shutil import shutil
import time import time
from contextlib import closing from contextlib import closing
from pathlib import Path
from mechanize import MozillaCookieJar from mechanize import MozillaCookieJar
from calibre import browser from calibre import browser
@ -17,7 +16,7 @@ from calibre.gui2.threaded_jobs import ThreadedJob
from calibre.ptempfile import PersistentTemporaryDirectory from calibre.ptempfile import PersistentTemporaryDirectory
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.web import get_download_filename_from_response from calibre.web import get_download_filename_from_response
from polyglot.builtins import string_or_bytes, as_unicode from polyglot.builtins import as_unicode, string_or_bytes
class DownloadInfo(MessageBox): class DownloadInfo(MessageBox):
@ -104,20 +103,21 @@ class EbookDownload:
if not add_to_lib or not filename: if not add_to_lib or not filename:
return return
from calibre.ebooks.metadata.worker import run_import_plugins
path = run_import_plugins((filename,), time.monotonic_ns(), str(Path(filename).parent))[0]
ext = os.path.splitext(path)[1][1:].lower()
if ext not in BOOK_EXTENSIONS:
raise Exception(_('Not a support e-book format.'))
from calibre.ebooks.metadata.meta import get_metadata from calibre.ebooks.metadata.meta import get_metadata
with open(path, 'rb') as f: from calibre.ebooks.metadata.worker import run_import_plugins
mi = get_metadata(f, ext, force_read_metadata=True) from calibre.ptempfile import TemporaryDirectory
mi.tags.extend(tags)
id = gui.library_view.model().db.create_book_entry(mi) with TemporaryDirectory() as tdir:
gui.library_view.model().db.add_format_with_hooks(id, ext.upper(), path, index_is_id=True) path = run_import_plugins((filename,), time.monotonic_ns(), tdir)[0]
ext = os.path.splitext(path)[1][1:].lower()
if ext not in BOOK_EXTENSIONS:
raise Exception(_('{} is not a supported e-book format').format(ext.upper()))
with open(path, 'rb') as f:
mi = get_metadata(f, ext, force_read_metadata=True)
mi.tags.extend(tags)
db = gui.current_db
book_id = db.create_book_entry(mi)
db.new_api.add_format(book_id, ext.upper(), path)
gui.library_view.model().books_added(1) gui.library_view.model().books_added(1)
gui.library_view.model().count_changed() gui.library_view.model().count_changed()