0.8.3

Changelog.yaml

@@ -19,6 +19,68 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.8.3
+  date: 2011-05-27
+
+  new features:
+    - title: "Allow the coloring of columns in the book list."
+      description: "You can either create a custom column with a fixed set of values and assign a color to each value, or you can use the calibre template language to color any column in arbitrarily powerful ways. For example, you can have the title appear in red if the book has a particular tag."
+      type: major
+
+    - title: "Support for the Nook Simple Reader"
+
+    - title: "Get Books, new stores: Virtualo, lulu.net"
+
+    - title: "A store chooser dialog for Get Books (click the little preferences icon at the bottom of the Get Books screen)."
+
+    - title: "Add a merge_lists, and, or, not template functions to the calibre template language"
+
+    - title: "EPUB Output: Change any white-space:pre declarations in the CSS to pre-wrap to accomodate readers that cannot scroll horizontally."
+      tickets: [786722]
+
+    - title: "Windows installer: Remember and use previous installation folder when upgrading. Note that this will work for future upgrades, after this one."
+  
+  bug fixes:
+    - title: "MOBI Output: Fix hidden tags with id attributes also hiding their trailing text"
+      tickets: [788570]
+
+    - title: "Fix switching from one news source to another via a search not saving changes to the scheduling of the first source"
+      tickets: [774849]
+
+    - title: "Dont allow user to use non email usernames when setting up Hotmail or Gmail accounts"
+
+    - title: "Amazon metadata download: Use separate identifiers for country specific downloads so that the links to Amazon in the Book details panel work when downloading metadata from country specific amazon websites."
+      tickets: [786146]
+
+    - title: "Nicer error message when user attempts to set title/author via Edit metadata dialog and one of the files is open in another program."
+
+    - title: "Fix {id} not working in send to device templates"
+
+    - title: "Windows: If creating a bytestring temp dir fails, create a unicode one and hope the rest of calibre can handle it"
+
+    - title: "Get Books: Fix some results from Amazon missing."
+      tickets: [785962]
+
+  improved recipes:
+    - Kathermini
+    - Faz.net
+    - The Washington Post
+    - El Mundo
+    - Marca
+    - The Nation
+
+  new recipes:
+    - title: Various German news sources
+      author: schuster
+
+    - title: "George R. R. Martin's Blog"
+      author: Darko Miletic
+
+    - title: "Focus (DE) and National Geographic"
+      auhtor: Anonymous
+
+
+
 - version: 0.8.2
   date: 2011-05-20
 

recipes/aachener_nachrichten.recipe

@@ -0,0 +1,42 @@
+from calibre.web.feeds.recipes import BasicNewsRecipe
+class AdvancedUserRecipe(BasicNewsRecipe):
+
+    title          = u'Aachener Nachrichten'
+    __author__  = 'schuster'
+    oldest_article = 1
+    max_articles_per_feed = 100
+    use_embedded_content   = False
+    language               = 'de'
+    remove_javascript      = True
+    cover_url = 'http://www.an-online.de/einwaage/images/an_logo.png'
+    masthead_url = 'http://www.an-online.de/einwaage/images/an_logo.png'
+    extra_css = '''
+	.fliesstext_detail:{margin-bottom:10%;}
+	.headline_1:{margin-bottom:25%;}
+                    b{font-family:Arial,Helvetica,sans-serif; font-weight:200;font-size:large;}
+                    a{font-family:Arial,Helvetica,sans-serif; font-weight:400;font-size:large;}
+                    ll{font-family:Arial,Helvetica,sans-serif; font-weight:100;font-size:large;}
+                    h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
+                    img {min-width:300px; max-width:600px; min-height:300px; max-height:800px}
+                    dd{font-family:Arial,Helvetica,sans-serif;font-size:large;}
+                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
+	'''
+
+
+
+    keep_only_tags    = [
+                       dict(name='span', attrs={'class':['fliesstext_detail', 'headline_1', 'autor_detail']}),
+                       dict(id=['header-logo'])
+  ]
+
+    feeds          = [(u'Euregio', u'http://www.an-online.de/an/rss/Euregio.xml'),
+                          (u'Aachen', u'http://www.an-online.de/an/rss/Aachen.xml'),
+                          (u'Nordkreis', u'http://www.an-online.de/an/rss/Nordkreis.xml'),
+                          (u'Düren', u'http://www.an-online.de/an/rss/Dueren.xml'),
+                          (u'Eiffel', u'http://www.an-online.de/an/rss/Eifel.xml'),
+                          (u'Eschweiler', u'http://www.an-online.de/an/rss/Eschweiler.xml'),
+                          (u'Geilenkirchen', u'http://www.an-online.de/an/rss/Geilenkirchen.xml'),
+                          (u'Heinsberg', u'http://www.an-online.de/an/rss/Heinsberg.xml'),
+                          (u'Jülich', u'http://www.an-online.de/an/rss/Juelich.xml'),
+                          (u'Stolberg', u'http://www.an-online.de/an/rss/Stolberg.xml'),
+                          (u'Ratgebenr', u'http://www.an-online.de/an/rss/Ratgeber.xml')]

recipes/faznet.recipe

@@ -1,38 +1,63 @@
-from calibre.web.feeds.recipes import BasicNewsRecipe
+__license__   = 'GPL v3'
-class AdvancedUserRecipe1303841067(BasicNewsRecipe):
+__copyright__ = '2008-2011, Kovid Goyal <kovid at kovidgoyal.net>, Darko Miletic <darko at gmail.com>'
+'''
+Profile to download FAZ.NET
+'''
 
-    title          = u'Faz.net'
+from calibre.web.feeds.news import BasicNewsRecipe
-    __author__  = 'schuster'
+
-    remove_tags = [dict(attrs={'class':['right', 'ArrowLinkRight', 'ModulVerlagsInfo', 'left', 'Head']}),
+class FazNet(BasicNewsRecipe):
-                dict(id=['BreadCrumbs', 'tstag', 'FazFooterPrint']),
+    title                 = 'FAZ.NET'
-                dict(name=['script', 'noscript', 'style'])]
+    __author__            = 'Kovid Goyal, Darko Miletic'
-    oldest_article = 2
     description           = 'Frankfurter Allgemeine Zeitung'
-    max_articles_per_feed = 100
+    publisher             = 'Frankfurter Allgemeine Zeitung GmbH'
-    no_stylesheets         = True
+    category              = 'news, politics, Germany'
-    use_embedded_content   = False
+    use_embedded_content  = False
-    language               = 'de'
+    language = 'de'
-    remove_javascript      = True
-    cover_url = 'http://www.faz.net/f30/Images/Logos/logo.gif'
 
-    def print_version(self, url):
+    max_articles_per_feed = 30
-        return url.replace('.html', '~Afor~Eprint.html')
+    no_stylesheets        = True
+    encoding              = 'utf-8'
+    remove_javascript     = True
 
+    html2lrf_options = [
+                          '--comment', description
+                        , '--category', category
+                        , '--publisher', publisher
+                        ]
 
+    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"'
 
-    feeds          = [(u'Politik', u'http://www.faz.net/s/RubA24ECD630CAE40E483841DB7D16F4211/Tpl~Epartner~SRss_.xml'),
+    keep_only_tags = [dict(name='div', attrs={'class':'Article'})]
-          (u'Wirtschaft', u'http://www.faz.net/s/RubC9401175958F4DE28E143E68888825F6/Tpl~Epartner~SRss_.xml'),
-          (u'Feuilleton', u'http://www.faz.net/s/RubCC21B04EE95145B3AC877C874FB1B611/Tpl~Epartner~SRss_.xml'),
-          (u'Sport', u'http://www.faz.net/s/Rub9F27A221597D4C39A82856B0FE79F051/Tpl~Epartner~SRss_.xml'),
-          (u'Gesellschaft', u'http://www.faz.net/s/Rub02DBAA63F9EB43CEB421272A670A685C/Tpl~Epartner~SRss_.xml'),
-          (u'Finanzen', u'http://www.faz.net/s/Rub4B891837ECD14082816D9E088A2D7CB4/Tpl~Epartner~SRss_.xml'),
-          (u'Wissen', u'http://www.faz.net/s/Rub7F4BEE0E0C39429A8565089709B70C44/Tpl~Epartner~SRss_.xml'),
-          (u'Reise', u'http://www.faz.net/s/RubE2FB5CA667054BDEA70FB3BC45F8D91C/Tpl~Epartner~SRss_.xml'),
-          (u'Technik & Motor', u'http://www.faz.net/s/Rub01E4D53776494844A85FDF23F5707AD8/Tpl~Epartner~SRss_.xml'),
-          (u'Beruf & Chance', u'http://www.faz.net/s/RubB1E10A8367E8446897468EDAA6EA0504/Tpl~Epartner~SRss_.xml'),
-          (u'Kunstmarkt', u'http://www.faz.net/s/RubBC09F7BF72A2405A96718ECBFB68FBFE/Tpl~Epartner~SRss_.xml'),
-          (u'Immobilien ', u'http://www.faz.net/s/RubFED172A9E10F46B3A5F01B02098C0C8D/Tpl~Epartner~SRss_.xml'),
-          (u'Rhein-Main Zeitung', u'http://www.faz.net/s/RubABE881A6669742C2A5EBCB5D50D7EBEE/Tpl~Epartner~SRss_.xml'),
-          (u'Atomdebatte ', u'http://www.faz.net/s/Rub469C43057F8C437CACC2DE9ED41B7950/Tpl~Epartner~SRss_.xml')
-    ]
 
+    remove_tags = [
+                     dict(name=['object','link','embed','base'])
+                    ,dict(name='div',
+                        attrs={'class':['LinkBoxModulSmall','ModulVerlagsInfo',
+                            'ArtikelServices', 'ModulLesermeinungenFooter',
+                            'ModulArtikelServices', 'BoxTool Aufklappen_Grau',
+                            'SocialMediaUnten', ]}),
+                    dict(id=['KurzLinkMenu', 'ArtikelServicesMenu']),
+                  ]
+
+    feeds = [
+              ('FAZ.NET Aktuell', 'http://www.faz.net/s/RubF3CE08B362D244869BE7984590CB6AC1/Tpl~Epartner~SRss_.xml'),
+              ('Politik', 'http://www.faz.net/s/RubA24ECD630CAE40E483841DB7D16F4211/Tpl~Epartner~SRss_.xml'),
+              ('Wirtschaft', 'http://www.faz.net/s/RubC9401175958F4DE28E143E68888825F6/Tpl~Epartner~SRss_.xml'),
+              ('Feuilleton', 'http://www.faz.net/s/RubCC21B04EE95145B3AC877C874FB1B611/Tpl~Epartner~SRss_.xml'),
+              ('Sport', 'http://www.faz.net/s/Rub9F27A221597D4C39A82856B0FE79F051/Tpl~Epartner~SRss_.xml'),
+              ('Gesellschaft', 'http://www.faz.net/s/Rub02DBAA63F9EB43CEB421272A670A685C/Tpl~Epartner~SRss_.xml'),
+              ('Finanzen', 'http://www.faz.net/s/Rub4B891837ECD14082816D9E088A2D7CB4/Tpl~Epartner~SRss_.xml'),
+              ('Wissen', 'http://www.faz.net/s/Rub7F4BEE0E0C39429A8565089709B70C44/Tpl~Epartner~SRss_.xml'),
+              ('Reise', 'http://www.faz.net/s/RubE2FB5CA667054BDEA70FB3BC45F8D91C/Tpl~Epartner~SRss_.xml'),
+              ('Technik & Motor', 'http://www.faz.net/s/Rub01E4D53776494844A85FDF23F5707AD8/Tpl~Epartner~SRss_.xml'),
+              ('Beruf & Chance', 'http://www.faz.net/s/RubB1E10A8367E8446897468EDAA6EA0504/Tpl~Epartner~SRss_.xml')
+            ]
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>'
+        soup.head.insert(0,mtag)
+        del soup.body['onload']
+        for item in soup.findAll(style=True):
+            del item['style']
+        return soup

recipes/frankfurter_rundschau.recipe

@@ -0,0 +1,35 @@
+from calibre.web.feeds.recipes import BasicNewsRecipe
+class AdvancedUserRecipe(BasicNewsRecipe):
+
+    title          = u'Frankfurter Rundschau'
+    __author__  = 'schuster'
+    oldest_article = 1
+    max_articles_per_feed = 100
+    no_stylesheets         = True
+    use_embedded_content   = False
+    language               = 'de'
+    remove_javascript      = True
+    cover_url = 'http://www.fr-online.de/image/view/-/1474018/data/823538/-/logo.png'
+    extra_css = '''
+                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
+                    h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
+                    img {min-width:300px; max-width:600px; min-height:300px; max-height:800px}
+                    p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
+                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
+	'''
+
+    feeds          = [(u'Startseite', u'http://www.fr-online.de/home/-/1472778/1472778/-/view/asFeed/-/index.xml'),
+                          (u'Politik', u'http://www.fr-online.de/politik/-/1472596/1472596/-/view/asFeed/-/index.xml'),
+                          (u'Meinungen', u'http://www.fr-online.de/politik/meinung/-/1472602/1472602/-/view/asFeed/-/index.xml'),
+                          (u'Wirtschaft', u'http://www.fr-online.de/wirtschaft/-/1472780/1472780/-/view/asFeed/-/index.xml'),
+                          (u'Sport', u'http://www.fr-online.de/sport/-/1472784/1472784/-/view/asFeed/-/index.xml'),
+                          (u'Kultur', u'http://www.fr-online.de/kultur/-/1472786/1472786/-/view/asFeed/-/index.xml'),
+                          (u'Panorama', u'http://www.fr-online.de/panorama/-/1472782/1472782/-/view/asFeed/-/index.xml'),
+                          (u'Digital', u'http://www.fr-online.de/digital/-/1472406/1472406/-/view/asFeed/-/index.xml'),
+                          (u'Wissenschaft', u'http://www.fr-online.de/wissenschaft/-/1472788/1472788/-/view/asFeed/-/index.xml')
+]
+
+
+    def print_version(self, url):
+        return url.replace('index.html', 'view/printVersion/-/index.html')
+

recipes/grrm.recipe

