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 renaming bug where multiple items were renamed to the same thing

Browse Source
This commit is contained in:
Charles Haley 2010-06-24 21:26:04 +01:00
parent 716b8a0905
commit 91cd75909e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/gui2/actions.py
View File

@ -839,10 +839,11 @@ class EditMetadataAction(object): # {{{
d = TagListEditor(self, tag_to_match=None, data=result, compare=compare) d = TagListEditor(self, tag_to_match=None, data=result, compare=compare)
d.exec_() d.exec_()
if d.result() == d.Accepted: if d.result() == d.Accepted:
to_rename = d.to_rename # dict of new text to old id to_rename = d.to_rename # dict of new text to old ids
to_delete = d.to_delete # list of ids to_delete = d.to_delete # list of ids
for text in to_rename: for text in to_rename:
model.rename_collection(old_id=to_rename[text], new_name=unicode(text)) for old_id in to_rename[text]:
model.rename_collection(old_id, new_name=unicode(text))
for item in to_delete: for item in to_delete:
model.delete_collection_using_id(item) model.delete_collection_using_id(item)
self.upload_collections(model.db, view=view, oncard=oncard) self.upload_collections(model.db, view=view, oncard=oncard)

5
src/calibre/gui2/dialogs/tag_list_editor.py
View File

@ -73,7 +73,10 @@ class TagListEditor(QDialog, Ui_TagListEditor):
return return
if item.text() != self.item_before_editing.text(): if item.text() != self.item_before_editing.text():
(id,ign) = self.item_before_editing.data(Qt.UserRole).toInt() (id,ign) = self.item_before_editing.data(Qt.UserRole).toInt()
self.to_rename[item.text()] = id if item.text() not in self.to_rename:
self.to_rename[item.text()] = [id]
else:
self.to_rename[item.text()].append(id)
def rename_tag(self): def rename_tag(self):
item = self.available_tags.currentItem() item = self.available_tags.currentItem()

4
src/calibre/gui2/tag_view.py
View File

@ -720,7 +720,9 @@ class TagBrowserMixin(object): # {{{
delete_func = partial(db.delete_custom_item_using_id, label=cc_label) delete_func = partial(db.delete_custom_item_using_id, label=cc_label)
if rename_func: if rename_func:
for text in to_rename: for text in to_rename:
rename_func(old_id=to_rename[text], new_name=unicode(text)) for old_id in to_rename[text]:
print 'rename', old_id, text
rename_func(old_id, new_name=unicode(text))
for item in to_delete: for item in to_delete:
delete_func(item) delete_func(item)