Merge from trunk

src/calibre/customize/builtins.py

@@ -474,10 +474,10 @@ 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, 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
+        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
 
@@ -579,7 +579,7 @@ plugins += [
     ELONEX,
     TECLAST_K3,
     NEWSMY,
-    PICO,
+    PICO, SUNSTECH_EB700,
     IPAPYRUS,
     SOVOS,
     EDGE,
@@ -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 \

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'
+

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)

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 SUNSTECH_EB700(TECLAST_K3):
+    name = 'Sunstech EB700 device interface'
+    gui_name = 'EB700'
+    description    = _('Communicate with the Sunstech EB700 reader.')
+
+    FORMATS = ['epub', 'fb2', 'pdf', 'pdb', 'txt']
+
+    VENDOR_NAME = 'SUNEB700'
+    WINDOWS_MAIN_MEM = 'USB-MSC'
+

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()
 
 # }}}