From 126e9971e55abb29a4276c0eb268dbcd44d017f8 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 12 Nov 2019 21:36:16 +1100 Subject: [PATCH] Fix for https://bugs.launchpad.net/calibre/+bug/1830101 Had wrong database version for addition of ISBN column. Also missed Libra H2O in the names of supported devices. --- src/calibre/devices/kobo/driver.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 10135eaeab..74ca564fb7 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -1345,7 +1345,7 @@ class KOBOTOUCH(KOBO): description = _( 'Communicate with the Kobo Touch, Glo, Mini, Aura HD,' ' 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 # icon = I('devices/kobotouch.jpg') @@ -1852,9 +1852,13 @@ class KOBOTOUCH(KOBO): else: columns += ', -1 as ___ExpirationStatus, -1 as FavouritesIndex, -1 as Accessibility' if self.dbversion >= 33: - columns += ', Language, IsDownloaded, ISBN' + columns += ', Language, IsDownloaded' 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(): columns += ", Series, SeriesNumber, ___UserID, ExternalId, Subtitle" else: