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: Allow merging downloaded and current identifiers by long-clicking the revert button. Fixes #1387619 [[Enhancement] Merge “Identifiers” list in “Review downloaded metadata” dialog](https://bugs.launchpad.net/calibre/+bug/1387619)

Browse Source
This commit is contained in:
Kovid Goyal 2014-10-30 20:53:35 +05:30
parent 5f0cc490e2
commit 12e943ee73
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ from PyQt5.Qt import (
QDialog, QWidget, QGridLayout, QLineEdit, QLabel, QToolButton, QIcon, QDialog, QWidget, QGridLayout, QLineEdit, 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) QKeySequence, QAction, QMenu)
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
@ -199,14 +199,21 @@ class SeriesEdit(LineEdit):
class IdentifiersEdit(LineEdit): class IdentifiersEdit(LineEdit):
def from_mi(self, mi): def from_mi(self, mi):
val = ('%s:%s' % (k, v) for k, v in mi.identifiers.iteritems()) self.as_dict = mi.identifiers
self.setText(', '.join(val))
self.setCursorPosition(0)
def to_mi(self, mi): def to_mi(self, mi):
parts = (x.strip() for x in self.current_val.split(',') if x.strip()) mi.set_identifiers(self.as_dict)
val = {x.partition(':')[0].strip():x.partition(':')[-1].strip() for x in parts}
mi.set_identifiers({k:v for k, v in val.iteritems() if k and v}) @dynamic_property
def as_dict(self):
def fget(self):
parts = (x.strip() for x in self.current_val.split(',') if x.strip())
return {k:v for k, v in {x.partition(':')[0].strip():x.partition(':')[-1].strip() for x in parts}.iteritems() if k and v}
def fset(self, val):
val = ('%s:%s' % (k, v) for k, v in val.iteritems())
self.setText(', '.join(val))
self.setCursorPosition(0)
return property(fget=fget, fset=fset)
class CommentsEdit(Editor): class CommentsEdit(Editor):
@ -389,6 +396,15 @@ class CompareSingle(QWidget):
button.setIcon(QIcon(I('back.png'))) button.setIcon(QIcon(I('back.png')))
button.clicked.connect(partial(self.revert, field)) button.clicked.connect(partial(self.revert, field))
button.setToolTip(revert_tooltip % m['name']) button.setToolTip(revert_tooltip % m['name'])
if field == 'identifiers':
button.m = m = QMenu(button)
button.setMenu(m)
button.setPopupMode(QToolButton.DelayedPopup)
m.addAction(button.toolTip()).triggered.connect(button.click)
m.actions()[0].setIcon(button.icon())
m.addAction(_('Merge identifiers')).triggered.connect(self.merge_identifiers)
m.actions()[1].setIcon(QIcon(I('merge.png')))
self.widgets[field] = Widgets(neww, oldw, newl, button) self.widgets[field] = Widgets(neww, oldw, newl, button)
for i, w in enumerate((newl, neww, button, oldw)): for i, w in enumerate((newl, neww, button, oldw)):
c = i if i < 2 else i + 1 c = i if i < 2 else i + 1
@ -424,6 +440,13 @@ class CompareSingle(QWidget):
neww, oldw = widgets[:2] neww, oldw = widgets[:2]
neww.current_val = oldw.current_val neww.current_val = oldw.current_val
def merge_identifiers(self):
widgets = self.widgets['identifiers']
neww, oldw = widgets[:2]
val = neww.as_dict
val.update(oldw.as_dict)
neww.as_dict = val
def __call__(self, oldmi, newmi): def __call__(self, oldmi, newmi):
self.current_mi = newmi self.current_mi = newmi
self.initial_vals = {} self.initial_vals = {}