Sync to trunk.

Changelog.yaml

@@ -19,6 +19,45 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.7.56
+  date: 2011-04-17
+
+  new features:
+    - title: "This is primarily a bug fix release that fixes a bug in 0.7.55 that caused calibre to rescan the files on the device every time the device is connected. If you updated to 0.7.55 it is highly recommended you update to 0.7.56"
+
+    - title: "Device driver for Coby Kyros"
+
+    - title: "Remove the quick access to search options from next to the search bar, as we now have a separate search highlights toggle button"
+
+    - title: "MOBI Output: Ensure that MOBI files always have 8KB worth of null bytes at the end of record 0. This appears to be necessary for Amazon to be able to add DRM to calibre generated MOBI files sent to their publishing service."
+
+    - title: "Add a tool to inspect MOBI files. To use: calibre-debug -m file.mobi"
+  
+  bug fixes:
+    - title: "Fixed regression taht caused calibre to rescan files on the device on every reconnect"
+
+    - title: "Fix donate button causing the toolbar to be too large on OS X"
+
+    - title: "MOBI Input: Fix detection of Table of Contents for MOBI files that have a page break between the location designated as the Table of Contents and the actual table of contents."
+      tickets: [763504]
+
+    - title: "Comic Input: Fix handling of some CBZ files that have wrongly encoded non ASCII filenames on windows."
+      tickets: [763280]
+
+    - title: "PML Input: Fix multi-line chapter title causing a spurious page break"
+      tickets: [763238]
+
+    - title: "EPUB Input: Speed up processing of files with very large manifest/spines"
+
+    - title: "Fix regression that broke cover:False searches in 0.7.55"
+
+  improved recipes:
+    - Suedduetsche Zeitung
+    - Irish Times
+    - Big Oven
+    - NSPM
+
+
 - version: 0.7.55
   date: 2011-04-15
 

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.7.55'
+__version__   = '0.7.56'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re, importlib

src/calibre/ebooks/metadata/sources/base.py

@@ -294,8 +294,24 @@ class Source(Plugin):
         Excludes connectives and punctuation.
         '''
         if title:
-            pat = re.compile(r'''[-,:;+!@#$%^&*(){}.`~"'\s\[\]/]''')
-            title = pat.sub(' ', title)
+            title_patterns = [(re.compile(pat, re.IGNORECASE), repl) for pat, repl in
+            [
+                # Remove things like: (2010) (Omnibus) etc.
+                (r'(?i)[({\[](\d{4}|omnibus|anthology|hardcover|paperback|mass\s*market|edition|ed\.)[\])}]', ''),
+                # Remove any strings that contain the substring edition inside
+                # parentheses
+                (r'(?i)[({\[].*?(edition|ed.).*?[\]})]', ''),
+                # Remove commas used a separators in numbers
+                (r'(\d+),(\d+)', r'\1\2'),
+                # Remove hyphens only if they have whitespace before them
+                (r'(\s-)', ' '),
+                # Remove single quotes
+                (r"'", ''),
+                # Replace other special chars with a space
+                (r'''[:,;+!@#$%^&*(){}.`~"\s\[\]/]''', ' ')
+            ]]
+            for pat, repl in title_patterns:
+                title = pat.sub(repl, title)
             tokens = title.split()
             for token in tokens:
                 token = token.strip()

src/calibre/ebooks/metadata/sources/identify.py

@@ -408,7 +408,7 @@ if __name__ == '__main__': # tests {{{
                 {'identifiers':{'isbn': '9780307459671'},
                     'title':'Invisible Gorilla', 'authors':['Christopher Chabris']},
                 [title_test('The Invisible Gorilla',
-                    exact=True), authors_test(['Christopher F. Chabris', 'Daniel Simons'])]
+                    exact=True), authors_test(['Christopher Chabris', 'Daniel Simons'])]
 
             ),
 

src/calibre/gui2/layout.py

@@ -317,8 +317,9 @@ class BaseToolBar(QToolBar): # {{{
         QToolBar.resizeEvent(self, ev)
         style = self.get_text_style()
         self.setToolButtonStyle(style)
-        if hasattr(self, 'd_widget') and hasattr(self.d_widget, 'filler'):
-            self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly)
+        if hasattr(self, 'd_widget'):
+            if hasattr(self.d_widget, 'filler'):
+                self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly)
 
     def get_text_style(self):
         style = Qt.ToolButtonTextUnderIcon

src/calibre/gui2/store/web_control.py

@@ -9,8 +9,8 @@ __docformat__ = 'restructuredtext en'
 import os
 from urlparse import urlparse
 
-from PyQt4.Qt import (QWebView, QWebPage, QNetworkCookieJar,
-    QFileDialog, QNetworkProxy)
+from PyQt4.Qt import QNetworkCookieJar, QFileDialog, QNetworkProxy
+from PyQt4.QtWebKit import QWebView, QWebPage
 
 from calibre import USER_AGENT, get_proxies, get_download_filename
 from calibre.ebooks import BOOK_EXTENSIONS