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

Review downloaded metadata: Add suggestions for the tags, authors, publishers and series fields. Suggestions will pop-up as you type. Fixes #1390887 [Tags suggestions in review downloaded metadata dialog](https://bugs.launchpad.net/calibre/+bug/1390887)

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-09 18:00:05 +05:30
parent 1d8afd8c7c
commit 6d843bc051
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/actions/edit_metadata.py
View File

@ -241,6 +241,7 @@ class EditMetadataAction(InterfaceAction):
' is on the right. If a downloaded value is blank or unknown,' ' is on the right. If a downloaded value is blank or unknown,'
' the original value is used.'), ' the original value is used.'),
action_button=(_('&View Book'), I('view.png'), self.gui.iactions['View'].view_historical), action_button=(_('&View Book'), I('view.png'), self.gui.iactions['View'].view_historical),
db=db
) )
if d.exec_() == d.Accepted: if d.exec_() == d.Accepted:
nid_map = {} nid_map = {}

21
src/calibre/gui2/metadata/diff.py
View File

@ -12,7 +12,7 @@ from functools import partial
from future_builtins import zip from future_builtins import zip
from PyQt5.Qt import ( from PyQt5.Qt import (
QDialog, QWidget, QGridLayout, QLineEdit, QLabel, QToolButton, QIcon, QDialog, QWidget, QGridLayout, QLabel, QToolButton, QIcon,
QVBoxLayout, QDialogButtonBox, QApplication, pyqtSignal, QFont, QPixmap, QVBoxLayout, QDialogButtonBox, QApplication, pyqtSignal, QFont, QPixmap,
QSize, QPainter, Qt, QColor, QPen, QSizePolicy, QScrollArea, QFrame, QSize, QPainter, Qt, QColor, QPen, QSizePolicy, QScrollArea, QFrame,
QKeySequence, QAction, QMenu) QKeySequence, QAction, QMenu)
@ -20,6 +20,7 @@ from PyQt5.Qt import (
from calibre import fit_image from calibre import fit_image
from calibre.ebooks.metadata import title_sort, authors_to_sort_string from calibre.ebooks.metadata import title_sort, authors_to_sort_string
from calibre.gui2 import pixmap_to_data, gprefs from calibre.gui2 import pixmap_to_data, gprefs
from calibre.gui2.complete2 import LineEdit as EditWithComplete
from calibre.gui2.comments_editor import Editor from calibre.gui2.comments_editor import Editor
from calibre.gui2.languages import LanguagesEdit as LE from calibre.gui2.languages import LanguagesEdit as LE
from calibre.gui2.widgets2 import RightClickButton from calibre.gui2.widgets2 import RightClickButton
@ -31,17 +32,20 @@ Widgets = namedtuple('Widgets', 'new old label button')
# Widgets {{{ # Widgets {{{
class LineEdit(QLineEdit): class LineEdit(EditWithComplete):
changed = pyqtSignal() changed = pyqtSignal()
def __init__(self, field, is_new, parent, metadata, extra): def __init__(self, field, is_new, parent, metadata, extra):
QLineEdit.__init__(self, parent) EditWithComplete.__init__(self, parent)
self.is_new = is_new self.is_new = is_new
self.field = field self.field = field
self.metadata = metadata self.metadata = metadata
if not is_new: if not is_new:
self.setReadOnly(True) self.setReadOnly(True)
else:
sep = metadata['is_multiple']['list_to_ui'] if metadata['is_multiple'] else None
self.set_separator(sep)
self.textChanged.connect(self.changed) self.textChanged.connect(self.changed)
@dynamic_property @dynamic_property
@ -53,6 +57,7 @@ class LineEdit(QLineEdit):
if not val: if not val:
val = [] val = []
else: else:
val = val.strip(ism['list_to_ui'].strip())
val = [x.strip() for x in val.split(ism['list_to_ui']) if x.strip()] val = [x.strip() for x in val.split(ism['list_to_ui']) if x.strip()]
return val return val
def fset(self, val): def fset(self, val):
@ -97,6 +102,7 @@ class LineEdit(QLineEdit):
def same_as(self, other): def same_as(self, other):
return self.current_val == other.current_val return self.current_val == other.current_val
class LanguagesEdit(LE): class LanguagesEdit(LE):
changed = pyqtSignal() changed = pyqtSignal()
@ -359,7 +365,7 @@ class CompareSingle(QWidget):
def __init__( def __init__(
self, field_metadata, parent=None, revert_tooltip=None, self, field_metadata, parent=None, revert_tooltip=None,
datetime_fmt='MMMM yyyy', blank_as_equal=True, datetime_fmt='MMMM yyyy', blank_as_equal=True,
fields=('title', 'authors', 'series', 'tags', 'rating', 'publisher', 'pubdate', 'identifiers', 'languages', 'comments', 'cover')): fields=('title', 'authors', 'series', 'tags', 'rating', 'publisher', 'pubdate', 'identifiers', 'languages', 'comments', 'cover'), db=None):
QWidget.__init__(self, parent) QWidget.__init__(self, parent)
self.l = l = QGridLayout() self.l = l = QGridLayout()
l.setContentsMargins(0, 0, 0, 0) l.setContentsMargins(0, 0, 0, 0)
@ -399,6 +405,11 @@ class CompareSingle(QWidget):
continue continue
neww = cls(field, True, self, m, extra) neww = cls(field, True, self, m, extra)
neww.changed.connect(partial(self.changed, field)) neww.changed.connect(partial(self.changed, field))
if isinstance(neww, EditWithComplete):
try:
neww.update_items_cache(db.new_api.all_field_names(field))
except ValueError:
pass # A one-one field like title
oldw = cls(field, False, self, m, extra) oldw = cls(field, False, self, m, extra)
newl = QLabel('&%s:' % m['name']) newl = QLabel('&%s:' % m['name'])
newl.setBuddy(neww) newl.setBuddy(neww)
@ -626,7 +637,7 @@ if __name__ == '__main__':
ids = tuple(zip(ids[0::2], ids[1::2])) ids = tuple(zip(ids[0::2], ids[1::2]))
gm = partial(db.get_metadata, index_is_id=True, get_cover=True, cover_as_data=True) gm = partial(db.get_metadata, index_is_id=True, get_cover=True, cover_as_data=True)
get_metadata = lambda x:map(gm, ids[x]) get_metadata = lambda x:map(gm, ids[x])
d = CompareMany(list(xrange(len(ids))), get_metadata, db.field_metadata) d = CompareMany(list(xrange(len(ids))), get_metadata, db.field_metadata, db=db)
if d.exec_() == d.Accepted: if d.exec_() == d.Accepted:
for changed, mi in d.accepted.itervalues(): for changed, mi in d.accepted.itervalues():
if changed and mi is not None: if changed and mi is not None: