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

Fix the read metadata from format button in the edit metadata dialog not working for FB2 files. Fixes #1385237 [Crash when extracting metadata from fb2](https://bugs.launchpad.net/calibre/+bug/1385237)

Browse Source
This commit is contained in:
Kovid Goyal 2014-10-24 18:47:11 +05:30
parent 53cb56200d
commit acb6b24e93
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -8,6 +8,7 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import textwrap, re, os, shutil, weakref import textwrap, re, os, shutil, weakref
from datetime import date
from PyQt5.Qt import ( from PyQt5.Qt import (
Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon, QToolButton, QWidget, Qt, QDateTimeEdit, pyqtSignal, QMessageBox, QIcon, QToolButton, QWidget,
@ -27,11 +28,11 @@ from calibre.gui2 import (file_icon_provider, UNDEFINED_QDATETIME,
choose_files, error_dialog, choose_images) choose_files, error_dialog, choose_images)
from calibre.gui2.complete2 import EditWithComplete from calibre.gui2.complete2 import EditWithComplete
from calibre.utils.date import ( from calibre.utils.date import (
local_tz, qt_to_dt, as_local_time, UNDEFINED_DATE, is_date_undefined) local_tz, qt_to_dt, as_local_time, UNDEFINED_DATE, is_date_undefined,
utcfromtimestamp, parse_only_date)
from calibre import strftime from calibre import strftime
from calibre.ebooks import BOOK_EXTENSIONS from calibre.ebooks import BOOK_EXTENSIONS
from calibre.customize.ui import run_plugins_on_import from calibre.customize.ui import run_plugins_on_import
from calibre.utils.date import utcfromtimestamp
from calibre.gui2.comments_editor import Editor from calibre.gui2.comments_editor import Editor
from calibre.library.comments import comments_to_html from calibre.library.comments import comments_to_html
from calibre.gui2.dialogs.tag_editor import TagEditor from calibre.gui2.dialogs.tag_editor import TagEditor
@ -119,6 +120,8 @@ def make_undoable(spinbox):
self.undo_val = widget.dateTime() self.undo_val = widget.dateTime()
elif hasattr(widget, 'value'): elif hasattr(widget, 'value'):
self.undo_val = widget.value() self.undo_val = widget.value()
if isinstance(val, date):
val = parse_only_date(val.isoformat(), assume_utc=False)
self.redo_val = val self.redo_val = val
def undo(self): def undo(self):
@ -169,6 +172,8 @@ def make_undoable(spinbox):
else: else:
self.undo_stack.clear() self.undo_stack.clear()
if hasattr(self, 'setDateTime'): if hasattr(self, 'setDateTime'):
if isinstance(val, date):
val = parse_only_date(val.isoformat(), assume_utc=False)
self.setDateTime(val) self.setDateTime(val)
elif hasattr(self, 'setValue'): elif hasattr(self, 'setValue'):
self.setValue(val) self.setValue(val)