...

src/calibre/db/cache.py

@@ -363,21 +363,31 @@ class Cache(object):
         all_book_ids = frozenset(self._all_book_ids())
         get_metadata = partial(self._get_metadata, get_user_categories=False)
 
-        book_lists = tuple(self.field[field].sort_books(get_metadata, all_book_ids,
+        sort_keys = tuple(self.fields[field[0]].sort_keys_for_books(get_metadata,
-            ascending=ascending) for field, ascending in fields)
+            all_book_ids) for field in fields)
-        if len(book_lists) == 1:
+
-            return book_lists[0]
+        if len(sort_keys) == 1:
+            sk = sort_keys[0]
+            return sorted(all_book_ids, key=lambda i:sk[i], reverse=not
+                    fields[1])
         else:
-            book_maps = tuple({id_:idx for idx, id_ in enumerate(x)} for x in
+            return sorted(all_book_ids, key=partial(SortKey, fields, sort_keys))
-                            book_lists)
-
-            def sort_key(book_id):
-                return tuple(d.get(book_id, -1) for d in book_maps)
-
-            return sorted(all_book_ids, key=sort_key)
 
     # }}}
 
+class SortKey(object):
+
+    def __init__(self, fields, sort_keys, book_id):
+        self.orders = tuple(1 if f[1] else -1 for f in fields)
+        self.sort_key = tuple(sk[book_id] for sk in sort_keys)
+
+    def __cmp__(self, other):
+        for i, order in enumerate(self.orders):
+            ans = cmp(self.sort_key[i], other.sort_key[i])
+            if ans != 0:
+                return ans * order
+
+
 # Testing {{{
 
 def test(library_path):

src/calibre/db/fields.py

@@ -55,18 +55,15 @@ class Field(object):
         '''
         raise NotImplementedError()
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
         '''
-        Sort books by this field. Returns a sorted list of book_ids
+        Return a mapping of book_id -> sort_key. The sort key is suitable for
-
+        use in sorting the list of all books by this field, via the python cmp
-        :param _get_metadata: A callable which when called with the book_id
+        method.
-        returns the Metadata object for that book. Needed for sorting composite
-        columns.
-
-        :param all_book_ids: The set of ids for all books.
         '''
         raise NotImplementedError()
 
+
 class OneToOneField(Field):
 
     def for_book(self, book_id, default_value=None):
@@ -84,9 +81,9 @@ class OneToOneField(Field):
     def iter_book_ids(self):
         return self.table.book_col_map.iterkeys()
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
-        return sorted(self.iter_book_ids(), reverse=not ascending,
+        return {id_ : self._sort_key(self.book_col_map.get(id_, '')) for id_ in
-            key=lambda i: self._sort_key(self.book_col_map[i]))
+                all_book_ids}
 
 class CompositeField(OneToOneField):
 
@@ -121,10 +118,10 @@ class CompositeField(OneToOneField):
             ans = mi.get(self.metadata['label'])
         return ans
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
-        return sorted(all_book_ids, reverse=not ascending,
+        return {id_ : sort_key(self.get_value_with_cache(id_, get_metadata)) for id_ in
-                key=lambda i: sort_key(self.get_value_with_cache(i,
+                all_book_ids}
-                    get_metadata)))
+
 
 class OnDeviceField(OneToOneField):
 
@@ -160,9 +157,9 @@ class OnDeviceField(OneToOneField):
     def iter_book_ids(self):
         return iter(())
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
-        return sorted(all_book_ids, reverse=not ascending,
+        return {id_ : self.for_book(id_) for id_ in
-                key=self.for_book)
+                all_book_ids}
 
 class ManyToOneField(Field):
 
@@ -186,14 +183,11 @@ class ManyToOneField(Field):
     def __iter__(self):
         return self.table.id_map.iterkeys()
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
-        ids = sorted(self.id_map,
+        keys = {id_ : self._sort_key(self.id_map.get(id_, '')) for id_ in
-                key=lambda i:self._sort_key(self.id_map[i]))
+                all_book_ids}
-        sm = {id_ : idx for idx, id_ in enumerate(ids)}
+        return {id_ : keys.get(
-        return sorted(all_book_ids, reverse=not ascending,
+            self.book_col_map.get(id_, None), '') for id_ in all_book_ids}
-                key=lambda book_id : sm.get(
-                    self.book_col_map.get(book_id, None),
-                    -1))
 
 class ManyToManyField(Field):
 
@@ -218,19 +212,18 @@ class ManyToManyField(Field):
     def __iter__(self):
         return self.table.id_map.iterkeys()
 
-    def sort_books(self, get_metadata, all_book_ids, ascending=True):
+    def sort_keys_for_books(self, get_metadata, all_book_ids):
-        ids = sorted(self.id_map,
+        keys = {id_ : self._sort_key(self.id_map.get(id_, '')) for id_ in
-                key=lambda i:self._sort_key(self.id_map[i]))
+                all_book_ids}
-        sm = {id_ : idx for idx, id_ in enumerate(ids)}
 
         def sort_key_for_book(book_id):
             item_ids = self.table.book_col_map.get(book_id, ())
             if self.alphabetical_sort:
-                item_ids = sorted(item_ids, key=sm.get)
+                item_ids = sorted(item_ids, key=keys.get)
-            return tuple(map(sm.get, item_ids))
+            return tuple(map(keys.get, item_ids))
+
+        return {id_ : sort_key_for_book(id_) for id_ in all_book_ids}
 
-        return sorted(all_book_ids, reverse=not ascending,
-                key=sort_key_for_book)
 
 class AuthorsField(ManyToManyField):