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

0.8.67+ (KG reverts usb lib), GwR catalog wip, Apple driver changes

Browse Source
This commit is contained in:
GRiker 2012-09-02 08:36:18 -06:00
parent 2fa201501f
commit 1cd7b53bb2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/apple/driver.py
View File

@ -1645,9 +1645,9 @@ class ITUNES(DriverBase):
asl = [i.author_sort for i in booklist] asl = [i.author_sort for i in booklist]
las = max(asl, key=len) las = max(asl, key=len)
if isosx: 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)) 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)) str(book.library_id)[-9:], book.uuid))
#logger().info("%s%-40.40s %-30.30s %-10.10s %s" % #logger().info("%s%-40.40s %-30.30s %-10.10s %s" %
# (' '*indent,book.title, book.author, str(book.library_id)[-9:], book.uuid)) # (' '*indent,book.title, book.author, str(book.library_id)[-9:], book.uuid))

3
src/calibre/gui2/catalog/catalog_epub_mobi.py
View File

@ -172,6 +172,9 @@ class PluginWidget(QWidget,Ui_Form):
if hit: if hit:
excluded_tags.append(hit.string) excluded_tags.append(hit.string)
if excluded_tags: if excluded_tags:
if set(excluded_tags) == set(self.all_tags):
results = _("All genres will be excluded")
else:
results = ', '.join(sorted(excluded_tags)) results = ', '.join(sorted(excluded_tags))
finally: finally:
if self.DEBUG: if self.DEBUG:

2
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -883,7 +883,7 @@ class CatalogBuilder(object):
self.update_progress_full_step(_("Sorting database")) 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) 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] authors = [(record['author'], record['author_sort']) for record in self.books_by_author]