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

Merge branch 'master' of https://github.com/davidfor/calibre into master

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-25 16:26:44 +05:30
commit 7e19788078
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/kobo/bookmark.py
View File

@ -7,7 +7,6 @@ __docformat__ = 'restructuredtext en'
import os import os
from polyglot.builtins import unicode_type
from calibre.devices.usbms.driver import debug_print from calibre.devices.usbms.driver import debug_print
@ -164,15 +163,15 @@ class Bookmark(): # {{{
# TL self.book_length = int(unpack('>I', record0[0x04:0x08])[0]) # TL self.book_length = int(unpack('>I', record0[0x04:0x08])[0])
pass pass
def __unicode__(self): def __str__(self):
''' '''
A string representation of this object, suitable for printing to A string representation of this object, suitable for printing to
console console
''' '''
ans = [u"Kobo bookmark:"] ans = ["Kobo bookmark:"]
def fmt(x, y): def fmt(x, y):
ans.append(u'%-20s: %s'%(unicode_type(x), unicode_type(y))) ans.append('%-20s: %s'%(str(x), str(y)))
if self.contentId: if self.contentId:
fmt('ContentID', self.contentId) fmt('ContentID', self.contentId)
@ -185,10 +184,9 @@ class Bookmark(): # {{{
if self.user_notes: if self.user_notes:
fmt('User Notes', self.user_notes) fmt('User Notes', self.user_notes)
ans = u'\n'.join(ans) + u"\n" ans = '\n'.join(ans) + "\n"
return ans return ans
__str__ = __unicode__
# }}} # }}}

22
src/calibre/devices/kobo/books.py
View File

@ -14,7 +14,6 @@ from calibre.devices.usbms.books import Book as Book_, CollectionsBookList, none
from calibre.utils.config_base import prefs from calibre.utils.config_base import prefs
from calibre.devices.usbms.driver import debug_print from calibre.devices.usbms.driver import debug_print
from calibre.ebooks.metadata import author_to_author_sort from calibre.ebooks.metadata import author_to_author_sort
from polyglot.builtins import unicode_type, iteritems, itervalues
class Book(Book_): class Book(Book_):
@ -93,15 +92,15 @@ class Book(Book_):
def is_purchased_kepub(self): def is_purchased_kepub(self):
return self.contentID and not self.contentID.startswith("file") return self.contentID and not self.contentID.startswith("file")
def __unicode__(self): def __str__(self):
''' '''
A string representation of this object, suitable for printing to A string representation of this object, suitable for printing to
console console
''' '''
ans = [u"Kobo metadata:"] ans = ["Kobo metadata:"]
def fmt(x, y): def fmt(x, y):
ans.append(u'%-20s: %s'%(unicode_type(x), unicode_type(y))) ans.append('%-20s: %s'%(str(x), str(y)))
if self.contentID: if self.contentID:
fmt('Content ID', self.contentID) fmt('Content ID', self.contentID)
@ -114,11 +113,12 @@ class Book(Book_):
if self.mime: if self.mime:
fmt('MimeType', self.mime) fmt('MimeType', self.mime)
ans = u'\n'.join(ans) + u"\n" + self.kobo_metadata.__unicode__() ans.append(str(self.kobo_metadata))
return super(Book,self).__unicode__() + u"\n" + ans ans = '\n'.join(ans)
return super(Book,self).__str__() + "\n" + ans
__str__ = __unicode__
class ImageWrapper(object): class ImageWrapper(object):
@ -227,7 +227,7 @@ class KTCollectionsBookList(CollectionsBookList):
elif fm is not None and fm['datatype'] == 'series': elif fm is not None and fm['datatype'] == 'series':
val = [orig_val] val = [orig_val]
elif fm is not None and fm['datatype'] == 'rating': elif fm is not None and fm['datatype'] == 'rating':
val = [unicode_type(orig_val / 2.0)] val = [str(orig_val / 2.0)]
elif fm is not None and fm['datatype'] == 'text' and fm['is_multiple']: elif fm is not None and fm['datatype'] == 'text' and fm['is_multiple']:
if isinstance(orig_val, (list, tuple)): if isinstance(orig_val, (list, tuple)):
val = orig_val val = orig_val
@ -272,7 +272,7 @@ class KTCollectionsBookList(CollectionsBookList):
if not category: if not category:
continue continue
cat_name = unicode_type(category).strip(' ,') cat_name = str(category).strip(' ,')
if cat_name not in collections: if cat_name not in collections:
collections[cat_name] = {} collections[cat_name] = {}
@ -296,8 +296,8 @@ class KTCollectionsBookList(CollectionsBookList):
# Sort collections # Sort collections
result = {} result = {}
for category, lpaths in iteritems(collections): for category, lpaths in collections.items():
books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp)) books = sorted(lpaths.values(), key=cmp_to_key(none_cmp))
result[category] = [x[0] for x in books] result[category] = [x[0] for x in books]
# debug_print("KTCollectionsBookList:get_collections - result=", result.keys()) # debug_print("KTCollectionsBookList:get_collections - result=", result.keys())
debug_print("KTCollectionsBookList:get_collections - end") debug_print("KTCollectionsBookList:get_collections - end")