Merge from trunk

resources/recipes/hbr.recipe

@@ -33,9 +33,9 @@ class HBR(BasicNewsRecipe):
     def get_browser(self):
         br = BasicNewsRecipe.get_browser(self)
         br.open(self.LOGIN_URL)
-        br.select_form(name='signInForm')
+        br.select_form(name='signin-form')
-        br['signInForm:username'] = self.username
+        br['signin-form:username'] = self.username
-        br['signInForm:password'] = self.password
+        br['signin-form:password'] = self.password
         raw = br.submit().read()
         if 'My Account' not in raw:
             raise Exception('Failed to login, are you sure your username and password are correct?')

src/calibre/devices/kobo/driver.py

@@ -424,7 +424,7 @@ class KOBO(USBMS):
                 paths[source_id] = os.path.join(prefix, *(path.split('/')))
         return paths
 
-    def update_device_database_collections(self, booklists, collections_attributes):
+    def update_device_database_collections(self, booklists, collections_attributes, oncard):
 #        debug_print('Starting update_device_database_collections', collections_attributes)
 
         # Force collections_attributes to be 'tags' as no other is currently supported
@@ -433,14 +433,20 @@ class KOBO(USBMS):
 
         collections = booklists.get_collections(collections_attributes)
 #        debug_print('Collections', collections)
-        for category, books in collections.items():
+
-            if category == 'Im_Reading':
         # Create a connection to the sqlite database
+        # Needs to be outside books collection as in the case of removing
+        # the last book from the collection the list of books is empty
+        # and the removal of the last book would not occur
         connection = sqlite.connect(self._main_prefix + '.kobo/KoboReader.sqlite')
         cursor = connection.cursor()
 
         # Reset Im_Reading list in the database
-                query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null'
+        if oncard == 'carda':
+            query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID like \'file:///mnt/sd/%\''
+        elif oncard != 'carda' and oncard != 'cardb':
+            query= 'update content set ReadStatus=0, FirstTimeReading = \'true\' where BookID is Null and ContentID not like \'file:///mnt/sd/%\''
+                    
         try:
             cursor.execute (query)
         except:
@@ -450,6 +456,8 @@ class KOBO(USBMS):
 #           debug_print('Commit: Reset Im_Reading list')
             connection.commit()
 
+        for category, books in collections.items():
+            if category == 'Im_Reading':
                 for book in books:
 #                    debug_print('Title:', book.title, 'lpath:', book.path)
                     book.device_collections = ['Im_Reading']
@@ -494,12 +502,16 @@ class KOBO(USBMS):
 
         #debug_print('KOBO: collection fields:', collections)
         for i, blist in blists.items():
-                self.update_device_database_collections(blist, collections)
+            if i == 0:
+                oncard = 'main'
+            else:
+                oncard = 'carda'
+            self.update_device_database_collections(blist, collections, oncard)
 
         USBMS.sync_booklists(self, booklists, end_session=end_session)
         #debug_print('KOBO: finished sync_booklists')
 
     def rebuild_collections(self, booklist, oncard):
         collections_attributes = []
-        self.update_device_database_collections(booklist, collections_attributes)
+        self.update_device_database_collections(booklist, collections_attributes, oncard)
 

src/calibre/ebooks/conversion/preprocess.py

@@ -216,8 +216,8 @@ class HTMLPreProcessor(object):
                   (re.compile(u'¸\s*(<br.*?>)*\s*C', re.UNICODE), lambda match: u'Ç'),
 
                   # ˛
-                  (re.compile(u'˛\s*(<br.*?>)*\s*a', re.UNICODE), lambda match: u'ą'),
+                  (re.compile(u'\s*˛\s*(<br.*?>)*\s*a', re.UNICODE), lambda match: u'ą'),
-                  (re.compile(u'˛\s*(<br.*?>)*\s*A', re.UNICODE), lambda match: u'Ą'),
+                  (re.compile(u'\s*˛\s*(<br.*?>)*\s*A', re.UNICODE), lambda match: u'Ą'),
                   (re.compile(u'˛\s*(<br.*?>)*\s*e', re.UNICODE), lambda match: u'ę'),
                   (re.compile(u'˛\s*(<br.*?>)*\s*E', re.UNICODE), lambda match: u'Ę'),
 

src/calibre/gui2/dialogs/metadata_single.py

@@ -751,20 +751,22 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
         try:
             if self.formats_changed:
                 self.sync_formats()
-            title = unicode(self.title.text())
+            title = unicode(self.title.text()).strip()
             self.db.set_title(self.id, title, notify=False)
-            au = unicode(self.authors.text())
+            au = unicode(self.authors.text()).strip()
             if au:
                 self.db.set_authors(self.id, string_to_authors(au), notify=False)
-            aus = unicode(self.author_sort.text())
+            aus = unicode(self.author_sort.text()).strip()
             if aus:
                 self.db.set_author_sort(self.id, aus, notify=False, commit=False)
             self.db.set_isbn(self.id,
-                             re.sub(r'[^0-9a-zA-Z]', '', unicode(self.isbn.text())),
+                             re.sub(r'[^0-9a-zA-Z]', '',
+                                 unicode(self.isbn.text()).strip()),
                              notify=False, commit=False)
             self.db.set_rating(self.id, 2*self.rating.value(), notify=False,
                                commit=False)
-            self.db.set_publisher(self.id, unicode(self.publisher.currentText()),
+            self.db.set_publisher(self.id,
+                    unicode(self.publisher.currentText()).strip(),
                                   notify=False, commit=False)
             self.db.set_tags(self.id, [x.strip() for x in
                 unicode(self.tags.text()).split(',')], notify=False, commit=False)
@@ -773,7 +775,8 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                     commit=False)
             self.db.set_series_index(self.id, self.series_index.value(),
                                      notify=False, commit=False)
-            self.db.set_comment(self.id, unicode(self.comments.toPlainText()),
+            self.db.set_comment(self.id,
+                    unicode(self.comments.toPlainText()).strip(),
                                 notify=False, commit=False)
             d = self.pubdate.date()
             d = qt_to_dt(d)

src/calibre/manual/faq.rst

@@ -81,7 +81,7 @@ Device Integration
 
 What devices does |app| support?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-At the moment |app| has full support for the SONY PRS 300/500/505/600/700/900, Barnes & Noble Nook, Cybook Gen 3/Opus, Amazon Kindle 1/2/3/DX/DXG, Entourage Edge, Longshine ShineBook, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Foxit eSlick, PocketBook 360, Italica, eClicto, Iriver Story, Airis dBook, Hanvon N515, Binatone Readme, Teclast K3, SpringDesign Alex, Kobo Reader, various Android phones and the iPhone/iPad. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
+At the moment |app| has full support for the SONY PRS line, Barnes & Noble Nook, Cybook Gen 3/Opus, Amazon Kindle line, Entourage Edge, Longshine ShineBook, Ectaco Jetbook, BeBook/BeBook Mini, Irex Illiad/DR1000, Foxit eSlick, PocketBook 360, Italica, eClicto, Iriver Story, Airis dBook, Hanvon N515, Binatone Readme, Teclast K3, SpringDesign Alex, Kobo Reader, various Android phones and the iPhone/iPad. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
 
 How can I help get my device supported in |app|?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~