From 0497085c65164edf50000450b302e087653df743 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Mon, 16 Aug 2010 11:18:59 +0100
Subject: [PATCH 1/2] Improve bulk metadata performance when no changes to
 in_multiple columns

---
 src/calibre/gui2/custom_column_widgets.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 96232fe85f..1c72511630 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -407,7 +407,9 @@ class BulkBase(Base):
         if self.process_each_book():
             for book_id in book_ids:
                 val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True)
-                self.db.set_custom(book_id, self.getter(val), num=self.col_id, notify=notify)
+                new_val = self.getter(val)
+                if set(val) != new_val or True:
+                    self.db.set_custom(book_id, new_val, num=self.col_id, notify=notify)
         else:
             val = self.getter()
             val = self.normalize_ui_val(val)
@@ -544,8 +546,9 @@ class BulkText(BulkBase):
                 ans = set(original_value)
                 ans -= set([v.strip() for v in
                             unicode(self.removing_widget.tags_box.text()).split(',')])
-            ans |= set([v.strip() for v in
-                            unicode(self.adding_widget.text()).split(',')])
+            txt = unicode(self.adding_widget.text())
+            if txt:
+                ans |= set([v.strip() for v in txt.split(',')])
             return ans # returning a set instead of a list works, for now at least.
         val = unicode(self.widgets[1].currentText()).strip()
         if not val:

From c917f95c2c723d81946fa417941edc4bf3bde687 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Mon, 16 Aug 2010 11:24:34 +0100
Subject: [PATCH 2/2] Take out debug test.

---
 src/calibre/gui2/custom_column_widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py
index 1c72511630..0b15fcb633 100644
--- a/src/calibre/gui2/custom_column_widgets.py
+++ b/src/calibre/gui2/custom_column_widgets.py
@@ -408,7 +408,7 @@ class BulkBase(Base):
             for book_id in book_ids:
                 val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True)
                 new_val = self.getter(val)
-                if set(val) != new_val or True:
+                if set(val) != new_val:
                     self.db.set_custom(book_id, new_val, num=self.col_id, notify=notify)
         else:
             val = self.getter()