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

Edit metadata individually: Ensure Next/Previous buttons work even if something re-orders the books in the book list. They will now iterate over the books as they were at the time the dialog is created. Fixes #2115111 [While editing a filtered list, clicking "next" (Edit metadata) can cause several records to be missed](https://bugs.launchpad.net/calibre/+bug/2115111)

Browse Source
This commit is contained in:
Kovid Goyal 2025-06-22 13:57:35 +05:30
parent 38628e4c97
commit 07b5c98fd0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/metadata/single.py
View File

@ -469,7 +469,7 @@ class MetadataSingleDialogBase(QDialog):
self.setWindowTitle(BASE_TITLE + ' - ' + self.setWindowTitle(BASE_TITLE + ' - ' +
title + ' -' + title + ' -' +
_(' [%(num)d of %(tot)d]')%dict(num=self.current_row+1, _(' [%(num)d of %(tot)d]')%dict(num=self.current_row+1,
tot=len(self.row_list))) tot=len(self.id_list)))
def swap_title_author(self, *args): def swap_title_author(self, *args):
title = self.title.current_val title = self.title.current_val
@ -690,8 +690,8 @@ class MetadataSingleDialogBase(QDialog):
self.save_state() self.save_state()
if not self.apply_changes(): if not self.apply_changes():
return return
if self.editing_multiple and self.current_row != len(self.row_list) - 1: if self.editing_multiple and self.current_row != len(self.id_list) - 1:
num = len(self.row_list) - 1 - self.current_row num = len(self.id_list) - 1 - self.current_row
from calibre.gui2 import question_dialog from calibre.gui2 import question_dialog
pm = ngettext('There is another book to edit in this set.', pm = ngettext('There is another book to edit in this set.',
'There are still {} more books to edit in this set.', num).format(num) 'There are still {} more books to edit in this set.', num).format(num)
@ -725,7 +725,7 @@ class MetadataSingleDialogBase(QDialog):
# Dialog use methods {{{ # Dialog use methods {{{
def start(self, row_list, current_row, view_slot=None, edit_slot=None, def start(self, row_list, current_row, view_slot=None, edit_slot=None,
set_current_callback=None): set_current_callback=None):
self.row_list = row_list self.id_list = list(map(self.db.id, row_list))
self.current_row = current_row self.current_row = current_row
if view_slot is not None: if view_slot is not None:
self.view_format.connect(view_slot) self.view_format.connect(view_slot)
@ -772,9 +772,9 @@ class MetadataSingleDialogBase(QDialog):
self.update_window_title() self.update_window_title()
prev = next_ = None prev = next_ = None
if self.current_row > 0: if self.current_row > 0:
prev = self.db.title(self.row_list[self.current_row-1]) prev = self.db.new_api.field_for('title', self.id_list[self.current_row-1])
if self.current_row < len(self.row_list) - 1: if self.current_row < len(self.id_list) - 1:
next_ = self.db.title(self.row_list[self.current_row+1]) next_ = self.db.new_api.field_for('title', self.id_list[self.current_row+1])
if next_ is not None: if next_ is not None:
tip = _('Save changes and edit the metadata of {0} [{1}]').format( tip = _('Save changes and edit the metadata of {0} [{1}]').format(
@ -788,7 +788,7 @@ class MetadataSingleDialogBase(QDialog):
self.prev_button.setEnabled(prev is not None) self.prev_button.setEnabled(prev is not None)
self.button_box.button(QDialogButtonBox.StandardButton.Ok).setDefault(True) self.button_box.button(QDialogButtonBox.StandardButton.Ok).setDefault(True)
self.button_box.button(QDialogButtonBox.StandardButton.Ok).setFocus(Qt.FocusReason.OtherFocusReason) self.button_box.button(QDialogButtonBox.StandardButton.Ok).setFocus(Qt.FocusReason.OtherFocusReason)
self(self.db.id(self.row_list[self.current_row])) self(self.id_list[self.current_row])
for w, state in iteritems(self.comments_edit_state_at_apply): for w, state in iteritems(self.comments_edit_state_at_apply):
if state == 'code': if state == 'code':
w.tab = 'code' w.tab = 'code'