@@ -0,0 +1,36 @@
+
+__license__   = 'GPL v3'
+__copyright__ = '2011, Darko Miletic <darko.miletic at gmail.com>'
+'''
+grrm.livejournal.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class NotABlog(BasicNewsRecipe):
+    title                 = 'Not A Blog - George R.R. Martin'
+    __author__            = 'Darko Miletic'
+    description           = 'George R.R. Martin'
+    oldest_article        = 15
+    max_articles_per_feed = 100
+    language              = 'en'
+    encoding              = 'utf-8'
+    no_stylesheets        = True
+    use_embedded_content  = True
+    publication_type      = 'blog'
+
+    conversion_options = {
+                          'comment'  : description
+                        , 'tags'     : 'sf, fantasy, game of thrones'
+                        , 'publisher': 'George R.R. Martin'
+                        , 'language' : language
+                        }
+
+    feeds = [(u'Posts', u'http://grrm.livejournal.com/data/rss')]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        return self.adeify_images(soup)
+
+

recipes/kathemerini.recipe

@@ -5,14 +5,16 @@ class Kathimerini(BasicNewsRecipe):
     __author__             = 'Pan'
     description            = 'News from Greece'
     max_articles_per_feed  = 100
-    oldest_article = 100
+    oldest_article         = 100
     publisher              = 'Kathimerini'
     category               = 'news, GR'
     language               = 'el'
+    encoding               = 'windows-1253'
+    conversion_options     = { 'linearize_tables': True}
     no_stylesheets         = True
-    remove_tags_before = dict(name='td',attrs={'class':'news'})
+    remove_tags_before     = dict(name='td',attrs={'class':'news'})
-    remove_tags_after = dict(name='td',attrs={'class':'news'})
+    remove_tags_after      = dict(name='td',attrs={'class':'news'})
-    remove_attributes = ['width', 'src','header','footer']
+    remove_attributes      = ['width', 'src','header','footer']
 
     feeds = [(u'\u03a0\u03bf\u03bb\u03b9\u03c4\u03b9\u03ba\u03ae',
   'http://wk.kathimerini.gr/xml_files/politics.xml'),
@@ -34,4 +36,3 @@ class Kathimerini(BasicNewsRecipe):
     def print_version(self, url):
         return url.replace('http://news.kathimerini.gr/4dcgi/', 'http://news.kathimerini.gr/4dcgi/4dcgi/')
 
-

recipes/rheinische_post.recipe

@@ -0,0 +1,55 @@
+from calibre.web.feeds.recipes import BasicNewsRecipe
+class AdvancedUserRecipe(BasicNewsRecipe):
+
+    title          = u'RP-online'
+    __author__  = 'schuster'
+    oldest_article = 2
+    max_articles_per_feed = 100
+    no_stylesheets         = True
+    use_embedded_content   = False
+    language               = 'de'
+    remove_javascript      = True
+    masthead_url = 'http://www.die-zeitungen.de/uploads/pics/LOGO_RP_ONLINE_01.jpg'
+    cover_url = 'http://www.manroland.com/com/pressinfo_images/com/RheinischePost_Logo_300dpi.jpg'
+    extra_css = '''
+                    h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
+                    h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
+                    img {min-width:300px; max-width:600px; min-height:300px; max-height:800px}
+                    p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
+                    body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
+	'''
+    remove_tags_before = dict(id='article_content')
+    remove_tags_after  = dict(id='article_content')
+    remove_tags = [dict(attrs={'class':['goodies', 'left', 'right', 'clear-all', 'teaser anzeigenwerbung', 'lesermeinung', 'goodiebox', 'goodiebox 1', 'goodiebox 2', 'goodiebox 3', 'boxframe', 'link']}),
+                dict(id=['click_Fotos_link']),
+                dict(name=['script', 'noscript', 'style', '_top', 'click_Fotos_link'])]
+
+    feeds          = [	(u'Top-News', u'http://www.ngz-online.de/app/feed/rss/topnews'),
+		(u'Politik', u'http://www.ngz-online.de/app/feed/rss/politik'),
+		(u'Wirtschaft', u'http://www.ngz-online.de/app/feed/rss/wirtschaft'),
+		(u'Panorama', u'http://www.ngz-online.de/app/feed/rss/panorama'),
+		(u'Sport', u'http://www.ngz-online.de/app/feed/rss/sport'),
+		(u'Tour de France', u'http://www.ngz-online.de/app/feed/rss/tourdefrance'),
+		(u'Fußball', u'http://www.ngz-online.de/app/feed/rss/fussball'),
+		(u'Fußball BuLi', u'http://www.ngz-online.de/app/feed/rss/bundesliga'),
+		(u'Formel 1', u'http://www.ngz-online.de/app/feed/rss/formel1'),
+		(u'US-Sport', u'http://www.ngz-online.de/app/feed/rss/us-sports'),
+		(u'Boxen', u'http://www.ngz-online.de/app/feed/rss/boxen'),
+		(u'Eishockey', u'http://www.ngz-online.de/app/feed/rss/eishockey'),
+		(u'Basketball', u'http://www.ngz-online.de/app/feed/rss/basketball'),
+		(u'Handball', u'http://www.ngz-online.de/app/feed/rss/handball'),
+		(u'Motorsport', u'http://www.ngz-online.de/app/feed/rss/motorsport'),
+		(u'Tennis', u'http://www.ngz-online.de/app/feed/rss/tennis'),
+		(u'Radsport', u'http://www.ngz-online.de/app/feed/rss/radsport'),
+		(u'Kultur', u'http://www.ngz-online.de/app/feed/rss/kultur'),
+		(u'Gesellschaft', u'http://www.ngz-online.de/app/feed/rss/gesellschaft'),
+		(u'Wissenschaft', u'http://www.ngz-online.de/app/feed/rss/wissen'),
+		(u'Gesundheit', u'http://www.ngz-online.de/app/feed/rss/gesundheit'),
+		(u'Digitale Welt', u'http://www.ngz-online.de/app/feed/rss/digitale'),
+		(u'Auto & Mobil', u'http://www.ngz-online.de/app/feed/rss/auto'),
+		(u'Reise & Welt', u'http://www.ngz-online.de/app/feed/rss/reise'),
+		(u'Beruf & Karriere', u'http://www.ngz-online.de/app/feed/rss/beruf'),
+		(u'Herzrasen', u'http://www.ngz-online.de/app/feed/rss/herzrasen'),
+		(u'About a Boy', u'http://www.ngz-online.de/app/feed/rss/about_a_boy'),
+
+]

resources/template-functions.json

@@ -1,34 +1,40 @@
 {
+    "and": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    while i < len(args):\n        if not args[i]:\n            return ''\n        i += 1\n    return '1'\n", 
     "contains": "def evaluate(self, formatter, kwargs, mi, locals,\n             val, test, value_if_present, value_if_not):\n    if re.search(test, val):\n        return value_if_present\n    else:\n        return value_if_not\n", 
     "divide": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x / y)\n", 
     "uppercase": "def evaluate(self, formatter, kwargs, mi, locals, val):\n    return val.upper()\n", 
     "strcat": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    res = ''\n    for i in range(0, len(args)):\n        res += args[i]\n    return res\n", 
-    "substr": "def evaluate(self, formatter, kwargs, mi, locals, str_, start_, end_):\n    return str_[int(start_): len(str_) if int(end_) == 0 else int(end_)]\n", 
+    "in_list": "def evaluate(self, formatter, kwargs, mi, locals, val, sep, pat, fv, nfv):\n    l = [v.strip() for v in val.split(sep) if v.strip()]\n    for v in l:\n        if re.search(pat, v):\n            return fv\n    return nfv\n", 
+    "multiply": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x * y)\n", 
     "ifempty": "def evaluate(self, formatter, kwargs, mi, locals, val, value_if_empty):\n    if val:\n        return val\n    else:\n        return value_if_empty\n", 
     "booksize": "def evaluate(self, formatter, kwargs, mi, locals):\n    if mi.book_size is not None:\n        try:\n            return str(mi.book_size)\n        except:\n            pass\n    return ''\n", 
     "select": "def evaluate(self, formatter, kwargs, mi, locals, val, key):\n    if not val:\n        return ''\n    vals = [v.strip() for v in val.split(',')]\n    for v in vals:\n        if v.startswith(key+':'):\n            return v[len(key)+1:]\n    return ''\n", 
-    "field": "def evaluate(self, formatter, kwargs, mi, locals, name):\n    return formatter.get_value(name, [], kwargs)\n", 
+    "strcmp": "def evaluate(self, formatter, kwargs, mi, locals, x, y, lt, eq, gt):\n    v = strcmp(x, y)\n    if v < 0:\n        return lt\n    if v == 0:\n        return eq\n    return gt\n", 
+    "first_non_empty": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    while i < len(args):\n        if args[i]:\n            return args[i]\n        i += 1\n    return ''\n", 
+    "re": "def evaluate(self, formatter, kwargs, mi, locals, val, pattern, replacement):\n    return re.sub(pattern, replacement, val)\n", 
     "subtract": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x - y)\n", 
     "list_item": "def evaluate(self, formatter, kwargs, mi, locals, val, index, sep):\n    if not val:\n        return ''\n    index = int(index)\n    val = val.split(sep)\n    try:\n        return val[index]\n    except:\n        return ''\n", 
     "shorten": "def evaluate(self, formatter, kwargs, mi, locals,\n             val, leading, center_string, trailing):\n    l = max(0, int(leading))\n    t = max(0, int(trailing))\n    if len(val) > l + len(center_string) + t:\n        return val[0:l] + center_string + ('' if t == 0 else val[-t:])\n    else:\n        return val\n", 
-    "re": "def evaluate(self, formatter, kwargs, mi, locals, val, pattern, replacement):\n    return re.sub(pattern, replacement, val)\n", 
+    "field": "def evaluate(self, formatter, kwargs, mi, locals, name):\n    return formatter.get_value(name, [], kwargs)\n", 
     "add": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x + y)\n", 
     "lookup": "def evaluate(self, formatter, kwargs, mi, locals, val, *args):\n    if len(args) == 2: # here for backwards compatibility\n        if val:\n            return formatter.vformat('{'+args[0].strip()+'}', [], kwargs)\n        else:\n            return formatter.vformat('{'+args[1].strip()+'}', [], kwargs)\n    if (len(args) % 2) != 1:\n        raise ValueError(_('lookup requires either 2 or an odd number of arguments'))\n    i = 0\n    while i < len(args):\n        if i + 1 >= len(args):\n            return formatter.vformat('{' + args[i].strip() + '}', [], kwargs)\n        if re.search(args[i], val):\n            return formatter.vformat('{'+args[i+1].strip() + '}', [], kwargs)\n        i += 2\n", 
     "template": "def evaluate(self, formatter, kwargs, mi, locals, template):\n    template = template.replace('[[', '{').replace(']]', '}')\n    return formatter.__class__().safe_format(template, kwargs, 'TEMPLATE', mi)\n", 
     "print": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    print args\n    return None\n", 
+    "merge_lists": "def evaluate(self, formatter, kwargs, mi, locals, list1, list2, separator):\n    l1 = [l.strip() for l in list1.split(separator) if l.strip()]\n    l2 = [l.strip() for l in list2.split(separator) if l.strip()]\n    lcl1 = set([icu_lower(l) for l in l1])\n    res = []\n    for i in l1:\n        res.append(i)\n    for i in l2:\n        if icu_lower(i) not in lcl1:\n            res.append(i)\n    return ', '.join(sorted(res, key=sort_key))\n", 
     "titlecase": "def evaluate(self, formatter, kwargs, mi, locals, val):\n    return titlecase(val)\n", 
     "subitems": "def evaluate(self, formatter, kwargs, mi, locals, val, start_index, end_index):\n    if not val:\n        return ''\n    si = int(start_index)\n    ei = int(end_index)\n    items = [v.strip() for v in val.split(',')]\n    rv = set()\n    for item in items:\n        component = item.split('.')\n        try:\n            if ei == 0:\n                rv.add('.'.join(component[si:]))\n            else:\n                rv.add('.'.join(component[si:ei]))\n        except:\n            pass\n    return ', '.join(sorted(rv, key=sort_key))\n", 
     "sublist": "def evaluate(self, formatter, kwargs, mi, locals, val, start_index, end_index, sep):\n    if not val:\n        return ''\n    si = int(start_index)\n    ei = int(end_index)\n    val = val.split(sep)\n    try:\n        if ei == 0:\n            return sep.join(val[si:])\n        else:\n            return sep.join(val[si:ei])\n    except:\n        return ''\n", 
     "test": "def evaluate(self, formatter, kwargs, mi, locals, val, value_if_set, value_not_set):\n    if val:\n        return value_if_set\n    else:\n        return value_not_set\n", 
     "eval": "def evaluate(self, formatter, kwargs, mi, locals, template):\n    from formatter import eval_formatter\n    template = template.replace('[[', '{').replace(']]', '}')\n    return eval_formatter.safe_format(template, locals, 'EVAL', None)\n", 
-    "multiply": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x * y)\n", 
+    "not": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    while i < len(args):\n        if args[i]:\n            return '1'\n        i += 1\n    return ''\n", 
     "format_date": "def evaluate(self, formatter, kwargs, mi, locals, val, format_string):\n    if not val:\n        return ''\n    try:\n        dt = parse_date(val)\n        s = format_date(dt, format_string)\n    except:\n        s = 'BAD DATE'\n    return s\n", 
     "capitalize": "def evaluate(self, formatter, kwargs, mi, locals, val):\n    return capitalize(val)\n", 
     "count": "def evaluate(self, formatter, kwargs, mi, locals, val, sep):\n    return unicode(len(val.split(sep)))\n", 
     "lowercase": "def evaluate(self, formatter, kwargs, mi, locals, val):\n    return val.lower()\n", 
-    "strcmp": "def evaluate(self, formatter, kwargs, mi, locals, x, y, lt, eq, gt):\n    v = strcmp(x, y)\n    if v < 0:\n        return lt\n    if v == 0:\n        return eq\n    return gt\n", 
+    "substr": "def evaluate(self, formatter, kwargs, mi, locals, str_, start_, end_):\n    return str_[int(start_): len(str_) if int(end_) == 0 else int(end_)]\n", 
-    "switch": "def evaluate(self, formatter, kwargs, mi, locals, val, *args):\n    if (len(args) % 2) != 1:\n        raise ValueError(_('switch requires an odd number of arguments'))\n    i = 0\n    while i < len(args):\n        if i + 1 >= len(args):\n            return args[i]\n        if re.search(args[i], val):\n            return args[i+1]\n        i += 2\n", 
     "assign": "def evaluate(self, formatter, kwargs, mi, locals, target, value):\n    locals[target] = value\n    return value\n", 
+    "switch": "def evaluate(self, formatter, kwargs, mi, locals, val, *args):\n    if (len(args) % 2) != 1:\n        raise ValueError(_('switch requires an odd number of arguments'))\n    i = 0\n    while i < len(args):\n        if i + 1 >= len(args):\n            return args[i]\n        if re.search(args[i], val):\n            return args[i+1]\n        i += 2\n", 
+    "or": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    while i < len(args):\n        if args[i]:\n            return '1'\n        i += 1\n    return ''\n", 
     "raw_field": "def evaluate(self, formatter, kwargs, mi, locals, name):\n    return unicode(getattr(mi, name, None))\n", 
     "cmp": "def evaluate(self, formatter, kwargs, mi, locals, x, y, lt, eq, gt):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    if x < y:\n        return lt\n    if x == y:\n        return eq\n    return gt\n"
 }

src/calibre/constants.py

@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 8, 2)
+numeric_version = (0, 8, 3)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

src/calibre/customize/__init__.py

@@ -607,9 +607,22 @@ class StoreBase(Plugin): # {{{
     supported_platforms = ['windows', 'osx', 'linux']
     author         = 'John Schember'
     type = _('Store')
+    # Information about the store. Should be in the primary language
+    # of the store. This should not be translatable when set by
+    # a subclass.
+    description = _('An ebook store.')
     minimum_calibre_version = (0, 8, 0)
+    version        = (1, 0, 1)
 
     actual_plugin = None
+    
+    # Does the store only distribute ebooks without DRM.
+    drm_free_only = False
+    # This is the 2 letter country code for the corporate
+    # headquarters of the store.
+    headquarters = ''
+    # All formats the store distributes ebooks in.
+    formats = []
 
     def load_actual_plugin(self, gui):
         '''

src/calibre/customize/builtins.py

@@ -594,7 +594,7 @@ from calibre.devices.iliad.driver import ILIAD
 from calibre.devices.irexdr.driver import IREXDR1000, IREXDR800
 from calibre.devices.jetbook.driver import JETBOOK, MIBUK, JETBOOK_MINI
 from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX
-from calibre.devices.nook.driver import NOOK, NOOK_COLOR
+from calibre.devices.nook.driver import NOOK, NOOK_COLOR, NOOK_TSR
 from calibre.devices.prs505.driver import PRS505
 from calibre.devices.user_defined.driver import USER_DEFINED
 from calibre.devices.android.driver import ANDROID, S60
