diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 8b05fb5b8f..aa17602942 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -1645,9 +1645,9 @@ class ITUNES(DriverBase): asl = [i.author_sort for i in booklist] las = max(asl, key=len) if isosx: - fs = '{!s}{:<%d} {:<%d} {:<%d} {:<10} {!s}' % (' ' * indent, len(lt), + fs = '{!s}{:<%d} {:<%d} {:<%d} {:<10} {!s}' % (len(lt), len(la), len(las)) - logger.info(fs.format(book.title, book.author, book.author_sort, + logger().info(fs.format(book.title, book.author, book.author_sort, str(book.library_id)[-9:], book.uuid)) #logger().info("%s%-40.40s %-30.30s %-10.10s %s" % # (' '*indent,book.title, book.author, str(book.library_id)[-9:], book.uuid)) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 4dc42b73bd..84c46e2b36 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -172,7 +172,10 @@ class PluginWidget(QWidget,Ui_Form): if hit: excluded_tags.append(hit.string) if excluded_tags: - results = ', '.join(sorted(excluded_tags)) + if set(excluded_tags) == set(self.all_tags): + results = _("All genres will be excluded") + else: + results = ', '.join(sorted(excluded_tags)) finally: if self.DEBUG: print(results) diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 8c60686ffe..8b4d241748 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -883,7 +883,7 @@ class CatalogBuilder(object): self.update_progress_full_step(_("Sorting database")) - # First pass: Sort by author, test for author_sort mismatches + # Test for author_sort mismatches self.books_by_author = sorted(list(self.books_by_title), key=self._kf_books_by_author_sorter_author) authors = [(record['author'], record['author_sort']) for record in self.books_by_author]