From 2ace9fb854d6814dfc650595c23d0b5410768649 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Dec 2010 09:45:18 -0700 Subject: [PATCH 1/5] Fix #8005 (Device Support: AluraTek Colour eReader) --- src/calibre/customize/builtins.py | 3 ++- src/calibre/devices/misc.py | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 793c1fa0de..40b78f3d14 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -477,7 +477,7 @@ from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \ SOVOS, PICO from calibre.devices.sne.driver import SNE from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \ - GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD + GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR from calibre.devices.folder_device.driver import FOLDER_DEVICE_FOR_CONFIG from calibre.devices.kobo.driver import KOBO @@ -600,6 +600,7 @@ plugins += [ VELOCITYMICRO, PDNOVEL_KOBO, LUMIREAD, + ALURATEK_COLOR, ITUNES, ] plugins += [x for x in list(locals().values()) if isinstance(x, type) and \ diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py index 52952356f8..1989fb7c61 100644 --- a/src/calibre/devices/misc.py +++ b/src/calibre/devices/misc.py @@ -204,3 +204,23 @@ class LUMIREAD(USBMS): with open(cfilepath+'.jpg', 'wb') as f: f.write(metadata.thumbnail[-1]) +class ALURATEK_COLOR(USBMS): + + name = 'Aluratek Color Device Interface' + gui_name = 'Aluratek Color' + description = _('Communicate with the Aluratek Color') + author = 'Kovid Goyal' + supported_platforms = ['windows', 'osx', 'linux'] + + # Ordered list of supported formats + FORMATS = ['epub', 'fb2', 'txt', 'pdf'] + + VENDOR_ID = [0x1f3a] + PRODUCT_ID = [0x1000] + BCD = [0x0002] + + EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'books' + + VENDOR_NAME = 'USB_2.0' + WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'USB_FLASH_DRIVER' + From eb091dcdf1498237b21fbd7a0201e9aeaa752c54 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Dec 2010 09:53:37 -0700 Subject: [PATCH 2/5] Fix #8000 (Sunstech EB700 v2) --- src/calibre/customize/builtins.py | 4 ++-- src/calibre/devices/teclast/driver.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 40b78f3d14..09ea30f993 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -474,7 +474,7 @@ from calibre.devices.binatone.driver import README from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA, THEBOOK from calibre.devices.edge.driver import EDGE from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \ - SOVOS, PICO + SOVOS, PICO, SUNTECH_EB700 from calibre.devices.sne.driver import SNE from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \ GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR @@ -579,7 +579,7 @@ plugins += [ ELONEX, TECLAST_K3, NEWSMY, - PICO, + PICO, SUNTECH_EB700, IPAPYRUS, SOVOS, EDGE, diff --git a/src/calibre/devices/teclast/driver.py b/src/calibre/devices/teclast/driver.py index b9ec554cee..450e068bad 100644 --- a/src/calibre/devices/teclast/driver.py +++ b/src/calibre/devices/teclast/driver.py @@ -72,3 +72,13 @@ class SOVOS(TECLAST_K3): VENDOR_NAME = 'RK28XX' WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'USB-MSC' +class SUNTECH_EB700(TECLAST_K3): + name = 'Suntech EB700 device interface' + gui_name = 'EB700' + description = _('Communicate with the Suntech EB700 reader.') + + FORMATS = ['epub', 'fb2', 'pdf', 'pdb', 'txt'] + + VENDOR_NAME = 'SUNEB700' + WINDOWS_MAIN_MEM = 'USB-MSC' + From a6070c99c3b6a5c1b743008c095d20011fe51996 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Dec 2010 09:54:35 -0700 Subject: [PATCH 3/5] ... --- src/calibre/customize/builtins.py | 4 ++-- src/calibre/devices/teclast/driver.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 09ea30f993..17e22a0c0f 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -474,7 +474,7 @@ from calibre.devices.binatone.driver import README from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA, THEBOOK from calibre.devices.edge.driver import EDGE from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS, \ - SOVOS, PICO, SUNTECH_EB700 + SOVOS, PICO, SUNSTECH_EB700 from calibre.devices.sne.driver import SNE from calibre.devices.misc import PALMPRE, AVANT, SWEEX, PDNOVEL, KOGAN, \ GEMEI, VELOCITYMICRO, PDNOVEL_KOBO, Q600, LUMIREAD, ALURATEK_COLOR @@ -579,7 +579,7 @@ plugins += [ ELONEX, TECLAST_K3, NEWSMY, - PICO, SUNTECH_EB700, + PICO, SUNSTECH_EB700, IPAPYRUS, SOVOS, EDGE, diff --git a/src/calibre/devices/teclast/driver.py b/src/calibre/devices/teclast/driver.py index 450e068bad..f406448ad2 100644 --- a/src/calibre/devices/teclast/driver.py +++ b/src/calibre/devices/teclast/driver.py @@ -72,10 +72,10 @@ class SOVOS(TECLAST_K3): VENDOR_NAME = 'RK28XX' WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'USB-MSC' -class SUNTECH_EB700(TECLAST_K3): - name = 'Suntech EB700 device interface' +class SUNSTECH_EB700(TECLAST_K3): + name = 'Sunstech EB700 device interface' gui_name = 'EB700' - description = _('Communicate with the Suntech EB700 reader.') + description = _('Communicate with the Sunstech EB700 reader.') FORMATS = ['epub', 'fb2', 'pdf', 'pdb', 'txt'] From d4b2938c0726891ec1f9bc1b5eb6bcbe650e105e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Dec 2010 10:43:37 -0700 Subject: [PATCH 4/5] Add a success message after the integrity check --- src/calibre/gui2/actions/choose_library.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py index e789ae62e6..b1f0bd6b0e 100644 --- a/src/calibre/gui2/actions/choose_library.py +++ b/src/calibre/gui2/actions/choose_library.py @@ -138,6 +138,10 @@ class CheckIntegrity(QProgressDialog): 'You should check them manually. This can ' 'happen if you manipulate the files in the ' 'library folder directly.'), det_msg=det_msg, show=True) + else: + info_dialog(self, _('No errors found'), + _('The integrity check completed with no uncorrectable errors found.'), + show=True) self.reset() # }}} From 47cc6f8a259797d6990519edee440056d25b92ad Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Dec 2010 13:12:58 -0700 Subject: [PATCH 5/5] SONY driver: Don't upload thumbnails as the slow down post disconnect processing on older models --- src/calibre/devices/prs505/driver.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py index 44ecd5cfd0..23f59e4737 100644 --- a/src/calibre/devices/prs505/driver.py +++ b/src/calibre/devices/prs505/driver.py @@ -179,6 +179,8 @@ class PRS505(USBMS): self.plugboard_func = pb_func def upload_cover(self, path, filename, metadata, filepath): + return # Disabled as the SONY's don't need this thumbnail anyway and + # older models don't auto delete it if metadata.thumbnail and metadata.thumbnail[-1]: path = path.replace('/', os.sep) is_main = path.startswith(self._main_prefix)