@@ -693,8 +693,7 @@ plugins += [
     KINDLE,
     KINDLE2,
     KINDLE_DX,
-    NOOK,
+    NOOK, NOOK_COLOR, NOOK_TSR,
-    NOOK_COLOR,
     PRS505,
     ANDROID,
     S60,
@@ -855,6 +854,17 @@ class ActionStore(InterfaceActionBase):
     author = 'John Schember'
     actual_plugin = 'calibre.gui2.actions.store:StoreAction'
 
+    def customization_help(self, gui=False):
+        return 'Customize the behavior of the store search.'
+
+    def config_widget(self):
+        from calibre.gui2.store.config.store import config_widget as get_cw
+        return get_cw()
+
+    def save_settings(self, config_widget):
+        from calibre.gui2.store.config.store import save_settings as save
+        save(config_widget)
+
 plugins += [ActionAdd, ActionFetchAnnotations, ActionGenerateCatalog,
         ActionConvert, ActionDelete, ActionEditMetadata, ActionView,
         ActionFetchNews, ActionSaveToDisk, ActionShowBookDetails,
@@ -1095,147 +1105,294 @@ plugins += [LookAndFeel, Behavior, Columns, Toolbar, Search, InputOptions,
 # Store plugins {{{
 class StoreAmazonKindleStore(StoreBase):
     name = 'Amazon Kindle'
-    description = _('Kindle books from Amazon.')
+    description = u'Kindle books from Amazon.'
     actual_plugin = 'calibre.gui2.store.amazon_plugin:AmazonKindleStore'
 
+    drm_free_only = False
+    headquarters = 'US'
+    formats = ['KINDLE']
+
 class StoreAmazonDEKindleStore(StoreBase):
     name = 'Amazon DE Kindle'
-    description = _('Kindle books from Amazon.de.')
+    author = 'Charles Haley'
+    description = u'Kindle Bücher von Amazon.'
     actual_plugin = 'calibre.gui2.store.amazon_de_plugin:AmazonDEKindleStore'
 
+    drm_free_only = False
+    headquarters = 'DE'
+    formats = ['KINDLE']
+
 class StoreAmazonUKKindleStore(StoreBase):
     name = 'Amazon UK Kindle'
-    description = _('Kindle books from Amazon.uk.')
+    author = 'Charles Haley'
+    description = u'Kindle books from Amazon\'s UK web site. Also, includes French language ebooks.'
     actual_plugin = 'calibre.gui2.store.amazon_uk_plugin:AmazonUKKindleStore'
 
+    drm_free_only = False
+    headquarters = 'UK'
+    formats = ['KINDLE']
+
 class StoreArchiveOrgStore(StoreBase):
     name = 'Archive.org'
-    description = _('Free Books : Download & Streaming : Ebook  and Texts Archive : Internet Archive.')
+    description = u'An Internet library offering permanent access for researchers, historians, scholars, people with disabilities, and the general public to historical collections that exist in digital format.'
     actual_plugin = 'calibre.gui2.store.archive_org_plugin:ArchiveOrgStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT']
 
 class StoreBaenWebScriptionStore(StoreBase):
     name = 'Baen WebScription'
-    description = _('Ebooks for readers.')
+    description = u'Sci-Fi & Fantasy brought to you by Jim Baen.'
     actual_plugin = 'calibre.gui2.store.baen_webscription_plugin:BaenWebScriptionStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'LIT', 'LRF', 'MOBI', 'RB', 'RTF', 'ZIP']
+
 class StoreBNStore(StoreBase):
     name = 'Barnes and Noble'
-    description = _('Books, Textbooks, eBooks, Toys, Games and More.')
+    description = u'The world\'s largest book seller. As the ultimate destination for book lovers, Barnes & Noble.com offers an incredible array of content.'
     actual_plugin = 'calibre.gui2.store.bn_plugin:BNStore'
 
+    drm_free_only = False
+    headquarters = 'US'
+    formats = ['NOOK']
+
 class StoreBeamEBooksDEStore(StoreBase):
     name = 'Beam EBooks DE'
-    description = _('Der eBook Shop.')
+    author = 'Charles Haley'
+    description = u'Bei uns finden Sie: Tausende deutschsprachige eBooks; Alle eBooks ohne hartes DRM; PDF, ePub und Mobipocket Format; Sofortige Verfügbarkeit - 24 Stunden am Tag; Günstige Preise; eBooks für viele Lesegeräte, PC,Mac und Smartphones; Viele Gratis eBooks'
     actual_plugin = 'calibre.gui2.store.beam_ebooks_de_plugin:BeamEBooksDEStore'
 
+    drm_free_only = True
+    headquarters = 'DE'
+    formats = ['EPUB', 'MOBI', 'PDF']
+
 class StoreBeWriteStore(StoreBase):
     name = 'BeWrite Books'
-    description = _('Publishers of fine books.')
+    description = u'Publishers of fine books. Highly selective and editorially driven. Does not offer: books for children or exclusively YA, erotica, swords-and-sorcery fantasy and space-opera-style science fiction. All other genres are represented.'
     actual_plugin = 'calibre.gui2.store.bewrite_plugin:BeWriteStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'MOBI', 'PDF']
+
 class StoreDieselEbooksStore(StoreBase):
     name = 'Diesel eBooks'
-    description = _('World Famous eBook Store.')
+    description = u'Instant access to over 2.4 million titles from hundreds of publishers including Harlequin, HarperCollins, John Wiley & Sons, McGraw-Hill, Simon & Schuster and Random House.'
     actual_plugin = 'calibre.gui2.store.diesel_ebooks_plugin:DieselEbooksStore'
 
+    drm_free_only = False
+    headquarters = 'US'
+    formats = ['EPUB', 'PDF']
+
 class StoreEbookscomStore(StoreBase):
     name = 'eBooks.com'
-    description = _('The digital bookstore.')
+    description = u'Sells books in multiple electronic formats in all categories. Technical infrastructure is cutting edge, robust and scalable, with servers in the US and Europe.'
     actual_plugin = 'calibre.gui2.store.ebooks_com_plugin:EbookscomStore'
 
+    drm_free_only = False
+    headquarters = 'US'
+    formats = ['EPUB', 'LIT', 'MOBI', 'PDF']
+
 class StoreEPubBuyDEStore(StoreBase):
     name = 'EPUBBuy DE'
-    description = _('EPUBReaders eBook Shop.')
+    author = 'Charles Haley'
+    description = u'Bei EPUBBuy.com finden Sie ausschliesslich eBooks im weitverbreiteten EPUB-Format und ohne DRM. So haben Sie die freie Wahl, wo Sie Ihr eBook lesen: Tablet, eBook-Reader, Smartphone oder einfach auf Ihrem PC. So macht eBook-Lesen Spaß!'
     actual_plugin = 'calibre.gui2.store.epubbuy_de_plugin:EPubBuyDEStore'
 
+    drm_free_only = True
+    headquarters = 'DE'
+    formats = ['EPUB']
+
 class StoreEHarlequinStore(StoreBase):
     name = 'eHarlequin'
-    description = _('Entertain, enrich, inspire.')
+    description = u'A global leader in series romance and one of the world\'s leading publishers of books for women. Offers women a broad range of reading from romance to bestseller fiction, from young adult novels to erotic literature, from nonfiction to fantasy, from African-American novels to inspirational romance, and more.'
     actual_plugin = 'calibre.gui2.store.eharlequin_plugin:EHarlequinStore'
 
+    drm_free_only = False
+    headquarters = 'CA'
+    formats = ['EPUB', 'PDF']
+
 class StoreFeedbooksStore(StoreBase):
     name = 'Feedbooks'
-    description = _('Read anywhere.')
+    description = u'Feedbooks is a cloud publishing and distribution service, connected to a large ecosystem of reading systems and social networks. Provides a variety of genres from independent and classic books.'
     actual_plugin = 'calibre.gui2.store.feedbooks_plugin:FeedbooksStore'
 
+    drm_free_only = False
+    headquarters = 'FR'
+    formats = ['EPUB', 'MOBI', 'PDF']
+
 class StoreFoylesUKStore(StoreBase):
     name = 'Foyles UK'
-    description = _('Foyles of London, online.')
+    author = 'Charles Haley'
+    description = u'Foyles of London\'s ebook store. Provides extensive range covering all subjects.'
     actual_plugin = 'calibre.gui2.store.foyles_uk_plugin:FoylesUKStore'
 
+    drm_free_only = False
+    headquarters = 'UK'
+    formats = ['EPUB', 'PDF']
+
 class StoreGandalfStore(StoreBase):
     name = 'Gandalf'
-    author = 'Tomasz Długosz'
+    author = u'Tomasz Długosz'
-    description = _('Zaczarowany świat książek')
+    description = u'Księgarnia internetowa Gandalf.'
     actual_plugin = 'calibre.gui2.store.gandalf_plugin:GandalfStore'
 
+    drm_free_only = False
+    headquarters = 'PL'
+    formats = ['EPUB', 'PDF']
+
 class StoreGoogleBooksStore(StoreBase):
     name = 'Google Books'
-    description = _('Google Books')
+    description = u'Google Books'
     actual_plugin = 'calibre.gui2.store.google_books_plugin:GoogleBooksStore'
 
+    drm_free_only = False
+    headquarters = 'US'
+    formats = ['EPUB', 'PDF', 'TXT']
+
 class StoreGutenbergStore(StoreBase):
     name = 'Project Gutenberg'
-    description = _('The first producer of free ebooks.')
+    description = u'The first producer of free ebooks. Free in the United States because their copyright has expired. They may not be free of copyright in other countries. Readers outside of the United States must check the copyright laws of their countries before downloading or redistributing our ebooks.'
     actual_plugin = 'calibre.gui2.store.gutenberg_plugin:GutenbergStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'HTML', 'MOBI', 'PDB', 'TXT']
+
 class StoreKoboStore(StoreBase):
     name = 'Kobo'
-    description = _('eReading: anytime. anyplace.')
+    description = u'With over 2.3 million eBooks to browse we have engaged readers in over 200 countries in Kobo eReading. Our eBook listings include New York Times Bestsellers, award winners, classics and more!'
     actual_plugin = 'calibre.gui2.store.kobo_plugin:KoboStore'
 
+    drm_free_only = False
+    headquarters = 'CA'
+    formats = ['EPUB']
+
+class StoreLegimiStore(StoreBase):
+    name = 'Legimi'
+    author = u'Tomasz Długosz'
+    description = u'Tanie oraz darmowe ebooki, egazety i blogi w formacie EPUB, wprost na Twój e-czytnik, iPhone, iPad, Android i komputer'
+    actual_plugin = 'calibre.gui2.store.legimi_plugin:LegimiStore'
+
+    drm_free_only = False
+    headquarters = 'PL'
+    formats = ['EPUB']
+
 class StoreManyBooksStore(StoreBase):
     name = 'ManyBooks'
-    description = _('The best ebooks at the best price: free!')
+    description = u'Public domain and creative commons works from many sources.'
     actual_plugin = 'calibre.gui2.store.manybooks_plugin:ManyBooksStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'FB2', 'JAR', 'LIT', 'LRF', 'MOBI', 'PDB', 'PDF', 'RB', 'RTF', 'TCR', 'TXT', 'ZIP']
+
 class StoreMobileReadStore(StoreBase):
     name = 'MobileRead'
-    description = _('Ebooks handcrafted with the utmost care.')
+    description = u'Ebooks handcrafted with the utmost care.'
     actual_plugin = 'calibre.gui2.store.mobileread.mobileread_plugin:MobileReadStore'
 
+    drm_free_only = True
+    headquarters = 'CH'
+    formats = ['EPUB', 'IMP', 'LRF', 'LIT', 'MOBI', 'PDF']
+
 class StoreNextoStore(StoreBase):
     name = 'Nexto'
-    author = 'Tomasz Długosz'
+    author = u'Tomasz Długosz'
-    description = _('Audiobooki mp3, ebooki, prasa - księgarnia internetowa.')
+    description = u'Największy w Polsce sklep internetowy z audiobookami mp3, ebookami pdf oraz prasą do pobrania on-line.'
     actual_plugin = 'calibre.gui2.store.nexto_plugin:NextoStore'
 
+    drm_free_only = False
+    headquarters = 'PL'
+    formats = ['EPUB', 'PDF']
+
 class StoreOpenLibraryStore(StoreBase):
     name = 'Open Library'
-    description = _('One web page for every book.')
+    description = u'One web page for every book ever published. The goal is to be a true online library. Over 20 million records from a variety of large catalogs as well as single contributions, with more on the way.'
     actual_plugin = 'calibre.gui2.store.open_library_plugin:OpenLibraryStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['DAISY', 'DJVU', 'EPUB', 'MOBI', 'PDF', 'TXT']
+
 class StoreOReillyStore(StoreBase):
     name = 'OReilly'
-    description = _('DRM-Free tech ebooks.')
+    description = u'Programming and tech ebooks from OReilly.'
     actual_plugin = 'calibre.gui2.store.oreilly_plugin:OReillyStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['APK', 'DAISY', 'EPUB', 'MOBI', 'PDF']
+
 class StorePragmaticBookshelfStore(StoreBase):
     name = 'Pragmatic Bookshelf'
-    description = _('The Pragmatic Bookshelf')
+    description = u'The Pragmatic Bookshelf\'s collection of programming and tech books avaliable as ebooks.'
     actual_plugin = 'calibre.gui2.store.pragmatic_bookshelf_plugin:PragmaticBookshelfStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'MOBI', 'PDF']
+
 class StoreSmashwordsStore(StoreBase):
     name = 'Smashwords'
-    description = _('Your ebook. Your way.')
+    description = u'An ebook publishing and distribution platform for ebook authors, publishers and readers. Covers many genres and formats.'
     actual_plugin = 'calibre.gui2.store.smashwords_plugin:SmashwordsStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'HTML', 'LRF', 'MOBI', 'PDB', 'RTF', 'TXT']
+
+class StoreVirtualoStore(StoreBase):
+    name = 'Virtualo'
+    author = u'Tomasz Długosz'
+    description = u'Księgarnia internetowa, która oferuje bezpieczny i szeroki dostęp do książek w formie cyfrowej.'
+    actual_plugin = 'calibre.gui2.store.virtualo_plugin:VirtualoStore'
+
+    drm_free_only = False
+    headquarters = 'PL'
+    formats = ['EPUB', 'PDF']
+
 class StoreWaterstonesUKStore(StoreBase):
     name = 'Waterstones UK'
-    description = _('Feel every word.')
+    author = 'Charles Haley'
+    description = u'Waterstone\'s mission is to be the leading Bookseller on the High Street and online providing customers the widest choice, great value and expert advice from a team passionate about Bookselling.'
     actual_plugin = 'calibre.gui2.store.waterstones_uk_plugin:WaterstonesUKStore'
 
+    drm_free_only = False
+    headquarters = 'UK'
+    formats = ['EPUB', 'PDF']
+
 class StoreWeightlessBooksStore(StoreBase):
     name = 'Weightless Books'
-    description = '(e)Books That Don\'t Weigh You Down.'
+    description = u'An independent DRM-free ebooksite devoted to ebooks of all sorts.'
     actual_plugin = 'calibre.gui2.store.weightless_books_plugin:WeightlessBooksStore'
 
+    drm_free_only = True
+    headquarters = 'US'
+    formats = ['EPUB', 'HTML', 'LIT', 'MOBI', 'PDF']
+
 class StoreWizardsTowerBooksStore(StoreBase):
     name = 'Wizards Tower Books'
-    description = 'Wizard\'s Tower Press.'
+    description = u'A science fiction and fantasy publisher. Concentrates mainly on making out-of-print works available once more as e-books, and helping other small presses exploit the e-book market. Also publishes a small number of limited-print-run anthologies with a view to encouraging diversity in the science fiction and fantasy field.'
     actual_plugin = 'calibre.gui2.store.wizards_tower_books_plugin:WizardsTowerBooksStore'
 
+    drm_free_only = True
+    headquarters = 'UK'
+    formats = ['EPUB', 'MOBI']
+
+class StoreWoblinkStore(StoreBase):
+    name = 'Woblink'
+    author = u'Tomasz Długosz'
+    description = u'Czytanie zdarza się wszędzie!'
+    actual_plugin = 'calibre.gui2.store.woblink_plugin:WoblinkStore'
+
+    drm_free_only = False
+    headquarters = 'PL'
+    formats = ['EPUB']
+
 plugins += [
     StoreArchiveOrgStore,
     StoreAmazonKindleStore,
@@ -1251,10 +1408,11 @@ plugins += [
     StoreEHarlequinStore,
     StoreFeedbooksStore,
     StoreFoylesUKStore,
-    StoreGandalfStore, 
+    StoreGandalfStore,
     StoreGoogleBooksStore,
     StoreGutenbergStore,
     StoreKoboStore,
+    StoreLegimiStore,
     StoreManyBooksStore,
     StoreMobileReadStore,
     StoreNextoStore,
@@ -1262,9 +1420,11 @@ plugins += [
     StoreOReillyStore,
     StorePragmaticBookshelfStore,
     StoreSmashwordsStore,
-    StoreWaterstonesUKStore,
+    StoreVirtualoStore,
+    #StoreWaterstonesUKStore,
     StoreWeightlessBooksStore,
-    StoreWizardsTowerBooksStore
+    StoreWizardsTowerBooksStore,
+    StoreWoblinkStore
 ]
 
 # }}}

src/calibre/customize/ui.py

@@ -216,9 +216,26 @@ def store_plugins():
     customization = config['plugin_customization']
     for plugin in _initialized_plugins:
         if isinstance(plugin, Store):
-            if not is_disabled(plugin):
+            plugin.site_customization = customization.get(plugin.name, '')
-                plugin.site_customization = customization.get(plugin.name, '')
+            yield plugin
-                yield plugin
+
+def available_store_plugins():
+    for plugin in store_plugins():
+        if not is_disabled(plugin):
+            yield plugin
+
+def stores():
+    stores = set([])
+    for plugin in store_plugins():
+        stores.add(plugin.name)
+    return stores
+
+def available_stores():
+    stores = set([])
+    for plugin in available_store_plugins():
+        stores.add(plugin.name)
+    return stores
+
 # }}}
 
 # Metadata read/write {{{

src/calibre/devices/android/driver.py

@@ -59,7 +59,7 @@ class ANDROID(USBMS):
             0x0489 : { 0xc001 : [0x0226], 0xc004 : [0x0226], },
 
             # Acer
-            0x502 : { 0x3203 : [0x0100]},
+            0x502 : { 0x3203 : [0x0100, 0x224]},
 
             # Dell
             0x413c : { 0xb007 : [0x0100, 0x0224, 0x0226]},

src/calibre/devices/eb600/driver.py

@@ -95,9 +95,8 @@ class POCKETBOOK360(EB600):
 
     FORMATS = ['epub', 'fb2', 'prc', 'mobi', 'pdf', 'djvu', 'rtf', 'chm', 'txt']
 
-    VENDOR_NAME = 'PHILIPS'
+    VENDOR_NAME = ['PHILIPS', '__POCKET']
-    WINDOWS_MAIN_MEM = 'MASS_STORGE'
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['MASS_STORGE', 'BOOK_USB_STORAGE']
-    WINDOWS_CARD_A_MEM = 'MASS_STORGE'
 
     OSX_MAIN_MEM   = 'Philips Mass Storge Media'
     OSX_CARD_A_MEM = 'Philips Mass Storge Media'

src/calibre/devices/nook/driver.py

@@ -107,3 +107,13 @@ class NOOK_COLOR(NOOK):
 
         return filepath
 
+class NOOK_TSR(NOOK):
+    gui_name       = _('Nook Simple')
+    description    = _('Communicate with the Nook TSR eBook reader.')
+
+    PRODUCT_ID  = [0x003]
+    BCD         = [0x216]
+
+    EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'My Files/Books'
+
+

src/calibre/ebooks/epub/output.py

@@ -413,6 +413,13 @@ class EPUBOutput(OutputFormatPlugin):
                             rule.style.removeProperty('margin-left')
                             # padding-left breaks rendering in webkit and gecko
                             rule.style.removeProperty('padding-left')
+                # Change whitespace:pre to pre-line to accommodate readers that
+                # cannot scroll horizontally
+                for rule in stylesheet.data.cssRules.rulesOfType(CSSRule.STYLE_RULE):
+                    style = rule.style
+                    ws = style.getPropertyValue('white-space')
+                    if ws == 'pre':
+                        style.setProperty('white-space', 'pre-wrap')
 
     # }}}
 

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

@@ -29,7 +29,7 @@ class Worker(Thread): # Get details {{{
     Get book details from amazons book page in a separate thread
     '''
 
-    def __init__(self, url, result_queue, browser, log, relevance, plugin, timeout=20):
+    def __init__(self, url, result_queue, browser, log, relevance, domain, plugin, timeout=20):
         Thread.__init__(self)
         self.daemon = True
         self.url, self.result_queue = url, result_queue
@@ -37,7 +37,7 @@ class Worker(Thread): # Get details {{{
         self.relevance, self.plugin = relevance, plugin
         self.browser = browser.clone_browser()
         self.cover_url = self.amazon_id = self.isbn = None
-        self.domain = self.plugin.domain
+        self.domain = domain
 
         months = {
                 'de': {
@@ -199,7 +199,8 @@ class Worker(Thread): # Get details {{{
             return
 
         mi = Metadata(title, authors)
-        mi.set_identifier('amazon', asin)
+        idtype = 'amazon' if self.domain == 'com' else 'amazon_'+self.domain
+        mi.set_identifier(idtype, asin)
         self.amazon_id = asin
 
         try:
@@ -404,12 +405,30 @@ class Amazon(Source):
                     'country\'s Amazon website.'), choices=AMAZON_DOMAINS),
             )
 
+    def get_domain_and_asin(self, identifiers):
+        for key, val in identifiers.iteritems():
+            key = key.lower()
+            if key in ('amazon', 'asin'):
+                return 'com', val
+            if key.startswith('amazon_'):
+                domain = key.split('_')[-1]
+                if domain and domain in self.AMAZON_DOMAINS:
+                    return domain, val
+        return None, None
+
     def get_book_url(self, identifiers): # {{{
-        asin = identifiers.get('amazon', None)
+        domain, asin = self.get_domain_and_asin(identifiers)
-        if asin is None:
+        if domain and asin:
-            asin = identifiers.get('asin', None)
+            url = None
-        if asin:
+            if domain == 'com':
-            return ('amazon', asin, 'http://amzn.com/%s'%asin)
+                url = 'http://amzn.com/'+asin
+            elif domain == 'uk':
+                url = 'http://www.amazon.co.uk/dp/'+asin
+            else:
+                url = 'http://www.amazon.%s/dp/%s'%(domain, asin)
+            if url:
+                idtype = 'amazon' if self.domain == 'com' else 'amazon_'+self.domain
+                return (idtype, asin, url)
     # }}}
 
     @property
@@ -420,8 +439,14 @@ class Amazon(Source):
 
         return domain
 
-    def create_query(self, log, title=None, authors=None, identifiers={}): # {{{
+    def create_query(self, log, title=None, authors=None, identifiers={}, # {{{
-        domain = self.domain
+            domain=None):
+        if domain is None:
+            domain = self.domain
+
+        idomain, asin = self.get_domain_and_asin(identifiers)
+        if idomain is not None:
+            domain = idomain
 
         # See the amazon detailed search page to get all options
         q = {   'search-alias' : 'aps',
@@ -433,7 +458,6 @@ class Amazon(Source):
         else:
             q['sort'] = 'relevancerank'
 
-        asin = identifiers.get('amazon', None)
         isbn = check_isbn(identifiers.get('isbn', None))
 
         if asin is not None:
@@ -456,23 +480,22 @@ class Amazon(Source):
         if not ('field-keywords' in q or 'field-isbn' in q or
                 ('field-title' in q)):
             # Insufficient metadata to make an identify query
-            return None
+            return None, None
 
         latin1q = dict([(x.encode('latin1', 'ignore'), y.encode('latin1',
             'ignore')) for x, y in
             q.iteritems()])
+        udomain = domain
         if domain == 'uk':
-            domain = 'co.uk'
+            udomain = 'co.uk'
-        url = 'http://www.amazon.%s/s/?'%domain + urlencode(latin1q)
+        url = 'http://www.amazon.%s/s/?'%udomain + urlencode(latin1q)
-        return url
+        return url, domain
 
     # }}}
 
     def get_cached_cover_url(self, identifiers): # {{{
         url = None
-        asin = identifiers.get('amazon', None)
+        domain, asin = self.get_domain_and_asin(identifiers)
-        if asin is None:
-            asin = identifiers.get('asin', None)
         if asin is None:
             isbn = identifiers.get('isbn', None)
             if isbn is not None:
@@ -489,7 +512,7 @@ class Amazon(Source):
         Note this method will retry without identifiers automatically if no
         match is found with identifiers.
         '''
-        query = self.create_query(log, title=title, authors=authors,
+        query, domain = self.create_query(log, title=title, authors=authors,
                 identifiers=identifiers)
         if query is None:
             log.error('Insufficient metadata to construct query')
@@ -571,7 +594,7 @@ class Amazon(Source):
             log.error('No matches found with query: %r'%query)
             return
 
-        workers = [Worker(url, result_queue, br, log, i, self) for i, url in
+        workers = [Worker(url, result_queue, br, log, i, domain, self) for i, url in
                 enumerate(matches)]
 
         for w in workers:

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

@@ -211,7 +211,10 @@ class Douban(Source):
                     'q': q,
                     })
         if self.DOUBAN_API_KEY and self.DOUBAN_API_KEY != '':
-            url = url + "?apikey=" + self.DOUBAN_API_KEY
+            if t == "isbn" or t == "subject":
+                url = url + "?apikey=" + self.DOUBAN_API_KEY
+            else:
+                url = url + "&apikey=" + self.DOUBAN_API_KEY
         return url
     # }}}
 

src/calibre/ebooks/mobi/mobiml.py

@@ -297,9 +297,11 @@ class MobiMLizer(object):
             if id_:
                 # Keep anchors so people can use display:none
                 # to generate hidden TOCs
+                tail = elem.tail
                 elem.clear()
                 elem.text = None
                 elem.set('id', id_)
+                elem.tail = tail
             else:
                 return
         tag = barename(elem.tag)
@@ -309,7 +311,8 @@ class MobiMLizer(object):
         istates.append(istate)
         left = 0
         display = style['display']
-        isblock = not display.startswith('inline')
+        isblock = (not display.startswith('inline') and style['display'] !=
+                'none')
         isblock = isblock and style['float'] == 'none'
         isblock = isblock and tag != 'br'
         if isblock:

src/calibre/gui2/actions/store.py

@@ -34,6 +34,8 @@ class StoreAction(InterfaceAction):
         self.store_list_menu = self.store_menu.addMenu(_('Stores'))
         for n, p in sorted(self.gui.istores.items(), key=lambda x: x[0].lower()):
             self.store_list_menu.addAction(n, partial(self.open_store, p))
+        self.store_menu.addSeparator()
+        self.store_menu.addAction(_('Choose stores'), self.choose)
         self.qaction.setMenu(self.store_menu)
 
     def do_search(self):
@@ -42,7 +44,7 @@ class StoreAction(InterfaceAction):
     def search(self, query=''):
         self.show_disclaimer()
         from calibre.gui2.store.search.search import SearchDialog
-        sd = SearchDialog(self.gui.istores, self.gui, query)
+        sd = SearchDialog(self.gui, self.gui, query)
         sd.exec_()
 
     def _get_selected_row(self):
@@ -107,6 +109,13 @@ class StoreAction(InterfaceAction):
         query = 'author:"%s" title:"%s"' % (self._get_author(row), self._get_title(row))
         self.search(query)
 
+    def choose(self):
+        from calibre.gui2.store.config.chooser.chooser_dialog import StoreChooserDialog
+        d = StoreChooserDialog(self.gui)
+        d.exec_()
+        self.gui.load_store_plugins()
+        self.load_menu()
+
     def open_store(self, store_plugin):
         self.show_disclaimer()
         store_plugin.open(self.gui)

src/calibre/gui2/dialogs/scheduler.py

@@ -207,8 +207,9 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self.recipe_model.searched.connect(self.search.search_done,
                 type=Qt.QueuedConnection)
         self.recipe_model.searched.connect(self.search_done)
-        self.search.setFocus(Qt.OtherFocusReason)
+        self.recipes.setFocus(Qt.OtherFocusReason)
         self.commit_on_change = True
+        self.previous_urn = None
 
         self.recipes.setModel(self.recipe_model)
         self.detail_box.setVisible(False)
@@ -228,6 +229,9 @@ class SchedulerDialog(QDialog, Ui_Dialog):
 
         self.old_news.setValue(gconf['oldest_news'])
 
+        self.go_button.clicked.connect(self.search.do_search)
+        self.clear_search_button.clicked.connect(self.search.clear_clicked)
+
     def set_pw_echo_mode(self, state):
         self.password.setEchoMode(self.password.Normal
                 if state == Qt.Checked else self.password.Password)
@@ -265,14 +269,9 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self.last_downloaded.setVisible(enabled)
 
     def current_changed(self, current, previous):
-        if self.commit_on_change:
+        if self.previous_urn is not None:
-            if previous.isValid():
+            self.commit(urn=self.previous_urn)
-                if not self.commit(urn=getattr(previous.internalPointer(),
+            self.previous_urn = None
-                    'urn', None)):
-                    self.commit_on_change = False
-                    self.recipes.setCurrentIndex(previous)
-        else:
-            self.commit_on_change = True
 
         urn = self.current_urn
         if urn is not None:
@@ -332,6 +331,7 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         return True
 
     def initialize_detail_box(self, urn):
+        self.previous_urn = urn
         self.detail_box.setVisible(True)
         self.download_button.setVisible(True)
         self.detail_box.setCurrentIndex(0)

src/calibre/gui2/dialogs/scheduler.ui

@@ -17,21 +17,30 @@
    <iconset resource="../../../../resources/images.qrc">
     <normaloff>:/images/scheduler.png</normaloff>:/images/scheduler.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,2">
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label_8">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="text">
+     <item>
-      <string>&amp;Search:</string>
+      <widget class="SearchBox2" name="search"/>
-     </property>
+     </item>
-     <property name="buddy">
+     <item>
-      <cstring>search</cstring>
+      <widget class="QToolButton" name="go_button">
-     </property>
+       <property name="text">
-    </widget>
+        <string>Go</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="clear_search_button">
+       <property name="icon">
+        <iconset resource="../../../../resources/images.qrc">
+         <normaloff>:/images/clear_left.png</normaloff>:/images/clear_left.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="1">
+   <item row="0" column="1" rowspan="2">
-    <widget class="SearchBox2" name="search"/>
-   </item>
-   <item row="0" column="2" rowspan="3">
     <widget class="QScrollArea" name="scrollArea">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -44,7 +53,7 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>486</width>
+        <width>524</width>
         <height>504</height>
        </rect>
       </property>
@@ -320,7 +329,7 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <widget class="QTreeView" name="recipes">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
@@ -345,7 +354,17 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="2">
+   <item row="2" column="0">
+    <widget class="QLabel" name="count_label">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
       <widget class="QLabel" name="label_7">
@@ -376,17 +395,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="2">
+   <item row="3" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Save</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
     <widget class="QPushButton" name="download_all_button">
      <property name="toolTip">
       <string>Download all scheduled news sources at once</string>
@@ -394,15 +403,19 @@
      <property name="text">
       <string>Download &amp;all scheduled</string>
      </property>
+     <property name="icon">
+      <iconset resource="../../../../resources/images.qrc">
+       <normaloff>:/images/news.png</normaloff>:/images/news.png</iconset>
+     </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="3" column="1">
-    <widget class="QLabel" name="count_label">
+    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="text">
+     <property name="orientation">
-      <string/>
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="alignment">
+     <property name="standardButtons">
-      <set>Qt::AlignCenter</set>
+      <set>QDialogButtonBox::Save</set>
      </property>
     </widget>
    </item>

src/calibre/gui2/dialogs/template_dialog.py

@@ -5,10 +5,193 @@ __license__   = 'GPL v3'
 
 import json
 
-from PyQt4.Qt import Qt, QDialog, QDialogButtonBox
+from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QSyntaxHighlighter,
+                      QRegExp, QApplication,
+                      QTextCharFormat, QFont, QColor, QCursor)
+
 from calibre.gui2.dialogs.template_dialog_ui import Ui_TemplateDialog
 from calibre.utils.formatter_functions import formatter_functions
 
+class ParenPosition:
+
+    def __init__(self, block, pos, paren):
+        self.block = block
+        self.pos = pos
+        self.paren = paren
+        self.highlight = False
+
+    def set_highlight(self, to_what):
+        self.highlight = to_what
+
+class TemplateHighlighter(QSyntaxHighlighter):
+
+    Config = {}
+    Rules = []
+    Formats = {}
+    BN_FACTOR = 1000
+
+    KEYWORDS = ["program"]
+
+    def __init__(self, parent=None):
+        super(TemplateHighlighter, self).__init__(parent)
+
+        self.initializeFormats()
+
+        TemplateHighlighter.Rules.append((QRegExp(
+                "|".join([r"\b%s\b" % keyword for keyword in self.KEYWORDS])),
+                "keyword"))
+        TemplateHighlighter.Rules.append((QRegExp(
+                "|".join([r"\b%s\b" % builtin for builtin in
+                          formatter_functions.get_builtins()])),
+                "builtin"))
+
+        TemplateHighlighter.Rules.append((QRegExp(
+                r"\b[+-]?[0-9]+[lL]?\b"
+                r"|\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b"
+                r"|\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b"),
+                "number"))
+
+        stringRe = QRegExp(r"""(?:[^:]'[^']*'|"[^"]*")""")
+        stringRe.setMinimal(True)
+        TemplateHighlighter.Rules.append((stringRe, "string"))
+
+        lparenRe = QRegExp(r'\(')
+        lparenRe.setMinimal(True)
+        TemplateHighlighter.Rules.append((lparenRe, "lparen"))
+        rparenRe = QRegExp(r'\)')
+        rparenRe.setMinimal(True)
+        TemplateHighlighter.Rules.append((rparenRe, "rparen"))
+
+        self.regenerate_paren_positions()
+        self.highlighted_paren = False
+
+    def initializeFormats(self):
+        Config = self.Config
+        Config["fontfamily"] = "monospace"
+        #Config["fontsize"] = 10
+        for name, color, bold, italic in (
+                ("normal", "#000000", False, False),
+                ("keyword", "#000080", True, False),
+                ("builtin", "#0000A0", False, False),
+                ("comment", "#007F00", False, True),
+                ("string", "#808000", False, False),
+                ("number", "#924900", False, False),
+                ("lparen", "#000000", True, True),
+                ("rparen", "#000000", True, True)):
+            Config["%sfontcolor" % name] = color
+            Config["%sfontbold" % name] = bold
+            Config["%sfontitalic" % name] = italic
+
+        baseFormat = QTextCharFormat()
+        baseFormat.setFontFamily(Config["fontfamily"])
+        #baseFormat.setFontPointSize(Config["fontsize"])
+
+        for name in ("normal", "keyword", "builtin", "comment",
+                     "string", "number", "lparen", "rparen"):
+            format = QTextCharFormat(baseFormat)
+            format.setForeground(QColor(Config["%sfontcolor" % name]))
+            if Config["%sfontbold" % name]:
+                format.setFontWeight(QFont.Bold)
+            format.setFontItalic(Config["%sfontitalic" % name])
+            self.Formats[name] = format
+
+    def find_paren(self, bn, pos):
+        dex = bn * self.BN_FACTOR + pos
+        return self.paren_pos_map.get(dex, None)
+
+    def highlightBlock(self, text):
+        bn = self.currentBlock().blockNumber()
+        textLength = text.length()
+
+        self.setFormat(0, textLength, self.Formats["normal"])
+
+        if text.isEmpty():
+            pass
+        elif text[0] == "#":
+            self.setFormat(0, text.length(), self.Formats["comment"])
+            return
+
+        for regex, format in TemplateHighlighter.Rules:
+            i = regex.indexIn(text)
+            while i >= 0:
+                length = regex.matchedLength()
+                if format in ['lparen', 'rparen']:
+                    pp = self.find_paren(bn, i)
+                    if pp and pp.highlight:
+                        self.setFormat(i, length, self.Formats[format])
+                else:
+                    self.setFormat(i, length, self.Formats[format])
+                i = regex.indexIn(text, i + length)
+
+        if self.generate_paren_positions:
+            t = unicode(text)
+            i = 0
+            foundQuote = False
+            while i < len(t):
+                c = t[i]
+                if c == ':':
+                    # Deal with the funky syntax of template program mode.
+                    # This won't work if there are more than one template
+                    # expression in the document.
+                    if not foundQuote and i+1 < len(t) and t[i+1] == "'":
+                        i += 2
+                elif c in ["'", '"']:
+                    foundQuote = True
+                    i += 1
+                    j = t[i:].find(c)
+                    if j < 0:
+                        i = len(t)
+                    else:
+                        i = i + j
+                elif c in ['(', ')']:
+                    pp = ParenPosition(bn, i, c)
+                    self.paren_positions.append(pp)
+                    self.paren_pos_map[bn*self.BN_FACTOR+i] = pp
+                i += 1
+
+    def rehighlight(self):
+        QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+        QSyntaxHighlighter.rehighlight(self)
+        QApplication.restoreOverrideCursor()
+
+    def check_cursor_pos(self, chr, block, pos_in_block):
+        found_pp = -1
+        for i, pp in enumerate(self.paren_positions):
+            pp.set_highlight(False)
+            if pp.block == block and pp.pos == pos_in_block:
+                found_pp = i
+
+        if chr not in ['(', ')']:
+            if self.highlighted_paren:
+                self.rehighlight()
+                self.highlighted_paren = False
+            return
+
+        if found_pp >= 0:
+            stack = 0
+            if chr == '(':
+                list = self.paren_positions[found_pp+1:]
+            else:
+                list = reversed(self.paren_positions[0:found_pp])
+            for pp in list:
+                if pp.paren == chr:
+                    stack += 1;
+                elif stack:
+                    stack -= 1
+                else:
+                    pp.set_highlight(True)
+                    self.paren_positions[found_pp].set_highlight(True)
+                    break
+        self.highlighted_paren = True
+        self.rehighlight()
+
+    def regenerate_paren_positions(self):
+        self.generate_paren_positions = True
+        self.paren_positions = []
+        self.paren_pos_map = {}
+        self.rehighlight()
+        self.generate_paren_positions = False
+
 class TemplateDialog(QDialog, Ui_TemplateDialog):
 
     def __init__(self, parent, text):
@@ -20,6 +203,11 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
         self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
         self.setWindowIcon(icon)
 
+        self.last_text = ''
+        self.highlighter = TemplateHighlighter(self.textbox.document())
+        self.textbox.cursorPositionChanged.connect(self.text_cursor_changed)
+        self.textbox.textChanged.connect(self.textbox_changed)
+
         self.textbox.setTabStopWidth(10)
         self.source_code.setTabStopWidth(10)
         self.documentation.setReadOnly(True)
@@ -46,6 +234,22 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
         self.function.setCurrentIndex(0)
         self.function.currentIndexChanged[str].connect(self.function_changed)
 
+    def textbox_changed(self):
+        cur_text = unicode(self.textbox.toPlainText())
+        if self.last_text != cur_text:
+            self.last_text = cur_text
+            self.highlighter.regenerate_paren_positions()
+
+    def text_cursor_changed(self):
+        cursor = self.textbox.textCursor()
+        block_number = cursor.blockNumber()
+        pos_in_block = cursor.positionInBlock()
+        position = cursor.position()
+        t = unicode(self.textbox.toPlainText())
+        if position < len(t):
+            self.highlighter.check_cursor_pos(t[position], block_number,
+                                              pos_in_block)
+
     def function_changed(self, toWhat):
         name = unicode(toWhat)
         self.source_code.clear()

src/calibre/gui2/dialogs/template_line_editor.py

@@ -5,8 +5,12 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from PyQt4.Qt import QLineEdit
+from PyQt4.Qt import (QLineEdit, QDialog, QGridLayout, QLabel,
+                      QDialogButtonBox, QColor, QComboBox, QIcon)
+
 from calibre.gui2.dialogs.template_dialog import TemplateDialog
+from calibre.gui2.complete import MultiCompleteLineEdit
+from calibre.gui2 import error_dialog
 
 class TemplateLineEditor(QLineEdit):
 
@@ -14,13 +18,22 @@ class TemplateLineEditor(QLineEdit):
     Extend the context menu of a QLineEdit to include more actions.
     '''
 
+    def __init__(self, parent):
+        QLineEdit.__init__(self, parent)
+        self.tags = None
+
+    def set_tags(self, tags):
+        self.tags = tags
+
     def contextMenuEvent(self, event):
         menu = self.createStandardContextMenu()
         menu.addSeparator()
 
         action_open_editor = menu.addAction(_('Open Template Editor'))
-
         action_open_editor.triggered.connect(self.open_editor)
+        if self.tags:
+            action_tag_wizard = menu.addAction(_('Open Tag Wizard'))
+            action_tag_wizard.triggered.connect(self.tag_wizard)
         menu.exec_(event.globalPos())
 
     def open_editor(self):
@@ -29,4 +42,91 @@ class TemplateLineEditor(QLineEdit):
         if t.exec_():
             self.setText(t.textbox.toPlainText())
 
+    def tag_wizard(self):
+        txt = unicode(self.text())
+        if txt and not txt.startswith('program:\n#tag wizard'):
+            error_dialog(self, _('Invalid text'),
+                 _('The text in the box was not generated by this wizard'),
+                 show=True, show_copy_button=False)
+            return
+        d = TagWizard(self, self.tags, unicode(self.text()))
+        if d.exec_():
+            self.setText(d.template)
 
+class TagWizard(QDialog):
+
+    def __init__(self, parent, tags, txt):
+        QDialog.__init__(self, parent)
+        self.setWindowTitle(_('Tag Wizard'))
+        self.setWindowIcon(QIcon(I('wizard.png')))
+
+        self.tags = tags
+        l = QGridLayout()
+        self.setLayout(l)
+        l.setColumnStretch(0, 1)
+        l.setColumnMinimumWidth(0, 300)
+        l.addWidget(QLabel(_('Tags (more than one per box permitted)')), 0, 0, 1, 1)
+        l.addWidget(QLabel(_('Color')), 0, 1, 1, 1)
+        self.tagboxes = []
+        self.colorboxes = []
+        self.colors = [unicode(s) for s in list(QColor.colorNames())]
+        self.colors.insert(0, '')
+        for i in range(0, 10):
+            tb = MultiCompleteLineEdit(self)
+            tb.set_separator(', ')
+            tb.update_items_cache(self.tags)
+            self.tagboxes.append(tb)
+            l.addWidget(tb, i+1, 0, 1, 1)
+            cb = QComboBox(self)
+            cb.addItems(self.colors)
+            self.colorboxes.append(cb)
+            l.addWidget(cb, i+1, 1, 1, 1)
+
+        if txt:
+            lines = txt.split('\n')[3:]
+            i = 0
+            for line in lines:
+                if line.startswith('#'):
+                    t,c = line[1:].split(':|:')
+                    try:
+                        self.colorboxes[i].setCurrentIndex(self.colorboxes[i].findText(c))
+                        self.tagboxes[i].setText(t)
+                    except:
+                        pass
+                    i += 1
+
+        bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel, parent=self)
+        l.addWidget(bb, 100, 1, 1, 1)
+        bb.accepted.connect(self.accepted)
+        bb.rejected.connect(self.reject)
+        self.template = ''
+
+    def accepted(self):
+        res = ("program:\n#tag wizard -- do not directly edit\n"
+               "  t = field('tags');\n  first_non_empty(\n")
+        lines = []
+        for tb, cb in zip(self.tagboxes, self.colorboxes):
+            tags = [t.strip() for t in unicode(tb.text()).split(',') if t.strip()]
+            tags = '$|^'.join(tags)
+            c = unicode(cb.currentText()).strip()
+            if not tags or not c:
+                continue
+            if c not in self.colors:
+                error_dialog(self, _('Invalid color'),
+                             _('The color {0} is not valid').format(c),
+                             show=True, show_copy_button=False)
+                return False
+            lines.append("    in_list(t, ',', '^{0}$', '{1}', '')".format(tags, c))
+        res += ',\n'.join(lines)
+        res += ')\n'
+        self.template = res
+        res = ''
+        for tb, cb in zip(self.tagboxes, self.colorboxes):
+            t = unicode(tb.text()).strip()
+            if t.endswith(','):
+                t = t[:-1]
+            c = unicode(cb.currentText()).strip()
+            if t and c:
+                res += '#' + t + ':|:' + c  + '\n'
+        self.template += res
+        self.accept()

src/calibre/gui2/library/models.py

@@ -98,6 +98,7 @@ class BooksModel(QAbstractTableModel): # {{{
         self.current_highlighted_idx = None
         self.highlight_only = False
         self.column_color_map = {}
+        self.colors = [unicode(c) for c in QColor.colorNames()]
         self.read_config()
 
     def change_alignment(self, colname, alignment):
@@ -714,9 +715,11 @@ class BooksModel(QAbstractTableModel): # {{{
                 mi = self.db.get_metadata(self.id(index), index_is_id=True)
                 fmt = self.column_color_map[key]
                 try:
-                    color = QColor(composite_formatter.safe_format(fmt, mi, '', mi))
+                    color = composite_formatter.safe_format(fmt, mi, '', mi)
-                    if color.isValid():
+                    if color in self.colors:
-                        return QVariant(color)
+                        color = QColor(color)
+                        if color.isValid():
+                            return QVariant(color)
                 except:
                     return NONE
             elif self.is_custom_column(key) and \

src/calibre/gui2/metadata/basic_widgets.py

@@ -88,11 +88,22 @@ class TitleEdit(EnLineEdit):
 
     def commit(self, db, id_):
         title = self.current_val
-        if self.COMMIT:
+        try:
-            getattr(db, 'set_'+ self.TITLE_ATTR)(id_, title, notify=False)
+            if self.COMMIT:
-        else:
+                getattr(db, 'set_'+ self.TITLE_ATTR)(id_, title, notify=False)
-            getattr(db, 'set_'+ self.TITLE_ATTR)(id_, title, notify=False,
+            else:
-                    commit=False)
+                getattr(db, 'set_'+ self.TITLE_ATTR)(id_, title, notify=False,
+                        commit=False)
+        except (IOError, OSError) as err:
+            if getattr(err, 'errno', -1) == 13: # Permission denied
+                import traceback
+                fname = err.filename if err.filename else 'file'
+                error_dialog(self, _('Permission denied'),
+                        _('Could not open %s. Is it being used by another'
+                        ' program?')%fname, det_msg=traceback.format_exc(),
+                        show=True)
+                return False
+            raise
         return True
 
     @dynamic_property
@@ -225,8 +236,19 @@ class AuthorsEdit(MultiCompleteComboBox):
 
     def commit(self, db, id_):
         authors = self.current_val
-        self.books_to_refresh |= db.set_authors(id_, authors, notify=False,
+        try:
+            self.books_to_refresh |= db.set_authors(id_, authors, notify=False,
                 allow_case_change=True)
+        except (IOError, OSError) as err:
+            if getattr(err, 'errno', -1) == 13: # Permission denied
+                import traceback
+                fname = err.filename if err.filename else 'file'
+                error_dialog(self, _('Permission denied'),
+                        _('Could not open %s. Is it being used by another'
+                        ' program?')%fname, det_msg=traceback.format_exc(),
+                        show=True)
+                return False
+            raise
         return True
 
     @dynamic_property

src/calibre/gui2/preferences/look_feel.py

@@ -167,6 +167,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                   '<a href="http://calibre-ebook.com/user_manual/template_lang.html">'
                   'tutorial</a> on using templates.') +
                  '</p><p>' +
+                _('If you want to color a field based on tags, then click the '
+                  'button next to an empty line to open the tags wizard. '
+                  'It will build a template for you. You can later edit that '
+                  'template with the same wizard. If you edit it by hand, the '
+                  'wizard might not work or might restore old values.') +
+                 '</p><p>' +
                 _('The template must evaluate to one of the color names shown '
                   'below. You can use any legal template expression. '
                   'For example, you can set the title to always display in '
@@ -198,9 +204,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         choices.sort(key=sort_key)
         choices.insert(0, '')
         self.column_color_count = db.column_color_count+1
+        tags = db.all_tags()
         for i in range(1, self.column_color_count):
             r('column_color_name_'+str(i), db.prefs, choices=choices)
             r('column_color_template_'+str(i), db.prefs)
+            tpl = getattr(self, 'opt_column_color_template_'+str(i))
+            tpl.set_tags(tags)
+            toolbutton = getattr(self, 'opt_column_color_wizard_'+str(i))
+            toolbutton.clicked.connect(tpl.tag_wizard)
         all_colors = [unicode(s) for s in list(QColor.colorNames())]
         self.colors_box.setText(', '.join(all_colors))
 
@@ -273,9 +284,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
     def commit(self, *args):
         for i in range(1, self.column_color_count):
             col = getattr(self, 'opt_column_color_name_'+str(i))
-            if not col.currentText():
+            tpl = getattr(self, 'opt_column_color_template_'+str(i))
-                temp = getattr(self, 'opt_column_color_template_'+str(i))
+            if not col.currentIndex() or not unicode(tpl.text()).strip():
-                temp.setText('')
+                col.setCurrentIndex(0)
+                tpl.setText('')
         rr = ConfigWidgetBase.commit(self, *args)
         if self.current_font != self.initial_font:
             gprefs['font'] = (self.current_font[:4] if self.current_font else

src/calibre/gui2/preferences/look_feel.ui

@@ -419,14 +419,14 @@ then the tags will be displayed each on their own line.</string>
        <item row="1" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Column name</string>
+          <string>Column to color</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Selection template</string>
+          <string>Color selection template</string>
          </property>
         </widget>
        </item>
@@ -436,30 +436,85 @@ then the tags will be displayed each on their own line.</string>
        <item row="2" column="1">
         <widget class="TemplateLineEditor" name="opt_column_color_template_1"/>
        </item>
+       <item row="2" column="2">
+        <widget class="QToolButton" name="opt_column_color_wizard_1">
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+         </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="0">
         <widget class="QComboBox" name="opt_column_color_name_2"/>
        </item>
        <item row="3" column="1">
         <widget class="TemplateLineEditor" name="opt_column_color_template_2"/>
        </item>
+       <item row="3" column="2">
+        <widget class="QToolButton" name="opt_column_color_wizard_2">
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+         </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
+        </widget>
+       </item>
        <item row="4" column="0">
         <widget class="QComboBox" name="opt_column_color_name_3"/>
        </item>
        <item row="4" column="1">
         <widget class="TemplateLineEditor" name="opt_column_color_template_3"/>
        </item>
+       <item row="4" column="2">
+        <widget class="QToolButton" name="opt_column_color_wizard_3">
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+         </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
+        </widget>
+       </item>
        <item row="5" column="0">
         <widget class="QComboBox" name="opt_column_color_name_4"/>
        </item>
        <item row="5" column="1">
         <widget class="TemplateLineEditor" name="opt_column_color_template_4"/>
        </item>
+       <item row="5" column="2">
+        <widget class="QToolButton" name="opt_column_color_wizard_4">
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+         </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
+        </widget>
+       </item>
        <item row="6" column="0">
         <widget class="QComboBox" name="opt_column_color_name_5"/>
        </item>
        <item row="6" column="1">
         <widget class="TemplateLineEditor" name="opt_column_color_template_5"/>
        </item>
+       <item row="6" column="2">
+        <widget class="QToolButton" name="opt_column_color_wizard_5">
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
+         </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
+        </widget>
+       </item>
        <item row="20" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
@@ -467,7 +522,7 @@ then the tags will be displayed each on their own line.</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="2">
+       <item row="0" column="0" colspan="3">
         <widget class="QScrollArea" name="scrollArea">
          <property name="minimumSize">
           <size>
@@ -505,7 +560,7 @@ then the tags will be displayed each on their own line.</string>
          </widget>
         </widget>
        </item>
-       <item row="21" column="0" colspan="2">
+       <item row="21" column="0" colspan="3">
         <widget class="QScrollArea" name="scrollArea_2">
          <property name="maximumSize">
           <size>

src/calibre/gui2/store/amazon_de_plugin.py

@@ -16,7 +16,7 @@ class AmazonDEKindleStore(AmazonKindleStore):
     For comments on the implementation, please see amazon_plugin.py
     '''
 
-    search_url = 'http://www.amazon.de/s/url=search-alias%3Ddigital-text&field-keywords='
+    search_url = 'http://www.amazon.de/s/?url=search-alias%3Ddigital-text&field-keywords='
     details_url = 'http://amazon.de/dp/'
     drm_search_text = u'Gleichzeitige Verwendung von Geräten'
     drm_free_text = u'Keine Einschränkung'

src/calibre/gui2/store/amazon_uk_plugin.py

@@ -17,7 +17,7 @@ class AmazonUKKindleStore(AmazonKindleStore):
     For comments on the implementation, please see amazon_plugin.py
     '''
 
-    search_url = 'http://www.amazon.co.uk/s/url=search-alias%3Ddigital-text&field-keywords='
+    search_url = 'http://www.amazon.co.uk/s/?url=search-alias%3Ddigital-text&field-keywords='
     details_url = 'http://amazon.co.uk/dp/'
 
     def open(self, parent=None, detail_item=None, external=False):

src/calibre/gui2/store/config/chooser/adv_search_builder.py

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+
+from PyQt4.Qt import (QDialog, QDialogButtonBox)
+
+from calibre.gui2.store.config.chooser.adv_search_builder_ui import Ui_Dialog
+from calibre.library.caches import CONTAINS_MATCH, EQUALS_MATCH
+
+class AdvSearchBuilderDialog(QDialog, Ui_Dialog):
+
+    def __init__(self, parent):
+        QDialog.__init__(self, parent)
+        self.setupUi(self)
+        
+        self.buttonBox.accepted.connect(self.advanced_search_button_pushed)
+        self.tab_2_button_box.accepted.connect(self.accept)
+        self.tab_2_button_box.rejected.connect(self.reject)
+        self.clear_button.clicked.connect(self.clear_button_pushed)
+        self.adv_search_used = False
+        self.mc = ''
+        
+        self.tabWidget.setCurrentIndex(0)
+        self.tabWidget.currentChanged[int].connect(self.tab_changed)
+        self.tab_changed(0)
+        
+    def tab_changed(self, idx):
+        if idx == 1:
+            self.tab_2_button_box.button(QDialogButtonBox.Ok).setDefault(True)
+        else:
+            self.buttonBox.button(QDialogButtonBox.Ok).setDefault(True)
+
+    def advanced_search_button_pushed(self):
+        self.adv_search_used = True
+        self.accept()
+
+    def clear_button_pushed(self):
+        self.name_box.setText('')
+        self.description_box.setText('')
+        self.headquarters_box.setText('')
+        self.format_box.setText('')
+        self.enabled_combo.setIndex(0)
+        self.drm_combo.setIndex(0)
+
+    def tokens(self, raw):
+        phrases = re.findall(r'\s*".*?"\s*', raw)
+        for f in phrases:
+            raw = raw.replace(f, ' ')
+        phrases = [t.strip('" ') for t in phrases]
+        return ['"' + self.mc + t + '"' for t in phrases + [r.strip() for r in raw.split()]]
+
+    def search_string(self):
+        if self.adv_search_used:
+            return self.adv_search_string()
+        else:
+            return self.box_search_string()
+
+    def adv_search_string(self):
+        mk = self.matchkind.currentIndex()
+        if mk == CONTAINS_MATCH:
+            self.mc = ''
+        elif mk == EQUALS_MATCH:
+            self.mc = '='
+        else:
+            self.mc = '~'
+        all, any, phrase, none = map(lambda x: unicode(x.text()),
+                (self.all, self.any, self.phrase, self.none))
+        all, any, none = map(self.tokens, (all, any, none))
+        phrase = phrase.strip()
+        all = ' and '.join(all)
+        any = ' or '.join(any)
+        none = ' and not '.join(none)
+        ans = ''
+        if phrase:
+            ans += '"%s"'%phrase
+        if all:
+            ans += (' and ' if ans else '') + all
+        if none:
+            ans += (' and not ' if ans else 'not ') + none
+        if any:
+            ans += (' or ' if ans else '') + any
+        return ans
+
+    def token(self):
+        txt = unicode(self.text.text()).strip()
+        if txt:
+            if self.negate.isChecked():
+                txt = '!'+txt
+            tok = self.FIELDS[unicode(self.field.currentText())]+txt
+            if re.search(r'\s', tok):
+                tok = '"%s"'%tok
+            return tok
+
+    def box_search_string(self):
+        mk = self.matchkind.currentIndex()
+        if mk == CONTAINS_MATCH:
+            self.mc = ''
+        elif mk == EQUALS_MATCH:
+            self.mc = '='
+        else:
+            self.mc = '~'
+
+        ans = []
+        self.box_last_values = {}
+        name = unicode(self.name_box.text()).strip()
+        if name:
+            ans.append('name:"' + self.mc + name + '"')
+        description = unicode(self.description_box.text()).strip()
+        if description:
+            ans.append('description:"' + self.mc + description + '"')
+        headquarters = unicode(self.headquarters_box.text()).strip()
+        if headquarters:
+            ans.append('headquarters:"' + self.mc + headquarters + '"')
+        format = unicode(self.format_box.text()).strip()
+        if format:
+            ans.append('format:"' + self.mc + format + '"')
+        enabled = unicode(self.enabled_combo.currentText()).strip()
+        if enabled:
+            ans.append('enabled:' + enabled)
+        drm = unicode(self.drm_combo.currentText()).strip()
+        if drm:
+            ans.append('drm:' + drm)
+        if ans:
+            return ' and '.join(ans)
+        return ''

src/calibre/gui2/store/config/chooser/adv_search_builder.ui

@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>752</width>
+    <height>472</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Advanced Search</string>
+  </property>
+  <property name="windowIcon">
+   <iconset>
+    <normaloff>:/images/search.png</normaloff>:/images/search.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>&amp;What kind of match to use:</string>
+     </property>
+     <property name="buddy">
+      <cstring>matchkind</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="matchkind">
+     <item>
+      <property name="text">
+       <string>Contains: the word or phrase matches anywhere in the metadata field</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Equals: the word or phrase must match the entire metadata field</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Regular expression: the expression must match anywhere in the metadata field</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
+       <string>A&amp;dvanced Search</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Find entries that have...</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>&amp;All these words:</string>
+              </property>
+              <property name="buddy">
+               <cstring>all</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="all"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>This exact &amp;phrase:</string>
+              </property>
+              <property name="buddy">
+               <cstring>all</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="phrase"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>&amp;One or more of these words:</string>
+              </property>
+              <property name="buddy">
+               <cstring>all</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="any"/>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>But dont show entries that have...</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Any of these &amp;unwanted words:</string>
+              </property>
+              <property name="buddy">
+               <cstring>all</cstring>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="none"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_6">
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>30</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>See the &lt;a href=&quot;http://calibre-ebook.com/user_manual/gui.html#the-search-interface&quot;&gt;User Manual&lt;/a&gt; for more help</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="0">
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>Nam&amp;e/Description ...</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>&amp;Name:</string>
+         </property>
+         <property name="buddy">
+          <cstring>name_box</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="EnLineEdit" name="name_box">
+         <property name="toolTip">
+          <string>Enter the title.</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>&amp;Description:</string>
+         </property>
+         <property name="buddy">
+          <cstring>description_box</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="price_label">
+         <property name="text">
+          <string>&amp;Headquarters:</string>
+         </property>
+         <property name="buddy">
+          <cstring>headquarters_box</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="2">
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QPushButton" name="clear_button">
+           <property name="text">
+            <string>&amp;Clear</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDialogButtonBox" name="tab_2_button_box">
+           <property name="standardButtons">
+            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="7" column="1">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Search only in specific fields:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="EnLineEdit" name="description_box"/>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="format_box"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>&amp;Format:</string>
+         </property>
+         <property name="buddy">
+          <cstring>format_box</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="EnLineEdit" name="headquarters_box"/>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Enabled:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>DRM:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QComboBox" name="enabled_combo">
+         <item>
+          <property name="text">
+           <string/>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>true</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>false</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QComboBox" name="drm_combo">
+         <item>
+          <property name="text">
+           <string/>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>true</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>false</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EnLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>widgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>all</tabstop>
+  <tabstop>phrase</tabstop>
+  <tabstop>any</tabstop>
+  <tabstop>none</tabstop>
+  <tabstop>buttonBox</tabstop>
+  <tabstop>name_box</tabstop>
+  <tabstop>description_box</tabstop>
+  <tabstop>headquarters_box</tabstop>
+  <tabstop>format_box</tabstop>
+  <tabstop>clear_button</tabstop>
+  <tabstop>tab_2_button_box</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>matchkind</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../../../resources/images.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/calibre/gui2/store/config/chooser/chooser_dialog.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import (QDialog, QDialogButtonBox, QVBoxLayout)
+
+from calibre.gui2.store.config.chooser.chooser_widget import StoreChooserWidget
+
+class StoreChooserDialog(QDialog):
+    
+    def __init__(self, parent):
+        QDialog.__init__(self, parent)
+        
+        self.setWindowTitle(_('Choose stores'))
+        
+        button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        button_box.accepted.connect(self.accept)
+        button_box.rejected.connect(self.reject)
+        v = QVBoxLayout(self)
+        self.config_widget = StoreChooserWidget()
+        v.addWidget(self.config_widget)
+        v.addWidget(button_box)
+        
+        self.resize(800, 600)

src/calibre/gui2/store/config/chooser/chooser_widget.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import (QWidget, QIcon, QDialog)
+
+from calibre.gui2.store.config.chooser.adv_search_builder import AdvSearchBuilderDialog
+from calibre.gui2.store.config.chooser.chooser_widget_ui import Ui_Form
+
+class StoreChooserWidget(QWidget, Ui_Form):
+    
+    def __init__(self):
+        QWidget.__init__(self)
+        self.setupUi(self)
+        
+        self.adv_search_builder.setIcon(QIcon(I('search.png')))
+        
+        self.search.clicked.connect(self.do_search)
+        self.adv_search_builder.clicked.connect(self.build_adv_search)
+        self.results_view.activated.connect(self.toggle_plugin)
+
+    def do_search(self):
+        self.results_view.model().search(unicode(self.query.text()))
+
+    def toggle_plugin(self, index):
+        self.results_view.model().toggle_plugin(index)
+
+    def build_adv_search(self):
+        adv = AdvSearchBuilderDialog(self)
+        if adv.exec_() == QDialog.Accepted:
+            self.query.setText(adv.search_string())

src/calibre/gui2/store/config/chooser/chooser_widget.ui

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>610</width>
+    <height>553</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Query:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="adv_search_builder">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="query"/>
+     </item>
+     <item>
+      <widget class="QPushButton" name="search">
+       <property name="text">
+        <string>Search</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="ResultsView" name="results_view">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::SingleSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="itemsExpandable">
+      <bool>false</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="expandsOnDoubleClick">
+      <bool>false</bool>
+     </property>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ResultsView</class>
+   <extends>QTreeView</extends>
+   <header>results_view.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

src/calibre/gui2/store/config/chooser/models.py

@@ -0,0 +1,257 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import (Qt, QAbstractItemModel, QIcon, QVariant, QModelIndex)
+
+from calibre.gui2 import NONE
+from calibre.customize.ui import is_disabled, disable_plugin, enable_plugin
+from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
+    REGEXP_MATCH
+from calibre.utils.icu import sort_key
+from calibre.utils.search_query_parser import SearchQueryParser
+
+
+class Matches(QAbstractItemModel):
+
+    HEADERS = [_('Enabled'), _('Name'), _('No DRM'), _('Headquarters'), _('Formats')]
+    HTML_COLS = [1]
+
+    def __init__(self, plugins):
+        QAbstractItemModel.__init__(self)
+
+        self.NO_DRM_ICON = QIcon(I('ok.png'))
+
+        self.all_matches = plugins
+        self.matches = plugins
+        self.filter = ''
+        self.search_filter = SearchFilter(self.all_matches)
+
+        self.sort_col = 1
+        self.sort_order = Qt.AscendingOrder
+
+    def get_plugin(self, index):
+        row = index.row()
+        if row < len(self.matches):
+            return self.matches[row]
+        else:
+            return None
+
+    def search(self, filter):
+        self.filter = filter.strip()
+        if not self.filter:
+            self.matches = self.all_matches
+        else:
+            try:
+                self.matches = list(self.search_filter.parse(self.filter))
+            except:
+                self.matches = self.all_matches
+        self.layoutChanged.emit()
+        self.sort(self.sort_col, self.sort_order)
+
+    def toggle_plugin(self, index):
+        new_index = self.createIndex(index.row(), 0)
+        data = QVariant(is_disabled(self.get_plugin(index)))
+        self.setData(new_index, data, Qt.CheckStateRole)
+
+    def index(self, row, column, parent=QModelIndex()):
+        return self.createIndex(row, column)
+
+    def parent(self, index):
+        if not index.isValid() or index.internalId() == 0:
+            return QModelIndex()
+        return self.createIndex(0, 0)
+
+    def rowCount(self, *args):
+        return len(self.matches)
+
+    def columnCount(self, *args):
+        return len(self.HEADERS)
+
+    def headerData(self, section, orientation, role):
+        if role != Qt.DisplayRole:
+            return NONE
+        text = ''
+        if orientation == Qt.Horizontal:
+            if section < len(self.HEADERS):
+                text = self.HEADERS[section]
+            return QVariant(text)
+        else:
+            return QVariant(section+1)
+
+    def data(self, index, role):
+        row, col = index.row(), index.column()
+        result = self.matches[row]
+        if role in (Qt.DisplayRole, Qt.EditRole):
+            if col == 1:
+                return QVariant('<b>%s</b><br><i>%s</i>' % (result.name, result.description))
+            elif col == 3:
+                return QVariant(result.headquarters)
+            elif col == 4:
+                return QVariant(', '.join(result.formats).upper())
+        elif role == Qt.DecorationRole:
+            if col == 2:
+                if result.drm_free_only:
+                    return QVariant(self.NO_DRM_ICON)
+        elif role == Qt.CheckStateRole:
+            if col == 0:
+                if is_disabled(result):
+                    return Qt.Unchecked
+                return Qt.Checked
+        elif role == Qt.ToolTipRole:
+            if col == 0:
+                if is_disabled(result):
+                    return QVariant(_('<p>This store is currently diabled and cannot be used in other parts of calibre.</p>'))
+                else:
+                    return QVariant(_('<p>This store is currently enabled and can be used in other parts of calibre.</p>'))
+            elif col == 1:
+                return QVariant('<p>%s</p>' % result.description)
+            elif col == 2:
+                if result.drm_free_only:
+                    return QVariant(_('<p>This store only distributes ebooks with DRM.</p>'))
+                else:
+                    return QVariant(_('<p>This store distributes ebooks with DRM. It may have some titles without DRM, but you will need to check on a per title basis.</p>'))
+            elif col == 3:
+                return QVariant(_('<p>This store is headquartered in %s. This is a good indication of what market the store caters to. However, this does not necessarily mean that the store is limited to that market only.</p>') % result.headquarters)
+            elif col == 4:
+                return QVariant(_('<p>This store distributes ebooks in the following formats: %s</p>') % ', '.join(result.formats))
+        return NONE
+
+    def setData(self, index, data, role):
+        if not index.isValid():
+            return False
+        row, col = index.row(), index.column()
+        if col == 0:
+            if data.toBool():
+                enable_plugin(self.get_plugin(index))
+            else:
+                disable_plugin(self.get_plugin(index))
+        self.dataChanged.emit(self.index(index.row(), 0), self.index(index.row(), self.columnCount() - 1))
+        return True
+
+    def flags(self, index):
+        if index.column() == 0:
+            return QAbstractItemModel.flags(self, index) | Qt.ItemIsUserCheckable
+        return QAbstractItemModel.flags(self, index)
+
+    def data_as_text(self, match, col):
+        text = ''
+        if col == 0:
+            text = 'b' if is_disabled(match) else 'a'
+        elif col == 1:
+            text = match.name
+        elif col == 2:
+            text = 'a' if getattr(match, 'drm_free_only', True) else 'b'
+        elif col == 3:
+            text = getattr(match, 'headquarters', '')
+        return text
+
+    def sort(self, col, order, reset=True):
+        self.sort_col = col
+        self.sort_order = order
+        if not self.matches:
+            return
+        descending = order == Qt.DescendingOrder
+        self.matches.sort(None,
+            lambda x: sort_key(unicode(self.data_as_text(x, col))),
+            descending)
+        if reset:
+            self.reset()
+
+
+class SearchFilter(SearchQueryParser):
+
+    USABLE_LOCATIONS = [
+        'all',
+        'description',
+        'drm',
+        'enabled',
+        'format',
+        'formats',
+        'headquarters',
+        'name',
+    ]
+
+    def __init__(self, all_plugins=[]):
+        SearchQueryParser.__init__(self, locations=self.USABLE_LOCATIONS)
+        self.srs = set(all_plugins)
+
+    def universal_set(self):
+        return self.srs
+
+    def get_matches(self, location, query):
+        location = location.lower().strip()
+        if location == 'formats':
+            location = 'format'
+
+        matchkind = CONTAINS_MATCH
+        if len(query) > 1:
+            if query.startswith('\\'):
+                query = query[1:]
+            elif query.startswith('='):
+                matchkind = EQUALS_MATCH
+                query = query[1:]
+            elif query.startswith('~'):
+                matchkind = REGEXP_MATCH
+                query = query[1:]
+        if matchkind != REGEXP_MATCH: ### leave case in regexps because it can be significant e.g. \S \W \D
+            query = query.lower()
+
+        if location not in self.USABLE_LOCATIONS:
+            return set([])
+        matches = set([])
+        all_locs = set(self.USABLE_LOCATIONS) - set(['all'])
+        locations = all_locs if location == 'all' else [location]
+        q = {
+             'description': lambda x: x.description.lower(),
+             'drm': lambda x: not x.drm_free_only,
+             'enabled': lambda x: not is_disabled(x),
+             'format': lambda x: ','.join(x.formats).lower(),
+             'headquarters': lambda x: x.headquarters.lower(),
+             'name': lambda x : x.name.lower(),
+        }
+        q['formats'] = q['format']
+        for sr in self.srs:
+            for locvalue in locations:
+                accessor = q[locvalue]
+                if query == 'true':
+                    if locvalue in ('drm', 'enabled'):
+                        if accessor(sr) == True:
+                            matches.add(sr)
+                    elif accessor(sr) is not None:
+                        matches.add(sr)
+                    continue
+                if query == 'false':
+                    if locvalue in ('drm', 'enabled'):
+                        if accessor(sr) == False:
+                            matches.add(sr)
+                    elif accessor(sr) is None:
+                        matches.add(sr)
+                    continue
+                # this is bool, so can't match below
+                if locvalue in ('drm', 'enabled'):
+                    continue
+                try:
+                    ### Can't separate authors because comma is used for name sep and author sep
+                    ### Exact match might not get what you want. For that reason, turn author
+                    ### exactmatch searches into contains searches.
+                    if locvalue == 'name' and matchkind == EQUALS_MATCH:
+                        m = CONTAINS_MATCH
+                    else:
+                        m = matchkind
+
+                    if locvalue == 'format':
+                        vals = accessor(sr).split(',')
+                    else:
+                        vals = [accessor(sr)]
+                    if _match(query, vals, m):
+                        matches.add(sr)
+                        break
+                except ValueError: # Unicode errors
+                    import traceback
+                    traceback.print_exc()
+        return matches

src/calibre/gui2/store/config/chooser/results_view.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import (Qt, QTreeView, QSize)
+
+from calibre.customize.ui import store_plugins
+from calibre.gui2.metadata.single_download import RichTextDelegate
+from calibre.gui2.store.config.chooser.models import Matches
+
+class ResultsView(QTreeView):
+
+    def __init__(self, *args):
+        QTreeView.__init__(self,*args)
+            
+        self._model = Matches([p for p in store_plugins()])
+        self.setModel(self._model)
+        
+        self.setIconSize(QSize(24, 24))
+
+        self.rt_delegate = RichTextDelegate(self)
+
+        for i in self._model.HTML_COLS:
+            self.setItemDelegateForColumn(i, self.rt_delegate)
+
+        for i in xrange(self._model.columnCount()):
+            self.resizeColumnToContents(i)
+            
+        self.model().sort(1, Qt.AscendingOrder)
+        self.header().setSortIndicator(self.model().sort_col, self.model().sort_order)

src/calibre/gui2/store/config/search/search_widget.py

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+from PyQt4.Qt import QWidget
+
+from calibre.gui2 import JSONConfig
+from calibre.gui2.store.config.search.search_widget_ui import Ui_Form
+
+class StoreConfigWidget(QWidget, Ui_Form):
+    
+    def __init__(self, config=None):
+        QWidget.__init__(self)
+        self.setupUi(self)
+
+        self.config = JSONConfig('store/search') if not config else config
+        
+        # These default values should be the same as in
+        # calibre.gui2.store.search.search:SearchDialog.load_settings
+        # Seconds
+        self.opt_timeout.setValue(self.config.get('timeout', 75))
+        self.opt_hang_time.setValue(self.config.get('hang_time', 75))
+        
+        self.opt_max_results.setValue(self.config.get('max_results', 10))
+        self.opt_open_external.setChecked(self.config.get('open_external', True))
+        
+        # Number of threads to run for each type of operation
+        self.opt_search_thread_count.setValue(self.config.get('search_thread_count', 4))
+        self.opt_cache_thread_count.setValue(self.config.get('cache_thread_count', 2))
+        self.opt_cover_thread_count.setValue(self.config.get('cover_thread_count', 2))
+        self.opt_details_thread_count.setValue(self.config.get('details_thread_count', 4))
+
+    def save_settings(self):
+        self.config['timeout'] = self.opt_timeout.value()
+        self.config['hang_time'] = self.opt_hang_time.value()
+        self.config['max_results'] = self.opt_max_results.value()
+        self.config['open_external'] = self.opt_open_external.isChecked()
+        self.config['search_thread_count'] = self.opt_search_thread_count.value()
+        self.config['cache_thread_count'] = self.opt_cache_thread_count.value()
+        self.config['cover_thread_count'] = self.opt_cover_thread_count.value()
+        self.config['details_thread_count'] = self.opt_details_thread_count.value()

src/calibre/gui2/store/config/search/search_widget.ui

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>465</width>
+    <height>396</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Time</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Number of seconds to wait for a store to respond</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="opt_timeout">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Number of seconds to let a store process results</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="opt_hang_time">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>99</number>
+        </property>
+        <property name="singleStep">
+         <number>1</number>
+        </property>
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Display</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Maximum number of results to show per store</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="opt_max_results">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="opt_open_external">
+        <property name="text">
+         <string>Open search result in system browser</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Threads</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Number of search threads to use</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="opt_search_thread_count">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Number of cache update threads to use</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QSpinBox" name="opt_cache_thread_count">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Number of conver download threads to use</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="opt_cover_thread_count">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Number of details threads to use</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="opt_details_thread_count">
+        <property name="minimum">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/calibre/gui2/store/config/store.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, John Schember <john@nachtimwald.com>'
+__docformat__ = 'restructuredtext en'
+
+'''
+Config widget access functions for configuring the store action.
+'''
+
+def config_widget():
+    from calibre.gui2.store.config.search.search_widget import StoreConfigWidget
+    return StoreConfigWidget()
+
+def save_settings(config_widget):
+    config_widget.save_settings()

src/calibre/gui2/store/declined.txt

@@ -3,3 +3,6 @@ or asked not to be included in the store integration.
 
 * Borders (http://www.borders.com/)
 * WH Smith (http://www.whsmith.co.uk/)
+  Refused to permit signing up for the affiliate program
+* Libraria Rizzoli (http://libreriarizzoli.corriere.it/).
+  No reply with two attempts over 2 weeks

src/calibre/gui2/store/google_books_plugin.py

@@ -51,7 +51,7 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin):
 
                 title = ''.join(data.xpath('.//h3/a//text()'))
                 authors = data.xpath('.//span[@class="gl"]//a//text()')
-                if authors[-1].strip().lower() == 'preview':
+                if authors[-1].strip().lower() in ('preview', 'read'):
                     authors = authors[:-1]
                 else:
                     continue

src/calibre/gui2/store/legimi_plugin.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class LegimiStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        
+        url = 'http://www.legimi.com/pl/ebooks/?price=any'
+        detail_url = None
+
+        if detail_item:
+            detail_url = detail_item
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://www.legimi.com/pl/ebooks/?price=any&lang=pl&search=' + urllib.quote_plus(query.encode('utf-8')) + '&sort=relevance'
+        
+        br = browser()
+        
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//div[@class="list"]/ul/li'):
+                if counter <= 0:
+                    break
+                
+                id = ''.join(data.xpath('.//div[@class="item_cover_container"]/a[1]/@href'))
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//div[@class="item_cover_container"]/a/img/@src'))
+                title = ''.join(data.xpath('.//div[@class="item_entries"]/h2/a/text()'))
+                author = ''.join(data.xpath('.//div[@class="item_entries"]/span[1]/a/text()'))
+                price = ''.join(data.xpath('.//div[@class="item_entries"]/span[3]/text()'))
+                price = re.sub(r'[^0-9,]*','',price) + ' zł'
+
+                counter -= 1
+                
+                s = SearchResult()
+                s.cover_url = 'http://www.legimi.com/' + cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price
+                s.detail_item = 'http://www.legimi.com/' + id.strip()
+                s.drm = SearchResult.DRM_LOCKED
+                s.formats = 'EPUB'
+                
+                yield s

src/calibre/gui2/store/mobileread/models.py

@@ -47,6 +47,7 @@ class BooksModel(QAbstractItemModel):
                 self.books = list(self.search_filter.parse(self.filter))
             except:
                 self.books = self.all_books
+        self.layoutChanged.emit()
         self.sort(self.sort_col, self.sort_order)
         self.total_changed.emit(self.rowCount())
     

src/calibre/gui2/store/search/adv_search_builder.py

@@ -116,7 +116,7 @@ class AdvSearchBuilderDialog(QDialog, Ui_Dialog):
         if price:
             ans.append('price:"' + self.mc + price + '"')
         format = unicode(self.format_box.text()).strip()
-        if author:
+        if format:
             ans.append('format:"' + self.mc + format + '"')            
         if ans:
             return ' and '.join(ans)

src/calibre/gui2/store/search/download_thread.py

@@ -22,7 +22,7 @@ class GenericDownloadThreadPool(object):
     at the end of the function.
     '''
 
-    def __init__(self, thread_type, thread_count):
+    def __init__(self, thread_type, thread_count=1):
         self.thread_type = thread_type
         self.thread_count = thread_count
 
@@ -30,6 +30,9 @@ class GenericDownloadThreadPool(object):
         self.results = Queue()
         self.threads = []
 
+    def set_thread_count(self, thread_count):
+        self.thread_count = thread_count
+
     def add_task(self):
         '''
         This must be implemented in a sub class and this function
@@ -92,8 +95,8 @@ class SearchThreadPool(GenericDownloadThreadPool):
     def __init__(self, thread_count):
         GenericDownloadThreadPool.__init__(self, SearchThread, thread_count)
 
-    def add_task(self, query, store_name, store_plugin, timeout):
+    def add_task(self, query, store_name, store_plugin, max_results, timeout):
-        self.tasks.put((query, store_name, store_plugin, timeout))
+        self.tasks.put((query, store_name, store_plugin, max_results, timeout))
         GenericDownloadThreadPool.add_task(self)
 
 
@@ -112,8 +115,8 @@ class SearchThread(Thread):
     def run(self):
         while self._run and not self.tasks.empty():
             try:
-                query, store_name, store_plugin, timeout = self.tasks.get()
+                query, store_name, store_plugin, max_results, timeout = self.tasks.get()
-                for res in store_plugin.search(query, timeout=timeout):
+                for res in store_plugin.search(query, max_results=max_results, timeout=timeout):
                     if not self._run:
                         return
                     res.store_name = store_name

src/calibre/gui2/store/search/models.py

@@ -9,7 +9,8 @@ __docformat__ = 'restructuredtext en'
 import re
 from operator import attrgetter
 
-from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize)
+from PyQt4.Qt import (Qt, QAbstractItemModel, QVariant, QPixmap, QModelIndex, QSize,
+                      pyqtSignal)
 
 from calibre.gui2 import NONE
 from calibre.gui2.store.search_result import SearchResult
@@ -30,10 +31,12 @@ def comparable_price(text):
 
 class Matches(QAbstractItemModel):
 
+    total_changed = pyqtSignal(int)
+
     HEADERS = [_('Cover'), _('Title'), _('Price'), _('DRM'), _('Store')]
     HTML_COLS = (1, 4)
 
-    def __init__(self):
+    def __init__(self, cover_thread_count=2, detail_thread_count=4):
         QAbstractItemModel.__init__(self)
 
         self.DRM_LOCKED_ICON = QPixmap(I('drm-locked.png')).scaledToHeight(64,
@@ -51,8 +54,8 @@ class Matches(QAbstractItemModel):
         self.matches = []
         self.query = ''
         self.search_filter = SearchFilter()
-        self.cover_pool = CoverThreadPool(2)
+        self.cover_pool = CoverThreadPool(cover_thread_count)
-        self.details_pool = DetailsThreadPool(4)
+        self.details_pool = DetailsThreadPool(detail_thread_count)
 
         self.sort_col = 2
         self.sort_order = Qt.AscendingOrder
@@ -69,6 +72,7 @@ class Matches(QAbstractItemModel):
         self.query = ''
         self.cover_pool.abort()
         self.details_pool.abort()
+        self.total_changed.emit(self.rowCount())
         self.reset()
 
     def add_result(self, result, store_plugin):
@@ -101,6 +105,7 @@ class Matches(QAbstractItemModel):
             self.matches = list(self.search_filter.parse(self.query))
         else:
             self.matches = list(self.search_filter.universal_set())
+        self.total_changed.emit(self.rowCount())
         self.sort(self.sort_col, self.sort_order, False)
         self.layoutChanged.emit()
 

src/calibre/gui2/store/search/search.py

@@ -9,54 +9,51 @@ __docformat__ = 'restructuredtext en'
 import re
 from random import shuffle
 
-from PyQt4.Qt import (Qt, QDialog, QTimer, QCheckBox, QVBoxLayout, QIcon, QWidget) 
+from PyQt4.Qt import (Qt, QDialog, QDialogButtonBox, QTimer, QCheckBox,
+                      QVBoxLayout, QIcon, QWidget, QTabWidget)
 
 from calibre.gui2 import JSONConfig, info_dialog
 from calibre.gui2.progress_indicator import ProgressIndicator
+from calibre.gui2.store.config.chooser.chooser_widget import StoreChooserWidget
+from calibre.gui2.store.config.search.search_widget import StoreConfigWidget
 from calibre.gui2.store.search.adv_search_builder import AdvSearchBuilderDialog
 from calibre.gui2.store.search.download_thread import SearchThreadPool, \
     CacheUpdateThreadPool
 from calibre.gui2.store.search.search_ui import Ui_Dialog
 
-HANG_TIME = 75000 # milliseconds seconds
-TIMEOUT = 75 # seconds
-
 class SearchDialog(QDialog, Ui_Dialog):
 
-    def __init__(self, istores, parent=None, query=''):
+    def __init__(self, gui, parent=None, query=''):
         QDialog.__init__(self, parent)
         self.setupUi(self)
 
         self.config = JSONConfig('store/search')
-        
         self.search_edit.initialize('store_search_search')
 
-        # We keep a cache of store plugins and reference them by name.
+        # Loads variables that store various settings.
-        self.store_plugins = istores
+        # This needs to be called soon in __init__ because
-        self.search_pool = SearchThreadPool(4)
+        # the variables it sets up are used later.
-        self.cache_pool = CacheUpdateThreadPool(2)
+        self.load_settings()
+
+        self.gui = gui
+
+        # Setup our worker threads.
+        self.search_pool = SearchThreadPool(self.search_thread_count)
+        self.cache_pool = CacheUpdateThreadPool(self.cache_thread_count)
+        self.results_view.model().cover_pool.set_thread_count(self.cover_thread_count)
+        self.results_view.model().details_pool.set_thread_count(self.details_thread_count)
+
         # Check for results and hung threads.
         self.checker = QTimer()
         self.progress_checker = QTimer()
         self.hang_check = 0
-        
-        # Update store caches silently.
-        for p in self.store_plugins.values():
-            self.cache_pool.add_task(p, 30)
 
-        # Add check boxes for each store so the user
+        # Update store caches silently.
-        # can disable searching specific stores on a
+        for p in self.gui.istores.values():
-        # per search basis.
+            self.cache_pool.add_task(p, self.timeout)
-        stores_check_widget = QWidget()
+
-        stores_group_layout = QVBoxLayout()
+        self.store_checks = {}
-        stores_check_widget.setLayout(stores_group_layout)
+        self.setup_store_checks()
-        for x in sorted(self.store_plugins.keys(), key=lambda x: x.lower()):
-            cbox = QCheckBox(x)
-            cbox.setChecked(False)
-            stores_group_layout.addWidget(cbox)
-            setattr(self, 'store_check_' + x, cbox)
-        stores_group_layout.addStretch()
-        self.stores_group.setWidget(stores_check_widget)
 
         # Set the search query
         self.search_edit.setText(query)
@@ -64,22 +61,46 @@ class SearchDialog(QDialog, Ui_Dialog):
         # Create and add the progress indicator
         self.pi = ProgressIndicator(self, 24)
         self.top_layout.addWidget(self.pi)
-        
+
         self.adv_search_button.setIcon(QIcon(I('search.png')))
+        self.configure.setIcon(QIcon(I('config.png')))
 
         self.adv_search_button.clicked.connect(self.build_adv_search)
         self.search.clicked.connect(self.do_search)
         self.checker.timeout.connect(self.get_results)
         self.progress_checker.timeout.connect(self.check_progress)
         self.results_view.activated.connect(self.open_store)
+        self.results_view.model().total_changed.connect(self.update_book_total)
         self.select_all_stores.clicked.connect(self.stores_select_all)
         self.select_invert_stores.clicked.connect(self.stores_select_invert)
         self.select_none_stores.clicked.connect(self.stores_select_none)
+        self.configure.clicked.connect(self.do_config)
         self.finished.connect(self.dialog_closed)
 
         self.progress_checker.start(100)
 
         self.restore_state()
+    
+    def setup_store_checks(self):
+        # Add check boxes for each store so the user
+        # can disable searching specific stores on a
+        # per search basis.
+        existing = {}
+        for n in self.store_checks:
+            existing[n] = self.store_checks[n].isChecked()
+        
+        self.store_checks = {}
+
+        stores_check_widget = QWidget()
+        store_list_layout = QVBoxLayout()
+        stores_check_widget.setLayout(store_list_layout)
+        for x in sorted(self.gui.istores.keys(), key=lambda x: x.lower()):
+            cbox = QCheckBox(x)
+            cbox.setChecked(existing.get(x, False))
+            store_list_layout.addWidget(cbox)
+            self.store_checks[x] = cbox
+        store_list_layout.addStretch()
+        self.store_list.setWidget(stores_check_widget)
 
     def build_adv_search(self):
         adv = AdvSearchBuilderDialog(self)
@@ -115,11 +136,12 @@ class SearchDialog(QDialog, Ui_Dialog):
         # futher filtering.
         self.results_view.model().set_query(query)
 
-        # Plugins are in alphebetic order. Randomize the
+        # Plugins are in random order that does not change.
-        # order of plugin names. This way plugins closer
+        # Randomize the ord of the plugin names every time
+        # there is a search. This way plugins closer
         # to a don't have an unfair advantage over
         # plugins further from a.
-        store_names = self.store_plugins.keys()
+        store_names = self.store_checks.keys()
         if not store_names:
             return
         # Remove all of our internal filtering logic from the query.
@@ -127,8 +149,8 @@ class SearchDialog(QDialog, Ui_Dialog):
         shuffle(store_names)
         # Add plugins that the user has checked to the search pool's work queue.
         for n in store_names:
-            if getattr(self, 'store_check_' + n).isChecked():
+            if self.store_checks[n].isChecked():
-                self.search_pool.add_task(query, n, self.store_plugins[n], TIMEOUT)
+                self.search_pool.add_task(query, n, self.gui.istores[n], self.max_results, self.timeout)
         self.hang_check = 0
         self.checker.start(100)
         self.pi.startAnimation()
@@ -168,8 +190,8 @@ class SearchDialog(QDialog, Ui_Dialog):
         self.config['open_external'] = self.open_external.isChecked()
 
         store_check = {}
-        for n in self.store_plugins:
+        for k, v in self.store_checks.items():
-            store_check[n] = getattr(self, 'store_check_' + n).isChecked()
+            store_check[k] = v.isChecked()
         self.config['store_checked'] = store_check
 
     def restore_state(self):
@@ -190,23 +212,75 @@ class SearchDialog(QDialog, Ui_Dialog):
         else:
             self.resize_columns()
 
-        self.open_external.setChecked(self.config.get('open_external', True))
+        self.open_external.setChecked(self.should_open_external)
 
         store_check = self.config.get('store_checked', None)
         if store_check:
             for n in store_check:
-                if hasattr(self, 'store_check_' + n):
+                if n in self.store_checks:
-                    getattr(self, 'store_check_' + n).setChecked(store_check[n])
+                    self.store_checks[n].setChecked(store_check[n])
-                    
+
         self.results_view.model().sort_col = self.config.get('sort_col', 2)
         self.results_view.model().sort_order = self.config.get('sort_order', Qt.AscendingOrder)
-        self.results_view.header().setSortIndicator(self.results_view.model().sort_col, self.results_view.model().sort_order)         
+        self.results_view.header().setSortIndicator(self.results_view.model().sort_col, self.results_view.model().sort_order)
+
+    def load_settings(self):
+        # Seconds
+        self.timeout = self.config.get('timeout', 75)
+        # Milliseconds
+        self.hang_time = self.config.get('hang_time', 75) * 1000
+
+        self.max_results = self.config.get('max_results', 10)
+        self.should_open_external = self.config.get('open_external', True)
+
+        # Number of threads to run for each type of operation
+        self.search_thread_count = self.config.get('search_thread_count', 4)
+        self.cache_thread_count = self.config.get('cache_thread_count', 2)
+        self.cover_thread_count = self.config.get('cover_thread_count', 2)
+        self.details_thread_count = self.config.get('details_thread_count', 4)
+
+    def do_config(self):
+        # Save values that need to be synced between the dialog and the
+        # search widget.
+        self.config['open_external'] = self.open_external.isChecked()
+
+        d = QDialog(self)
+        button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        v = QVBoxLayout(d)
+        button_box.accepted.connect(d.accept)
+        button_box.rejected.connect(d.reject)
+        d.setWindowTitle(_('Customize get books search'))
+        
+        tab_widget = QTabWidget(d)
+        v.addWidget(tab_widget)
+        v.addWidget(button_box)
+
+        chooser_config_widget = StoreChooserWidget()
+        search_config_widget = StoreConfigWidget(self.config)
+        
+        tab_widget.addTab(chooser_config_widget, _('Choose stores'))
+        tab_widget.addTab(search_config_widget, _('Configure search'))
+
+        d.exec_()
+        search_config_widget.save_settings()
+        self.config_changed()
+        self.gui.load_store_plugins()
+        self.setup_store_checks()
+
+    def config_changed(self):
+        self.load_settings()
+
+        self.open_external.setChecked(self.should_open_external)
+        self.search_pool.set_thread_count(self.search_thread_count)
+        self.cache_pool.set_thread_count(self.cache_thread_count)
+        self.results_view.model().cover_pool.set_thread_count(self.cover_thread_count)
+        self.results_view.model().details_pool.set_thread_count(self.details_thread_count)
 
     def get_results(self):
         # We only want the search plugins to run
         # a maximum set amount of time before giving up.
         self.hang_check += 1
-        if self.hang_check >= HANG_TIME:
+        if self.hang_check >= self.hang_time:
             self.search_pool.abort()
             self.checker.stop()
         else:
@@ -222,39 +296,30 @@ class SearchDialog(QDialog, Ui_Dialog):
         if not self.search_pool.threads_running() and not self.results_view.model().has_results():
             info_dialog(self, _('No matches'), _('Couldn\'t find any books matching your query.'), show=True, show_copy_button=False)
 
+    def update_book_total(self, total):
+        self.total.setText('%s' % total)
 
     def open_store(self, index):
         result = self.results_view.model().get_result(index)
-        self.store_plugins[result.store_name].open(self, result.detail_item, self.open_external.isChecked())
+        self.gui.istores[result.store_name].open(self, result.detail_item, self.open_external.isChecked())
 
     def check_progress(self):
-        if not self.search_pool.threads_running() and not self.results_view.model().cover_pool.threads_running() and not self.results_view.model().details_pool.threads_running(): 
+        if not self.search_pool.threads_running() and not self.results_view.model().cover_pool.threads_running() and not self.results_view.model().details_pool.threads_running():
             self.pi.stopAnimation()
         else:
             if not self.pi.isAnimated():
                 self.pi.startAnimation()
 
-    def get_store_checks(self):
-        '''
-        Returns a list of QCheckBox's for each store.
-        '''
-        checks = []
-        for x in self.store_plugins:
-            check = getattr(self, 'store_check_' + x, None)
-            if check:
-                checks.append(check)
-        return checks
-
     def stores_select_all(self):
-        for check in self.get_store_checks():
+        for check in self.store_checks.values():
             check.setChecked(True)
 
     def stores_select_invert(self):
-        for check in self.get_store_checks():
+        for check in self.store_checks.values():
             check.setChecked(not check.isChecked())
 
     def stores_select_none(self):
-        for check in self.get_store_checks():
+        for check in self.store_checks.values():
             check.setChecked(False)
 
     def dialog_closed(self, result):
@@ -262,7 +327,7 @@ class SearchDialog(QDialog, Ui_Dialog):
         self.search_pool.abort()
         self.cache_pool.abort()
         self.save_state()
-        
+
     def exec_(self):
         if unicode(self.search_edit.text()).strip():
             self.do_search()

src/calibre/gui2/store/search/search.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>937</width>
+    <width>584</width>
-    <height>669</height>
+    <height>533</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QHBoxLayout" name="top_layout">
      <item>
@@ -66,8 +66,14 @@
        <string>Stores</string>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QScrollArea" name="stores_group">
+        <widget class="QScrollArea" name="store_list">
          <property name="widgetResizable">
           <bool>true</bool>
          </property>
@@ -76,15 +82,18 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>215</width>
+            <width>125</width>
-            <height>93</height>
+            <height>127</height>
            </rect>
           </property>
          </widget>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <property name="spacing">
+          <number>0</number>
+         </property>
          <item>
           <widget class="QPushButton" name="select_all_stores">
            <property name="text">
@@ -108,76 +117,107 @@
          </item>
         </layout>
        </item>
-       <item>
-        <widget class="QCheckBox" name="open_external">
-         <property name="toolTip">
-          <string>Open a selected book in the system's web browser</string>
-         </property>
-         <property name="text">
-          <string>Open in &amp;external browser</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
-     <widget class="QSplitter" name="splitter_2">
+     <widget class="QWidget" name="verticalLayoutWidget">
-      <property name="sizePolicy">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <item>
-        <horstretch>2</horstretch>
+        <widget class="ResultsView" name="results_view">
-        <verstretch>0</verstretch>
+         <property name="sizePolicy">
-       </sizepolicy>
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-      </property>
+           <horstretch>1</horstretch>
-      <property name="orientation">
+           <verstretch>0</verstretch>
-       <enum>Qt::Horizontal</enum>
+          </sizepolicy>
-      </property>
+         </property>
-      <widget class="QSplitter" name="splitter">
+         <property name="minimumSize">
-       <property name="orientation">
+          <size>
-        <enum>Qt::Horizontal</enum>
+           <width>0</width>
-       </property>
+           <height>0</height>
-       <widget class="ResultsView" name="results_view">
+          </size>
-        <property name="sizePolicy">
+         </property>
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <property name="alternatingRowColors">
-          <horstretch>1</horstretch>
+          <bool>true</bool>
-          <verstretch>0</verstretch>
+         </property>
-         </sizepolicy>
+         <property name="iconSize">
-        </property>
+          <size>
-        <property name="minimumSize">
+           <width>32</width>
-         <size>
+           <height>32</height>
-          <width>0</width>
+          </size>
-          <height>0</height>
+         </property>
-         </size>
+         <property name="rootIsDecorated">
-        </property>
+          <bool>false</bool>
-        <property name="alternatingRowColors">
+         </property>
-         <bool>true</bool>
+         <property name="uniformRowHeights">
-        </property>
+          <bool>false</bool>
-        <property name="iconSize">
+         </property>
-         <size>
+         <property name="itemsExpandable">
-          <width>32</width>
+          <bool>false</bool>
-          <height>32</height>
+         </property>
-         </size>
+         <property name="sortingEnabled">
-        </property>
+          <bool>true</bool>
-        <property name="rootIsDecorated">
+         </property>
-         <bool>false</bool>
+         <property name="expandsOnDoubleClick">
-        </property>
+          <bool>false</bool>
-        <property name="uniformRowHeights">
+         </property>
-         <bool>false</bool>
+         <attribute name="headerStretchLastSection">
-        </property>
+          <bool>false</bool>
-        <property name="itemsExpandable">
+         </attribute>
-         <bool>false</bool>
+        </widget>
-        </property>
+       </item>
-        <property name="sortingEnabled">
+       <item>
-         <bool>true</bool>
+        <layout class="QHBoxLayout" name="horizontalLayout">
-        </property>
+         <item>
-        <property name="expandsOnDoubleClick">
+          <widget class="QToolButton" name="configure">
-         <bool>false</bool>
+           <property name="text">
-        </property>
+            <string>...</string>
-       </widget>
+           </property>
-      </widget>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="open_external">
+           <property name="toolTip">
+            <string>Open a selected book in the system's web browser</string>
+           </property>
+           <property name="text">
+            <string>Open in &amp;external browser</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="bottom_layout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Books:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="total">
+       <property name="text">
+        <string>0</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">

src/calibre/gui2/store/virtualo_plugin.py

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class VirtualoStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+        url = 'http://virtualo.pl/ebook/c2/'
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_item)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://virtualo.pl/c2/?q=' + urllib.quote(query.encode('utf-8'))
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//div[@id="product_list"]/div/div[@class="column"]'):
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('.//table/tr[2]/td[1]/a/@href'))
+                if not id:
+                    continue
+
+                price = ''.join(data.xpath('.//span[@class="price"]/text() | .//span[@class="price abbr"]/text()'))
+                cover_url = ''.join(data.xpath('.//table/tr[2]/td[1]/a/img/@src'))
+                title = ''.join(data.xpath('.//div[@class="title"]/a/text()'))
+                author = ', '.join(data.xpath('.//div[@class="authors"]/a/text()'))
+                formats = ', '.join(data.xpath('.//span[@class="format"]/a/text()'))
+                formats = re.sub(r'(, )?ONLINE(, )?', '', formats)
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = cover_url
+                s.title = title.strip() + ' ' + formats
+                s.author = author.strip()
+                s.price = price + ' zł'
+                s.detail_item = 'http://virtualo.pl' + id.strip()
+                s.formats = formats.upper().strip()
+                s.drm = SearchResult.DRM_UNKNOWN
+
+                yield s

src/calibre/gui2/store/woblink_plugin.py

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import (unicode_literals, division, absolute_import, print_function)
+
+__license__ = 'GPL 3'
+__copyright__ = '2011, Tomasz Długosz <tomek3d@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
+import re
+import urllib
+from contextlib import closing
+
+from lxml import html
+
+from PyQt4.Qt import QUrl
+
+from calibre import browser, url_slash_cleaner
+from calibre.gui2 import open_url
+from calibre.gui2.store import StorePlugin
+from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.search_result import SearchResult
+from calibre.gui2.store.web_store_dialog import WebStoreDialog
+
+class WoblinkStore(BasicStoreConfig, StorePlugin):
+
+    def open(self, parent=None, detail_item=None, external=False):
+
+        url = 'http://woblink.com/publication'
+        detail_url = None
+
+        if detail_item:
+            detail_url = 'http://woblink.com' + detail_item
+
+        if external or self.config.get('open_external', False):
+            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+        else:
+            d = WebStoreDialog(self.gui, url, parent, detail_url)
+            d.setWindowTitle(self.name)
+            d.set_tags(self.config.get('tags', ''))
+            d.exec_()
+
+    def search(self, query, max_results=10, timeout=60):
+        url = 'http://woblink.com/publication?query=' + urllib.quote_plus(query.encode('utf-8'))
+
+        br = browser()
+
+        counter = max_results
+        with closing(br.open(url, timeout=timeout)) as f:
+            doc = html.fromstring(f.read())
+            for data in doc.xpath('//div[@class="book-item"]'):
+                if counter <= 0:
+                    break
+
+                id = ''.join(data.xpath('.//td[@class="w10 va-t"]/a[1]/@href'))
+                if not id:
+                    continue
+
+                cover_url = ''.join(data.xpath('.//td[@class="w10 va-t"]/a[1]/img/@src'))
+                title = ''.join(data.xpath('.//h3[@class="title"]/a[1]/text()'))
+                author = ''.join(data.xpath('.//p[@class="author"]/a[1]/text()'))
+                price = ''.join(data.xpath('.//div[@class="prices"]/p[1]/span/text()'))
+                price = re.sub('PLN', ' zł', price)
+                price = re.sub('\.', ',', price)
+
+                counter -= 1
+
+                s = SearchResult()
+                s.cover_url = 'http://woblink.com' + cover_url
+                s.title = title.strip()
+                s.author = author.strip()
+                s.price = price
+                s.detail_item = id.strip()
+                s.drm = SearchResult.DRM_LOCKED
+                s.formats = 'EPUB'
+
+                yield s

src/calibre/gui2/ui.py

@@ -23,7 +23,7 @@ from calibre.constants import __appname__, isosx
 from calibre.utils.config import prefs, dynamic
 from calibre.utils.ipc.server import Server
 from calibre.library.database2 import LibraryDatabase2
-from calibre.customize.ui import interface_actions, store_plugins
+from calibre.customize.ui import interface_actions, available_store_plugins
 from calibre.gui2 import error_dialog, GetMetadata, open_url, \
         gprefs, max_available_height, config, info_dialog, Dispatcher, \
         question_dialog
@@ -144,7 +144,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
 
     def load_store_plugins(self):
         self.istores = OrderedDict()
-        for store in store_plugins():
+        for store in available_store_plugins():
             if self.opts.ignore_plugins and store.plugin_path is not None:
                 continue
             try:

src/calibre/gui2/widgets.py

@@ -833,7 +833,7 @@ class PythonHighlighter(QSyntaxHighlighter):
         Config["tabwidth"] = settings.value("tabwidth",
                 QVariant(4)).toInt()[0]
         Config["fontfamily"] = settings.value("fontfamily",
-                QVariant("Bitstream Vera Sans Mono")).toString()
+                QVariant("monospace")).toString()
         Config["fontsize"] = settings.value("fontsize",
                 QVariant(10)).toInt()[0]
         for name, color, bold, italic in (

src/calibre/gui2/wizard/__init__.py

@@ -164,7 +164,7 @@ class Sony900(Sony505):
 
 class Nook(Sony505):
     id = 'nook'
-    name = 'Nook'
+    name = 'Nook and Nook Simple Reader'
     manufacturer = 'Barnes & Noble'
     output_profile = 'nook'
 

src/calibre/gui2/wizard/send_email.py

@@ -46,6 +46,64 @@ class TestEmail(QDialog, TE_Dialog):
         finally:
             self.test_button.setEnabled(True)
 
+class RelaySetup(QDialog):
+
+    def __init__(self, service, parent):
+        QDialog.__init__(self, parent)
+
+        self.l = l = QGridLayout()
+        self.setLayout(l)
+        self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        self.tl = QLabel(('<p>'+_('Setup sending email using') +
+                ' <b>{name}</b><p>' +
+            _('If you don\'t have an account, you can sign up for a free {name} email '
+            'account at <a href="http://{url}">http://{url}</a>. {extra}')).format(
+                **service))
+        l.addWidget(self.tl, 0, 0, 3, 0)
+        self.tl.setWordWrap(True)
+        self.tl.setOpenExternalLinks(True)
+        for name, label in (
+                ['from_', _('Your %s &email address:')],
+                ['username', _('Your %s &username:')],
+                ['password', _('Your %s &password:')],
+                ):
+            la = QLabel(label%service['name'])
+            le = QLineEdit(self)
+            setattr(self, name, le)
+            setattr(self, name+'_label', la)
+            r = l.rowCount()
+            l.addWidget(la, r, 0)
+            l.addWidget(le, r, 1)
+            la.setBuddy(le)
+            if name == 'password':
+                self.ptoggle = QCheckBox(_('&Show password'), self)
+                l.addWidget(self.ptoggle, r, 2)
+                self.ptoggle.stateChanged.connect(
+                        lambda s: self.password.setEchoMode(self.password.Normal if s
+                            == Qt.Checked else self.password.Password))
+        self.username.setText(service['username'])
+        self.password.setEchoMode(self.password.Password)
+        self.bl = QLabel('<p>' + _(
+            'If you plan to use email to send books to your Kindle, remember to'
+            ' add the your %s email address to the allowed email addresses in your '
+            'Amazon.com Kindle management page.')%service['name'])
+        self.bl.setWordWrap(True)
+        l.addWidget(self.bl, l.rowCount(), 0, 3, 0)
+        l.addWidget(bb, l.rowCount(), 0, 3, 0)
+        self.setWindowTitle(_('Setup') + ' ' + service['name'])
+        self.resize(self.sizeHint())
+        self.service = service
+
+    def accept(self):
+        un = unicode(self.username.text())
+        if self.service.get('at_in_username', False) and '@' not in un:
+            return error_dialog(self, _('Incorrect username'),
+                    _('%s needs the full email address as your username') %
+                    self.service['name'], show=True)
+        QDialog.accept(self)
+
 
 class SendEmail(QWidget, Ui_Form):
 
@@ -129,7 +187,8 @@ class SendEmail(QWidget, Ui_Form):
                     'port': 587,
                     'username': '@gmail.com',
                     'url': 'www.gmail.com',
-                    'extra': ''
+                    'extra': '',
+                    'at_in_username': True,
                 },
                 'hotmail': {
                     'name': 'Hotmail',
@@ -138,55 +197,15 @@ class SendEmail(QWidget, Ui_Form):
                     'username': '',
                     'url': 'www.hotmail.com',
                     'extra': _('If you are setting up a new'
-                        ' hotmail account, you must log in to it '
+                        ' hotmail account, Microsoft requires that you '
-                        ' once before you will be able to send mails.'),
+                        ' verify your account periodically, before it'
+                        ' will let calibre send email. In this case, I'
+                        ' strongly suggest you setup a free gmail account'
+                        ' instead.'),
+                    'at_in_username': True,
                 }
         }[service]
-        d = QDialog(self)
+        d = RelaySetup(service, self)
-        l = QGridLayout()
-        d.setLayout(l)
-        bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel)
-        bb.accepted.connect(d.accept)
-        bb.rejected.connect(d.reject)
-        d.tl = QLabel(('<p>'+_('Setup sending email using') +
-                ' <b>{name}</b><p>' +
-            _('If you don\'t have an account, you can sign up for a free {name} email '
-            'account at <a href="http://{url}">http://{url}</a>. {extra}')).format(
-                **service))
-        l.addWidget(d.tl, 0, 0, 3, 0)
-        d.tl.setWordWrap(True)
-        d.tl.setOpenExternalLinks(True)
-        for name, label in (
-                ['from_', _('Your %s &email address:')],
-                ['username', _('Your %s &username:')],
-                ['password', _('Your %s &password:')],
-                ):
-            la = QLabel(label%service['name'])
-            le = QLineEdit(d)
-            setattr(d, name, le)
-            setattr(d, name+'_label', la)
-            r = l.rowCount()
-            l.addWidget(la, r, 0)
-            l.addWidget(le, r, 1)
-            la.setBuddy(le)
-            if name == 'password':
-                d.ptoggle = QCheckBox(_('&Show password'), d)
-                l.addWidget(d.ptoggle, r, 2)
-                d.ptoggle.stateChanged.connect(
-                        lambda s: d.password.setEchoMode(d.password.Normal if s
-                            == Qt.Checked else d.password.Password))
-        d.username.setText(service['username'])
-        d.password.setEchoMode(d.password.Password)
-        d.bl = QLabel('<p>' + _(
-            'If you plan to use email to send books to your Kindle, remember to'
-            ' add the your %s email address to the allowed email addresses in your '
-            'Amazon.com Kindle management page.')%service['name'])
-        d.bl.setWordWrap(True)
-        l.addWidget(d.bl, l.rowCount(), 0, 3, 0)
-        l.addWidget(bb, l.rowCount(), 0, 3, 0)
-        d.setWindowTitle(_('Setup') + ' ' + service['name'])
-        d.resize(d.sizeHint())
-        bb.setVisible(True)
         if d.exec_() != d.Accepted:
             return
         self.relay_username.setText(d.username.text())

src/calibre/library/server/base.py

@@ -221,7 +221,12 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
                 if not ip or ip.startswith('127.'):
                     raise
                 cherrypy.log('Trying to bind to single interface: '+ip)
+                # Change the host we listen on
                 cherrypy.config.update({'server.socket_host' : ip})
+                # This ensures that the change is actually applied
+                cherrypy.server.socket_host = ip
+                cherrypy.server.httpserver = cherrypy.server.instance = None
+
                 cherrypy.engine.start()
 
             self.is_running = True
@@ -231,6 +236,8 @@ class LibraryServer(ContentServer, MobileServer, XMLServer, OPDSServer, Cache,
             cherrypy.engine.block()
         except Exception as e:
             self.exception = e
+            import traceback
+            traceback.print_exc()
         finally:
             self.is_running = False
             try:

src/calibre/linux.py

@@ -356,7 +356,7 @@ class PostInstall:
                     mimetypes = set([])
                     for x in all_input_formats():
                         mt = guess_type('dummy.'+x)[0]
-                        if mt and 'chemical' not in mt:
+                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
                             mimetypes.add(mt)
 
                     def write_mimetypes(f):
@@ -376,11 +376,10 @@ class PostInstall:
                     des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
                             'calibre-ebook-viewer.desktop')
                     for x in des:
-                        cmd = ['xdg-desktop-menu', 'install', './'+x]
+                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
-                        if x != des[-1]:
-                            cmd.insert(2, '--noupdate')
                         check_call(' '.join(cmd), shell=True)
                         self.menu_resources.append(x)
+                    check_call(['xdg-desktop-menu', 'forceupdate'])
                     f = open('calibre-mimetypes', 'wb')
                     f.write(MIME)
                     f.close()

src/calibre/manual/conversion.rst

@@ -655,6 +655,7 @@ Some limitations of PDF input are:
     * Some PDFs use special glyphs to represent ll or ff or fi, etc. Conversion of these may or may not work depending on just how they are represented internally in the PDF.
     * Some PDFs store their images upside down with a rotation instruction, |app| currently doesn't support that instruction, so the images will be rotated in the output as well. 
     * Links and Tables of Contents are not supported
+    * PDFs that use embedded non-unicode fonts to represent non-English characters will result in garbled output for those characters
 
 To re-iterate **PDF is a really, really bad** format to use as input. If you absolutely must use PDF, then be prepared for an
 output ranging anywhere from decent to unusable, depending on the input PDF.

src/calibre/manual/faq.rst

@@ -138,7 +138,7 @@ Follow these steps to find the problem:
 My device is non-standard or unusual. What can I do to connect to it?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-In addition to the :guilabel:`Connect to Folder` function found under the Connect/Share button, |app| provides a ``User Defined`` device plugin that can be used to connect to any USB device that presents that shows up as a disk drive in your operating system. See the device plugin ``Preferences -> Plugins -> Device Plugins -> User Defined`` and ``Preferences -> Miscellaneous -> Get information to setup the user defined device`` for more information.
+In addition to the :guilabel:`Connect to Folder` function found under the Connect/Share button, |app| provides a ``User Defined`` device plugin that can be used to connect to any USB device that shows up as a disk drive in your operating system. Note: on windows, the device must have a drive letter for calibre to use it. See the device plugin ``Preferences -> Plugins -> Device Plugins -> User Defined`` and ``Preferences -> Miscellaneous -> Get information to setup the user defined device`` for more information.
 
 How does |app| manage collections on my SONY reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -587,7 +587,7 @@ You can download news and convert it into an ebook with the command::
 
    /opt/calibre/ebook-convert "Title of news source.recipe" outputfile.epub
 
-If you want to generate MOBI, use outputfile.mobi instead.
+If you want to generate MOBI, use outputfile.mobi instead and use ``--output-profile kindle``.
 
 You can email downloaded news with the command::
 

src/calibre/manual/template_lang.rst

@@ -229,13 +229,14 @@ For various values of series_index, the program returns:
 
 The following functions are available in addition to those described in single-function mode. Remember from the example above that the single-function mode functions require an additional first parameter specifying the field to operate on. With the exception of the ``id`` parameter of assign, all parameters can be statements (sequences of expressions):
 
+    * ``and(value, value, ...)`` -- returns the string "1" if all values are not empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want.
     * ``add(x, y)`` -- returns x + y. Throws an exception if either x or y are not numbers.
     * ``assign(id, val)`` -- assigns val to id, then returns val. id must be an identifier, not an expression
     * ``booksize()`` -- returns the value of the |app| 'size' field. Returns '' if there are no formats.
     * ``cmp(x, y, lt, eq, gt)`` -- compares x and y after converting both to numbers. Returns ``lt`` if x < y. Returns ``eq`` if x == y. Otherwise returns ``gt``.
     * ``divide(x, y)`` -- returns x / y. Throws an exception if either x or y are not numbers.
     * ``field(name)`` -- returns the metadata field named by ``name``.
-    * ``first_non_empty(value, value, ...) -- returns the first value that is not empty. If all values are empty, then the empty value is returned. You can have as many values as you want.
+    * ``first_non_empty(value, value, ...)`` -- returns the first value that is not empty. If all values are empty, then the empty value is returned. You can have as many values as you want.
     * ``format_date(x, date_format)`` -- format_date(val, format_string) -- format the value, which must be a date field, using the format_string, returning a string. The formatting codes are::
     
         d    : the day as number without a leading zero (1 to 31)
@@ -251,7 +252,10 @@ The following functions are available in addition to those described in single-f
         iso  : the date with time and timezone. Must be the only format present.
     
     * ``eval(string)`` -- evaluates the string as a program, passing the local variables (those ``assign`` ed to). This permits using the template processor to construct complex results from local variables.
+    * ``not(value)`` -- returns the string "1" if the value is empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want.
+    * ``merge_lists(list1, list2, separator)`` -- return a list made by merging the items in list1 and list2, removing duplicate items using a case-insensitive compare. If items differ in case, the one in list1 is used. The items in list1 and list2 are separated by separator, as are the items in the returned list.
     * ``multiply(x, y)`` -- returns x * y. Throws an exception if either x or y are not numbers.
+    * ``or(value, value, ...)`` -- returns the string "1" if any value is not empty, otherwise returns the empty string. This function works well with test or first_non_empty. You can have as many values as you want.
     * ``print(a, b, ...)`` -- prints the arguments to standard output. Unless you start calibre from the command line (``calibre-debug -g``), the output will go to a black hole.
     * ``raw_field(name)`` -- returns the metadata field named by name without applying any formatting.
     * ``strcat(a, b, ...)`` -- can take any number of arguments. Returns a string formed by concatenating all the arguments.
@@ -259,7 +263,22 @@ The following functions are available in addition to those described in single-f
     * ``substr(str, start, end)`` -- returns the ``start``'th through the ``end``'th characters of ``str``. The first character in ``str`` is the zero'th character. If end is negative, then it indicates that many characters counting from the right. If end is zero, then it indicates the last character. For example, ``substr('12345', 1, 0)`` returns ``'2345'``, and ``substr('12345', 1, -1)`` returns ``'234'``.
     * ``subtract(x, y)`` -- returns x - y. Throws an exception if either x or y are not numbers.
     * ``template(x)`` -- evaluates x as a template. The evaluation is done in its own context, meaning that variables are not shared between the caller and the template evaluation. Because the `{` and `}` characters are special, you must use `[[` for the `{` character and `]]` for the '}' character; they are converted automatically. For example, ``template('[[title_sort]]') will evaluate the template ``{title_sort}`` and return its value.
+    
+Function classification summary:
 
+    * Get values from metadata: ``field``. ``raw_field``. In some situations, ``lookup`` can be used in place of ``field``.
+    * Arithmetic: ``add``, ``subtract``, ``multiply``, ``divide``
+    * Boolean: ``and``, ``or``, ``not``. The function ``if_empty`` is similar to ``and`` called with one argument.
+    * If-then-else: ``contains``, ``test``
+    * Iterating over values: ``first_non_empty``, ``lookup``, ``switch``
+    * List lookup: ``in_list``, ``list_item``, ``select``, 
+    * List manipulation: ``count``, ``merge_lists``, ``sublist``, ``subitems``
+    * Recursion: ``eval``, ``template``
+    * Relational: ``cmp`` , ``strcmp`` for strings
+    * String case changes: ``lowercase``, ``uppercase``, ``titlecase``, ``capitalize``
+    * String manipulation: ``re``, ``shorten``, ``substr``
+    * Other: ``assign``, ``booksize``, ``print``, ``format_date``, 
+        
 .. _general_mode:
 
 Using general program mode