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

Browse Source
This commit is contained in:
Kovid Goyal 2019-11-12 16:08:39 +05:30
commit 3d6a566bf5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,7 +1345,7 @@ class KOBOTOUCH(KOBO):
description = _( description = _(
'Communicate with the Kobo Touch, Glo, Mini, Aura HD,' 'Communicate with the Kobo Touch, Glo, Mini, Aura HD,'
' Aura H2O, Glo HD, Touch 2, Aura ONE, Aura Edition 2,' ' Aura H2O, Glo HD, Touch 2, Aura ONE, Aura Edition 2,'
' Aura H2O Edition 2, Clara HD and Forma eReaders.' ' Aura H2O Edition 2, Clara HD, Forma and Libra H2O eReaders.'
' Based on the existing Kobo driver by %s.') % KOBO.author ' Based on the existing Kobo driver by %s.') % KOBO.author
# icon = I('devices/kobotouch.jpg') # icon = I('devices/kobotouch.jpg')
@ -1852,9 +1852,13 @@ class KOBOTOUCH(KOBO):
else: else:
columns += ', -1 as ___ExpirationStatus, -1 as FavouritesIndex, -1 as Accessibility' columns += ', -1 as ___ExpirationStatus, -1 as FavouritesIndex, -1 as Accessibility'
if self.dbversion >= 33: if self.dbversion >= 33:
columns += ', Language, IsDownloaded, ISBN' columns += ', Language, IsDownloaded'
else: else:
columns += ', NULL AS Language, "1" AS IsDownloaded, NULL AS ISBN' columns += ', NULL AS Language, "1" AS IsDownloaded'
if self.dbversion >= 46:
columns += ', ISBN'
else:
columns += ', NULL AS ISBN'
if self.supports_series(): if self.supports_series():
columns += ", Series, SeriesNumber, ___UserID, ExternalId, Subtitle" columns += ", Series, SeriesNumber, ___UserID, ExternalId, Subtitle"
else: else: