Merge from trunk

src/calibre/devices/kindle/apnx.py

@@ -15,7 +15,29 @@ from calibre.ebooks.pdb.header import PdbHeaderReader
 
 class APNXBuilder(object):
     '''
-    Currently uses the Adobe 1024 byte count equal one page formula.
+    2300 characters of uncompressed text per page. This is
+    not meant to map 1 to 1 to a print book but to be a
+    close enough measure.
+    
+    A test book was chosen and the characters were counted
+    on one page. This number was round to 2240 then 60
+    characters of markup were added to the total giving
+    2300.
+    
+    Uncompressed text length is used because it's easily
+    accessible in MOBI files (part of the header). Also,
+    It's faster to work off of the length then to
+    decompress and parse the actual text.
+    
+    A better but much more resource intensive and slower
+    method to calculate the page length would be to parse
+    the uncompressed text. For each paragraph we would
+    want to find how many lines it would occupy in a paper
+    back book. 70 characters per line and 32 lines per page.
+    So divide the number of characters (minus markup) in
+    each paragraph by 70. If there are less than 70
+    characters in the paragraph then it is 1 line. Then,
+    count every 32 lines and mark that location as a page.
     '''
 
     def write_apnx(self, mobi_file_path, apnx_path):
@@ -63,6 +85,6 @@ class APNXBuilder(object):
 
         while count < text_length:
             pages.append(count)
-            count += 1024
+            count += 2300
 
         return pages

src/calibre/devices/usbms/device.py

@@ -232,16 +232,37 @@ class Device(DeviceConfig, DevicePlugin):
 
         time.sleep(5)
         drives = {}
+        seen = set()
+        prod_pat = re.compile(r'PROD_(.+?)&')
+        dup_prod_id = False
+
+        def check_for_dups(pnp_id):
+            try:
+                match = prod_pat.search(pnp_id)
+                if match is not None:
+                    prodid = match.group(1)
+                    if prodid in seen:
+                        return True
+                    else:
+                        seen.add(prodid)
+            except:
+                pass
+            return False
+
+
         for drive, pnp_id in win_pnp_drives().items():
             if self.windows_match_device(pnp_id, 'WINDOWS_CARD_A_MEM') and \
                     not drives.get('carda', False):
                 drives['carda'] = drive
+                dup_prod_id |= check_for_dups(pnp_id)
             elif self.windows_match_device(pnp_id, 'WINDOWS_CARD_B_MEM') and \
                     not drives.get('cardb', False):
                 drives['cardb'] = drive
+                dup_prod_id |= check_for_dups(pnp_id)
             elif self.windows_match_device(pnp_id, 'WINDOWS_MAIN_MEM') and \
                     not drives.get('main', False):
                 drives['main'] = drive
+                dup_prod_id |= check_for_dups(pnp_id)
 
             if 'main' in drives.keys() and 'carda' in drives.keys() and \
                     'cardb' in drives.keys():
@@ -263,7 +284,8 @@ class Device(DeviceConfig, DevicePlugin):
 
         # Sort drives by their PNP drive numbers if the CARD and MAIN
         # MEM strings are identical
-        if self.WINDOWS_MAIN_MEM in (self.WINDOWS_CARD_A_MEM,
+        if dup_prod_id or \
+                self.WINDOWS_MAIN_MEM in (self.WINDOWS_CARD_A_MEM,
                 self.WINDOWS_CARD_B_MEM) or \
                 self.WINDOWS_CARD_A_MEM == self.WINDOWS_CARD_B_MEM:
             letters = sorted(drives.values(), cmp=drivecmp)