Sync to trunk.

Changelog.yaml

@@ -19,6 +19,60 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.7.57
+  date: 2011-04-22
+
+  new features:
+    - title: "Launch worker processes on demand instead of keeping a pool of them in memory. Reduces memory footprint."
+
+    - title: "Use the visual formatting of the Table of Contents to try to automatically create a multi-level TOC when converting/viewing MOBI files."
+      tickets: [763681]
+
+    - title: "Add a new function booksize() to the template language to get the value of the size column in calibre."
+
+    - title: "Add support for using metadata plugboards with the content server (only with the epub format)"
+
+    - title: "Change default algorithm for automatically computing author sort to be more intelligent and handle the case when the author name has a comma in it"
+
+    - title: "Show cover size in the tooltips of the book details panel and book details popup window"
+  
+  bug fixes:
+    - title: "Dragging and dropping a cover onto the book details panel did not change the cover size"
+      tickets: [768332]
+
+    - title: "Fix non-escaped '|' when searching for commas in authors using REGEXP_MATCH"
+
+    - title: "Fix ratings in templates being multiplied by 2"
+
+    - title: "Fix adding a comma to custom series values when using completion."
+      tickets: [763788]
+
+    - title: "CHM Input: Another workaround for a Microsoft mess."
+      tickets: [763336]
+
+    - title: "Fix job count in the spinner not always being updated when a job completes"
+
+    - title: "Changing case only of a title does not update title sort"
+      tickets: [768904]
+
+  improved recipes:
+    - ecuisine.ro, egirl.ro and tabu.ro
+    - Daily Telegraph
+    - Handelsblatt
+    - Il Sole 24 Ore
+    - Newsweek
+    - Arcamax
+
+  new recipes:
+    - title: BabyOnline.ro
+      author: Silviu Cotoara
+
+    - title: "The Journal.ie"
+      author: Phil Burns
+
+    - title: "Der Spiegel"
+      author: Nikolas Mangold
+
 - version: 0.7.56
   date: 2011-04-17
 

recipes/arcamax.recipe

@@ -6,12 +6,13 @@ __copyright__ = 'Copyright 2010 Starson17'
 www.arcamax.com
 '''
 from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.ebooks.BeautifulSoup import Tag
 
 class Arcamax(BasicNewsRecipe):
     title               = 'Arcamax'
     __author__          = 'Starson17'
-    __version__         = '1.03'
-    __date__            = '25 November 2010'
+    __version__         = '1.04'
+    __date__            = '18 April 2011'
     description         = u'Family Friendly Comics - Customize for more days/comics: Defaults to 7 days, 25 comics - 20 general, 5 editorial.'
     category            = 'news, comics'
     language            = 'en'
@@ -30,8 +31,15 @@ class Arcamax(BasicNewsRecipe):
                         , 'language'          : language
                         }
 
-    keep_only_tags     = [dict(name='div', attrs={'class':['toon']}),
-                          ]
+    keep_only_tags     = [dict(name='div', attrs={'class':['comics-header']}),
+                                        dict(name='b', attrs={'class':['current']}),
+                                        dict(name='article', attrs={'class':['comic']}),
+                                        ]
+
+    remove_tags = [dict(name='div', attrs={'id':['comicfull' ]}),
+                               dict(name='div', attrs={'class':['calendar' ]}),
+                               dict(name='nav', attrs={'class':['calendar-nav' ]}),
+                               ]
 
     def parse_index(self):
         feeds = []
@@ -71,7 +79,6 @@ class Arcamax(BasicNewsRecipe):
                             #(u"Rugrats", u"http://www.arcamax.com/rugrats"),
                             (u"Speed Bump", u"http://www.arcamax.com/speedbump"),
                             (u"Wizard of Id", u"http://www.arcamax.com/wizardofid"),
-                            (u"Dilbert", u"http://www.arcamax.com/dilbert"),
                             (u"Zits", u"http://www.arcamax.com/zits"),
                              ]:
             articles = self.make_links(url)
@@ -86,24 +93,37 @@ class Arcamax(BasicNewsRecipe):
         for page in pages:
             page_soup = self.index_to_soup(url)
             if page_soup:
-                title = page_soup.find(name='div', attrs={'class':'toon'}).p.img['alt']
+                title = page_soup.find(name='div', attrs={'class':'comics-header'}).h1.contents[0]
                 page_url = url
-                prev_page_url = 'http://www.arcamax.com' + page_soup.find('a', attrs={'class':'next'}, text='Previous').parent['href']
-            current_articles.append({'title': title, 'url': page_url, 'description':'', 'date':''})
+                # orig prev_page_url = 'http://www.arcamax.com' + page_soup.find('a', attrs={'class':'prev'}, text='Previous').parent['href']
+                prev_page_url = 'http://www.arcamax.com' + page_soup.find('span', text='Previous').parent.parent['href']
+                date = self.tag_to_string(page_soup.find(name='b', attrs={'class':['current']}))
+            current_articles.append({'title': title, 'url': page_url, 'description':'', 'date': date})
             url = prev_page_url
         current_articles.reverse()
         return current_articles
 
     def preprocess_html(self, soup):
-        main_comic = soup.find('p',attrs={'class':'m0'})
-        if main_comic.a['target'] == '_blank':
-            main_comic.a.img['id'] = 'main_comic'
+        for img_tag in soup.findAll('img'):
+            parent_tag = img_tag.parent
+            if parent_tag.name == 'a':
+                new_tag = Tag(soup,'p')
+                new_tag.insert(0,img_tag)
+                parent_tag.replaceWith(new_tag)
+            elif parent_tag.name == 'p':
+                if not self.tag_to_string(parent_tag) == '':
+                    new_div = Tag(soup,'div')
+                    new_tag = Tag(soup,'p')
+                    new_tag.insert(0,img_tag)
+                    parent_tag.replaceWith(new_div)
+                    new_div.insert(0,new_tag)
+                    new_div.insert(1,parent_tag)
         return soup
 
     extra_css = '''
                     h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
                     h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
-                    img#main_comic {max-width:100%; min-width:100%;}
+                    img {max-width:100%; min-width:100%;}
                     p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
                     body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
 		'''

recipes/babyonline.recipe

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = u'2011, Silviu Cotoar\u0103'
+'''
+babyonline.ro
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class BabyOnline(BasicNewsRecipe):
+    title                 = u'Baby Online'
+    __author__            = u'Silviu Cotoar\u0103'
+    description           = u'De la p\u0103rinte la p\u0103rinte'
+    publisher             = u'Baby Online'
+    oldest_article        = 50
+    language              = 'ro'
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    category              = 'Ziare,Reviste,Copii,Mame'
+    encoding              = 'utf-8'
+    cover_url             = 'http://www.babyonline.ro/images/default/logo.gif'
+
+    conversion_options = {
+                                 'comments'   : description
+                                ,'tags'       : category
+                                ,'language'   : language
+                                ,'publisher'  : publisher
+                         }
+
+    keep_only_tags = [
+                        dict(name='div', attrs={'id':'article_container'})
+                     ]
+
+    remove_tags = [
+						dict(name='div', attrs={'id':'bar_nav'}),
+						dict(name='div', attrs={'id':'service_send'}),
+						dict(name='div', attrs={'id':'other_videos'}),
+						dict(name='div', attrs={'class':'dot_line_yellow'}),
+						dict(name='a', attrs={'class':'print'}),
+						dict(name='a', attrs={'class':'email'}),
+						dict(name='a', attrs={'class':'YM'}),
+						dict(name='a', attrs={'class':'comment'}),
+						dict(name='div', attrs={'class':'tombstone_cross'}),
+						dict(name='span', attrs={'class':'liketext'})
+                  ]
+
+    remove_tags_after = [
+						dict(name='div', attrs={'id':'service_send'})
+                        ]
+
+    feeds          = [
+                        (u'Feeds', u'http://www.babyonline.ro/rss_homepage.xml')
+                     ]
+
+    def preprocess_html(self, soup):
+        return self.adeify_images(soup)

recipes/clarin.recipe

@@ -1,6 +1,6 @@
 
 __license__   = 'GPL v3'
-__copyright__ = '2008-2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2008-2011, Darko Miletic <darko.miletic at gmail.com>'
 '''
 clarin.com
 '''
@@ -18,11 +18,18 @@ class Clarin(BasicNewsRecipe):
     use_embedded_content  = False
     no_stylesheets        = True
     encoding              = 'utf8'
+    delay                 = 1
     language              = 'es_AR'
     publication_type      = 'newspaper'
     INDEX                 = 'http://www.clarin.com'
     masthead_url          = 'http://www.clarin.com/static/CLAClarin/images/logo-clarin-print.jpg'
-    extra_css             = ' body{font-family: Arial,Helvetica,sans-serif} h2{font-family: Georgia,serif; font-size: xx-large} .hora{font-weight:bold} .hd p{font-size: small} .nombre-autor{color: #0F325A} '
+    extra_css             = """ 
+                               body{font-family: Arial,Helvetica,sans-serif} 
+                               h2{font-family: Georgia,serif; font-size: xx-large} 
+                               .hora{font-weight:bold} 
+                               .hd p{font-size: small} 
+                               .nombre-autor{color: #0F325A} 
+                            """
 
     conversion_options = {
                           'comment'  : description
@@ -31,7 +38,9 @@ class Clarin(BasicNewsRecipe):
                         , 'language' : language
                         }
 
-    keep_only_tags = [dict(attrs={'class':['hd','mt']})]
+    keep_only_tags    = [dict(attrs={'class':['hd','mt']})]
+    remove_tags       = [dict(name=['meta','base','link'])]
+    remove_attributes = ['lang','_mce_bogus']
 
     feeds = [
                (u'Pagina principal', u'http://www.clarin.com/rss/'             )
@@ -47,6 +56,10 @@ class Clarin(BasicNewsRecipe):
               ,(u'Ciudades'        , u'http://www.clarin.com/rss/ciudades/'    )
             ]
 
+    
+    def get_article_url(self, article):
+        return article.get('guid',  None)
+    
     def print_version(self, url):
         return url + '?print=1'
 

recipes/daily_telegraph.recipe

@@ -61,6 +61,12 @@ class DailyTelegraph(BasicNewsRecipe):
                       (u'Entertainment News', u'http://feeds.news.com.au/public/rss/2.0/dtele_entertainment_news_201.xml'),
                       (u'Lifestyle News', u'http://feeds.news.com.au/public/rss/2.0/dtele_lifestyle_227.xml'),
                       (u'Music', u'http://feeds.news.com.au/public/rss/2.0/dtele_music_441.xml'),
+                      (u'Sport',
+                          u'http://feeds.news.com.au/public/rss/2.0/dtele_sport_203.xml'),
+                      (u'Soccer',
+                          u'http://feeds.news.com.au/public/rss/2.0/dtele_sports_soccer_344.xml'),
+                      (u'Rugby Union',
+                          u'http://feeds.news.com.au/public/rss/2.0/dtele_sports_rugby_union_342.xml'),
                       (u'Property Confidential', u'http://feeds.news.com.au/public/rss/2.0/dtele_property_confidential_463.xml'),
                       (u'Property - Your Space', u'http://feeds.news.com.au/public/rss/2.0/dtele_property_yourspace_462.xml'),
                       (u'Confidential News', u'http://feeds.news.com.au/public/rss/2.0/dtele_entertainment_confidential_252.xml'),

recipes/der_spiegel.recipe

@@ -0,0 +1,83 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2011, Nikolas Mangold <nmangold at gmail.com>'
+'''
+spiegel.de
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre import strftime
+from calibre import re
+
+class DerSpiegel(BasicNewsRecipe):
+    title                  = 'Der Spiegel'
+    __author__             = 'Nikolas Mangold'
+    description            = 'Der Spiegel, Printed Edition. Access to paid content.'
+    publisher              = 'SPIEGEL-VERLAG RUDOLF AUGSTEIN GMBH & CO. KG'
+    category               = 'news, politics, Germany'
+    no_stylesheets         = True
+    encoding               = 'cp1252'
+    needs_subscription     = True
+    remove_empty_feeds     = True
+    delay                  = 1
+    PREFIX                 = 'http://m.spiegel.de'
+    INDEX                  = PREFIX + '/spiegel/print/epaper/index-heftaktuell.html'
+    use_embedded_content   = False
+    masthead_url = 'http://upload.wikimedia.org/wikipedia/en/thumb/1/17/Der_Spiegel_logo.svg/200px-Der_Spiegel_logo.svg.png'
+    language               = 'de'
+    publication_type       = 'magazine'
+    extra_css              = ' body{font-family: Arial,Helvetica,sans-serif} '
+    timefmt = '[%W/%Y]'
+    empty_articles = ['Titelbild']
+    preprocess_regexps = [
+        (re.compile(r'<p>&#9670;</p>', re.DOTALL|re.IGNORECASE), lambda match: '<hr>'),
+        ]
+
+    def get_browser(self):
+        def has_login_name(form):
+            try:
+                form.find_control(name="f.loginName")
+            except:
+                return False
+            else:
+                return True
+
+        br = BasicNewsRecipe.get_browser()
+        if self.username is not None and self.password is not None:
+            br.open(self.PREFIX + '/meinspiegel/login.html')
+            br.select_form(predicate=has_login_name)
+            br['f.loginName'    ] = self.username
+            br['f.password'] = self.password
+            br.submit()
+        return br
+
+    remove_tags_before =  dict(attrs={'class':'spArticleContent'})
+    remove_tags_after  =  dict(attrs={'class':'spArticleCredit'})
+
+    def parse_index(self):
+        soup = self.index_to_soup(self.INDEX)
+
+        cover = soup.find('img', width=248)
+        if cover is not None:
+            self.cover_url = cover['src']
+
+        index = soup.find('dl')
+
+        feeds = []
+        for section in index.findAll('dt'):
+            section_title = self.tag_to_string(section).strip()
+            self.log('Found section ', section_title)
+
+            articles = []
+            for article in section.findNextSiblings(['dd','dt']):
+                if article.name == 'dt':
+                    break
+                link = article.find('a')
+                title = self.tag_to_string(link).strip()
+                if title in self.empty_articles:
+                    continue
+                self.log('Found article ', title)
+                url = self.PREFIX + link['href']
+                articles.append({'title' : title, 'date' : strftime(self.timefmt), 'url' : url})
+            feeds.append((section_title,articles))
+        return feeds;

recipes/ecuisine.recipe

@@ -14,14 +14,14 @@ class EcuisineRo(BasicNewsRecipe):
     __author__            = u'Silviu Cotoar\u0103'
     description           = u'Reinventeaz\u0103 pl\u0103cerea de a g\u0103ti'
     publisher             = 'eCuisine'
-    oldest_article        = 5
+    oldest_article        = 50
     language              = 'ro'
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
     category              = 'Ziare,Retete,Bucatarie'
     encoding              = 'utf-8'
-    cover_url             = ''
+    cover_url             = 'http://www.ecuisine.ro/sites/all/themes/ecuisine/images/logo.gif'
 
     conversion_options = {
                              'comments'   : description
@@ -31,8 +31,8 @@ class EcuisineRo(BasicNewsRecipe):
                          }
 
     keep_only_tags = [
-            dict(name='div', attrs={'class':'page-title'})
-            , dict(name='div', attrs={'class':'content clearfix'})
+            dict(name='h1', attrs={'id':'page-title'})
+            , dict(name='div', attrs={'class':'field-item even'})
                      ]
 
     remove_tags = [

recipes/egirl.recipe

@@ -31,8 +31,8 @@ class EgirlRo(BasicNewsRecipe):
                          }
 
     keep_only_tags = [
-                          dict(name='div', attrs={'id':'title_art'})
-                        , dict(name='div', attrs={'class':'content_style'})
+                          dict(name='div', attrs={'id':'content_art'})
+                        , dict(name='div', attrs={'class':'content_articol'})
                      ]
 
     feeds          = [

recipes/handelsblatt.recipe

@@ -1,4 +1,3 @@
-
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Handelsblatt(BasicNewsRecipe):
@@ -7,14 +6,11 @@ class Handelsblatt(BasicNewsRecipe):
     oldest_article = 7
     max_articles_per_feed = 100
     no_stylesheets = True
-    cover_url = 'http://www.handelsblatt.com/images/logo/logo_handelsblatt.com.png'
+#    cover_url = 'http://www.handelsblatt.com/images/logo/logo_handelsblatt.com.png'
     language = 'de'
-  #  keep_only_tags = []
-    keep_only_tags = (dict(name = 'div', attrs = {'class': ['hcf-detail-abstract hcf-teaser ajaxify','hcf-detail','hcf-author-wrapper']}))
-   # keep_only_tags.append(dict(name = 'div', attrs = {'id': 'fullText'}))
-    remove_tags    = [dict(name='img', attrs = {'src': 'http://www.handelsblatt.com/images/icon/loading.gif'})
-                      ,dict(name='ul' , attrs={'class':['hcf-detail-tools']})
-    									]
+
+    remove_tags_before =  dict(attrs={'class':'hcf-overline'})
+    remove_tags_after  =  dict(attrs={'class':'hcf-footer'})
 
     feeds          = [
                         (u'Handelsblatt Exklusiv',u'http://www.handelsblatt.com/rss/exklusiv'),
@@ -28,17 +24,16 @@ class Handelsblatt(BasicNewsRecipe):
                         (u'Handelsblatt Magazin',u'http://www.handelsblatt.com/rss/magazin/'),
                         (u'Handelsblatt Weblogs',u'http://www.handelsblatt.com/rss/blogs')
                      ]
+
     extra_css = '''
-        .hcf-headline {font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:x-large;}
-        .hcf-overline {font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:x-large;}
-        .hcf-exclusive {font-family:Arial,Helvetica,sans-serif; font-style:italic;font-weight:bold; margin-right:5pt;}
-        p{font-family:Arial,Helvetica,sans-serif;}
-        .hcf-location-mark{font-weight:bold; margin-right:5pt;}
-        .MsoNormal{font-family:Helvetica,Arial,sans-serif;}
-        .hcf-author-wrapper{font-style:italic;}
-        .hcf-article-date{font-size:x-small;}
-        .hcf-caption {font-style:italic;font-size:small;}
-        img {align:left;}
+        h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;}
+        h2{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;}
+        p{font-family:Arial,Helvetica,sans-serif;font-size:small;}
+        body{font-family:Helvetica,Arial,sans-serif;font-size:small;}
         '''
 
-
+    def print_version(self, url):
+        url = url.split('/')
+        url[-1] = 'v_detail_tab_print,'+url[-1]
+        url = '/'.join(url)
+        return url

recipes/ilsole24ore.recipe

@@ -1,71 +1,65 @@
-#!/usr/bin/env  python
-__license__   = 'GPL v3'
-__author__    = 'Lorenzo Vigentini & Edwin van Maastrigt'
-__copyright__ = '2009, Lorenzo Vigentini <l.vigentini at gmail.com> and Edwin van Maastrigt <evanmaastrigt at gmail.com>'
-__description__ = 'Financial news daily paper - v1.02 (30, January 2010)'
+__author__    = 'Marco Saraceno'
+__copyright__ = '2010, Marco Saraceno <marcosaraceno at gmail.com>'
+description   = 'Italian daily newspaper - v 1.1 (Mar14,2011)'
 
 '''
-http://www.ilsole24ore.com/
+http://www.ilsole24ore.com
 '''
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
+class IlSole24Ore(BasicNewsRecipe):
+    __author__        = 'Marco Saraceno'
+    description   = 'Italian financial daily newspaper'
 
-class ilsole24Ore(BasicNewsRecipe):
-    author        = 'Lorenzo Vigentini & Edwin van Maastrigt'
-    description   = 'Financial news daily paper'
-
-    cover_url      = 'http://www.ilsole24ore.com/img2007/print_header.gif'
-
-    title          = u'il Sole 24 Ore New'
-    publisher      = 'italiaNews'
-    category       = 'News, finance, economy, politics'
+    cover_url      = 'http://www.shopping24.ilsole24ore.com/ProductRelated/rds/img/logo_sole.gif'
+    title          = u'Il Sole 24 Ore'
+    publisher      = 'Gruppo editoriale GRUPPO 24ORE'
+    category       = 'News, politics, culture, economy, financial, Italian'
 
     language       = 'it'
     timefmt        = '[%a, %d %b, %Y]'
 
     oldest_article = 2
-    max_articles_per_feed = 50
+    max_articles_per_feed = 100
     use_embedded_content  = False
+    extra_css      = '.headline {font-size: x-large;} \n .fact { padding-top: 10pt  }'
+
+
+    remove_tags = [
+                            dict(name='div', attrs={'class':['header','titolo']}),
+                            dict(name='table', attrs={'class':['footer1024','footerdown']}),
+                            ]
 
-    remove_javascript     = True
-    no_stylesheets        = True
 
     def get_article_url(self, article):
-        return article.get('id', article.get('guid', None))
+       link = article.get('link', None)
+       if link is None:
+           return article
+       if link.split('/')[-1]=="story01.htm":
+           link=link.split('/')[-2]
+           a=['0B','0C','0D','0E','0F','0G','0N'  ,'0L0S','0A']
+           b=['.' ,'/' ,'?' ,'-' ,'=' ,'&' ,'.com','www.','0']
+           for i in range(0,len(a)):
+              link=link.replace(a[i],b[i])
+           link="http://"+link
+       return link
+
+    feeds = [
+                  (u'Notizie Italia', u'http://www.ilsole24ore.com/rss/notizie/italia.xml'),
+                  (u'Notizie Europa', u'http://www.ilsole24ore.com/rss/notizie/europa.xml'),
+                  (u'Notizie USA', u'http://www.ilsole24ore.com/rss/notizie/usa.xml'),
+                  (u'Notizie Americhe', u'http://www.ilsole24ore.com/rss/notizie/americhe.xml'),
+                  (u'Notizie Medio Oriente e Africa', u'http://www.ilsole24ore.com/rss/notizie/medio-oriente-e-africa.xml'),
+                  (u'Notizie Asia e Oceania', u'http://www.ilsole24ore.com/rss/notizie/asia-e-oceania.xml'),
+                  (u'Commenti', u'http://www.ilsole24ore.com/rss/commenti-e-idee.xml'),
+                  (u'Norme e tributi', u'http://www.ilsole24ore.com/rss/norme-e-tributi.xml'),
+                  (u'Finanza', u'http://www.ilsole24ore.com/rss/finanza-e-mercati.xml'),
+                  (u'Economia', u'http://www.ilsole24ore.com/rss/economia.xml'),
+                  (u'Tecnologia', u'http://www.ilsole24ore.com/rss/tecnologie.xml'),
+                  (u'Cultura', u'http://www.ilsole24ore.com/rss/cultura.xml'),
+                  ]
 
     def print_version(self, url):
-        link, sep, params = url.rpartition('?')
-        if link  is None:
-           return link.replace('_1.php', '_php')
-        return link.replace('.shtml', '_PRN.shtml')
-
-    keep_only_tags     = [
-                            dict(name='div', attrs={'class':'txt'})
-                        ]
-#    remove_tags = [dict(name='br')]
-
-    feeds          = [
-                       (u'Prima pagina', u'http://www.ilsole24ore.com/rss/primapagina.xml'),
-                       (u'Norme e tributi', u'http://www.ilsole24ore.com/rss/norme-tributi.xml'),
-                       (u'Finanza e mercati', u'http://www.ilsole24ore.com/rss/finanza-mercati.xml'),
-                       (u'Economia e lavoro', u'http://www.ilsole24ore.com/rss/economia-lavoro.xml'),
-                       (u'Italia', u'http://www.ilsole24ore.com/rss/italia.xml'),
-                       (u'Mondo', u'http://www.ilsole24ore.com/rss/mondo.xml'),
-                       (u'Tecnologia e business', u'http://www.ilsole24ore.com/rss/tecnologia-business.xml'),
-                       (u'Cultura e tempo libero', u'http://www.ilsole24ore.com/rss/tempolibero-cultura.xml'),
-                       (u'Sport', u'http://www.ilsole24ore.com/rss/sport.xml'),
-                       (u'Professionisti 24', u'http://www.ilsole24ore.com/rss/prof_home.xml'),
-                       (u'Ambiente e Sicurezza',u'http://www.ilsole24ore.com/rss/prof_as.xml')
-                     ]
-
-    extra_css = '''
-                html, body, table, tr, td, h1, h2, h3, h4, h5, h6, p, a, span, br, img {margin:0;padding:0;border:0;font-size:12px;font-family:"Georgia","Times New Roman";}
-                .linkHighlight {color:#0292c6;}
-                .txt {border-bottom:1px solid #7c7c7c;padding-bottom:20px};text-align:justify;font-family:"serif"}
-                .txt p {line-height:18px;}
-                .txt span {line-height:22px;}
-                .title h3 {color:#7b7b7b;}
-                .title h4 {color:#08526e;font-size:26px;font-family:"Times New Roman";font-weight:normal;}
-                '''
+          return url.replace('.shtml', '_PRN.shtml')
 

recipes/newsweek.recipe

@@ -1,4 +1,3 @@
-import string
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Newsweek(BasicNewsRecipe):
@@ -11,7 +10,6 @@ class Newsweek(BasicNewsRecipe):
     no_stylesheets = True
 
     BASE_URL = 'http://www.newsweek.com'
-    INDEX = BASE_URL+'/topics.html'
 
     keep_only_tags = dict(name='article', attrs={'class':'article-text'})
     remove_tags = [dict(attrs={'data-dartad':True})]
@@ -23,11 +21,14 @@ class Newsweek(BasicNewsRecipe):
         return soup
 
     def newsweek_sections(self):
-        soup = self.index_to_soup(self.INDEX)
-        for a in soup.findAll('a', title='Primary tag', href=True):
-            yield (string.capitalize(self.tag_to_string(a)),
-                    self.BASE_URL+a['href'])
-
+        return [
+                ('Nation', 'http://www.newsweek.com/tag/nation.html'),
+                ('Society', 'http://www.newsweek.com/tag/society.html'),
+                ('Culture', 'http://www.newsweek.com/tag/culture.html'),
+                ('World', 'http://www.newsweek.com/tag/world.html'),
+                ('Politics', 'http://www.newsweek.com/tag/politics.html'),
+                ('Business', 'http://www.newsweek.com/tag/business.html'),
+        ]
 
     def newsweek_parse_section_page(self, soup):
         for article in soup.findAll('article', about=True,

recipes/slashdot.recipe

@@ -8,23 +8,36 @@ __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net> edited by Huan T'
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Slashdot(BasicNewsRecipe):
-             title          = u'Slashdot.org'
-             description    = '''Tech news. WARNING: This recipe downloads a lot
-             of content and may result in your IP being banned from slashdot.org'''
-             oldest_article = 7
-             simultaneous_downloads = 1
-             delay = 3
-             max_articles_per_feed = 100
-             language = 'en'
+    title          = u'Slashdot.org'
+    description    = '''Tech news. WARNING: This recipe downloads a lot
+    of content and may result in your IP being banned from slashdot.org'''
+    oldest_article = 7
+    simultaneous_downloads = 1
+    delay = 3
+    max_articles_per_feed = 100
+    language = 'en'
 
-             __author__ = 'floweros edited by Huan T'
-             no_stylesheets = True
-#             keep_only_tags = [
-#                 dict(name='div',attrs={'class':'article'}),
-#                 dict(name='div',attrs={'class':'commentTop'}),
-#                 ]
+    __author__ = 'floweros edited by Huan T'
+    no_stylesheets = True
+    keep_only_tags = [
+        dict(name='div',attrs={'id':'article'}),
+        dict(name='div',attrs={'class':['postBody' 'details']}),
+        dict(name='footer',attrs={'class':['clearfix meta article-foot']}),
+        dict(name='article',attrs={'class':['fhitem fhitem-story article usermode thumbs grid_24']}),
+        dict(name='dl',attrs={'class':'relatedPosts'}),
+        dict(name='h2',attrs={'class':'story'}),
+        dict(name='span',attrs={'class':'comments'}),
+        ]
 
-             feeds          = [
+
+    remove_tags    = [
+        dict(name='aside',attrs={'id':'slashboxes'}),
+        dict(name='div',attrs={'class':'paginate'}),
+        dict(name='section',attrs={'id':'comments'}),
+        dict(name='span',attrs={'class':'topic'}),
+        ]
+
+    feeds          = [
                  (u'Slashdot',
  u'http://rss.slashdot.org/Slashdot/slashdot'),
                  (u'/. IT',
@@ -37,5 +50,3 @@ class Slashdot(BasicNewsRecipe):
  u'http://rss.slashdot.org/Slashdot/slashdotYourRightsOnline')
                  ]
 
-             def get_article_url(self, article):
-                          return article.get('feedburner_origlink', None)

recipes/staradvertiser.recipe

@@ -1,5 +1,5 @@
 __license__   = 'GPL v3'
-__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2011, Darko Miletic <darko.miletic at gmail.com>'
 '''
 staradvertiser.com
 '''
@@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class Starbulletin(BasicNewsRecipe):
     title                 = 'Honolulu Star Advertiser'
     __author__            = 'Darko Miletic'
-    description           = "Latest national and local Hawaii sports news"
+    description           = 'Latest national and local Hawaii sports news'
     publisher             = 'Honolulu Star-Advertiser'
     category              = 'news, Honolulu, Hawaii'
     oldest_article        = 2
@@ -19,7 +19,13 @@ class Starbulletin(BasicNewsRecipe):
     use_embedded_content  = False
     encoding              = 'utf8'
     publication_type      = 'newspaper'
-    extra_css             = ' body{font-family: Verdana,Arial,Helvetica,sans-serif} h1,.brown,.postCredit{color: #663300} .storyDeck{font-size: 1.2em; font-weight: bold} '
+    masthead_url          = 'http://media.staradvertiser.com/designimages/star-advertiser-logo-small.gif'
+    extra_css             = """ 
+                                body{font-family: Verdana,Arial,Helvetica,sans-serif} 
+                                h1,.brown,.postCredit{color: #663300} 
+                                .storyDeck{font-size: 1.2em; font-weight: bold}
+                                img{display: block}
+                            """
 
     conversion_options = {
                           'comment'          : description
@@ -28,14 +34,16 @@ class Starbulletin(BasicNewsRecipe):
                         , 'language'         : language
                         , 'linearize_tables' : True
                         }
-
-    remove_tags_before = dict(attrs={'id':'storyTitle'})
-    remove_tags_after  = dict(name='div',attrs={'class':'storytext'})
+    keep_only_tags = [
+                         dict(attrs={'id':'storyTitle'})
+                        ,dict(attrs={'class':['storyDeck','postCredit']})
+                        ,dict(name='span',attrs={'class':'brown'})
+                        ,dict(name='div',attrs={'class':'storytext'})
+                     ]
     remove_tags = [
-                     dict(name=['object','link','script','span'])
-                    ,dict(attrs={'class':'insideStoryImage'})
+                     dict(name=['object','link','script','span','meta','base','iframe'])
+                    ,dict(attrs={'class':['insideStoryImage','insideStoryAd']})
 					,dict(attrs={'name':'fb_share'})
-					,dict(name='div',attrs={'class':'storytext'})
                   ]
 
     feeds = [
@@ -47,3 +55,24 @@ class Starbulletin(BasicNewsRecipe):
              ,(u'Business'  , u'http://www.staradvertiser.com/business/index.rss'           )
              ,(u'Travel'    , u'http://www.staradvertiser.com/travel/index.rss'             )
             ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll('a'):
+            limg = item.find('img')
+            if item.string is not None:
+               str = item.string
+               item.replaceWith(str)
+            else:
+               if limg:
+                  item.name = 'div'
+                  item.attrs = []
+               else:
+                   str = self.tag_to_string(item)
+                   item.replaceWith(str)
+        for item in soup.findAll('img'):
+            if not item.has_key('alt'):
+               item['alt'] = 'image'
+        return soup
+            

recipes/tabu.recipe

@@ -37,10 +37,12 @@ class TabuRo(BasicNewsRecipe):
                      ]
 
     remove_tags = [
-            dict(name='div', attrs={'class':'asemanatoare'})
+            dict(name='div', attrs={'class':'asemanatoare'}),
+			 dict(name='div', attrs={'class':'social'})
                            ]
 
     remove_tags_after = [
+					  dict(name='div', attrs={'class':'social'}),
                       dict(name='div', attrs={'id':'comments'}),
                       dict(name='div', attrs={'class':'asemanatoare'})
                         ]

recipes/the_journal.recipe

@@ -0,0 +1,26 @@
+__license__   = 'GPL v3'
+__copyright__ = '2011 Phil Burns'
+'''
+TheJournal.ie
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class TheJournal(BasicNewsRecipe):
+
+    __author_              = 'Phil Burns'
+    title                  = u'TheJournal.ie'
+    oldest_article         = 1
+    max_articles_per_feed  = 100
+    encoding               = 'utf8'
+    language               = 'en_IE'
+    timefmt                = ' (%A, %B %d, %Y)'
+
+    no_stylesheets         = True
+    remove_tags            = [dict(name='div', attrs={'class':'footer'}),
+                           dict(name=['script', 'noscript'])]
+
+    extra_css              = 'p, div { margin: 0pt; border: 0pt; text-indent: 0.5em }'
+
+    feeds                  = [
+                          (u'Latest News', u'http://www.thejournal.ie/feed/')]

resources/default_tweaks.py

@@ -48,7 +48,7 @@ authors_completer_append_separator = False
 # When this tweak is changed, the author_sort values stored with each author
 # must be recomputed by right-clicking on an author in the left-hand tags pane,
 # selecting 'manage authors', and pressing 'Recalculate all author sort values'.
-author_sort_copy_method = 'invert'
+author_sort_copy_method = 'comma'
 
 #: Use author sort in Tag Browser
 # Set which author field to display in the tags pane (the list of authors,

resources/template-functions.json

@@ -5,6 +5,7 @@
     "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", 
     "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", 
     "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", 
@@ -25,9 +26,9 @@
     "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", 
-    "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", 
     "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", 
+    "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", 
     "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"
 }

setup.py

@@ -15,9 +15,9 @@ from setup import prints, get_warnings
 
 def check_version_info():
     vi = sys.version_info
-    if vi[0] == 2 and vi[1] > 5:
+    if vi[0] == 2 and vi[1] > 6:
         return None
-    return 'calibre requires python >= 2.6'
+    return 'calibre requires python >= 2.7 and < 3'
 
 def option_parser():
     parser = optparse.OptionParser()

setup/__init__.py

@@ -24,8 +24,10 @@ def initialize_constants():
     global __version__, __appname__, modules, functions, basenames, scripts
 
     src = open('src/calibre/constants.py', 'rb').read()
-    __version__ = re.search(r'__version__\s+=\s+[\'"]([^\'"]+)[\'"]', src).group(1)
-    __appname__ = re.search(r'__appname__\s+=\s+[\'"]([^\'"]+)[\'"]', src).group(1)
+    nv = re.search(r'numeric_version\s+=\s+\((\d+), (\d+), (\d+)\)', src)
+    __version__ = '%s.%s.%s'%(nv.group(1), nv.group(2), nv.group(3))
+    __appname__ = re.search(r'__appname__\s+=\s+(u{0,1})[\'"]([^\'"]+)[\'"]',
+            src).group(2)
     epsrc = re.compile(r'entry_points = (\{.*?\})', re.DOTALL).\
             search(open('src/calibre/linux.py', 'rb').read()).group(1)
     entry_points = eval(epsrc, {'__appname__': __appname__})

setup/installer/windows/freeze.py

@@ -13,7 +13,8 @@ from setup import Command, modules, functions, basenames, __version__, \
 from setup.build_environment import msvc, MT, RC
 from setup.installer.windows.wix import WixMixIn
 
-QT_DIR = 'Q:\\Qt\\4.7.1'
+OPENSSL_DIR = r'Q:\openssl'
+QT_DIR = 'Q:\\Qt\\4.7.2'
 QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
@@ -108,6 +109,8 @@ class Win32Freeze(Command, WixMixIn):
         self.dll_dir = self.j(self.base, 'DLLs')
         shutil.copytree(r'C:\Python%s\DLLs'%self.py_ver, self.dll_dir,
                 ignore=shutil.ignore_patterns('msvc*.dll', 'Microsoft.*'))
+        for x in glob.glob(self.j(OPENSSL_DIR, 'bin', '*.dll')):
+            shutil.copy2(x, self.dll_dir)
         for x in QT_DLLS:
             x += '4.dll'
             if not x.startswith('phonon'): x = 'Qt'+x

setup/installer/windows/notes.rst

@@ -53,12 +53,25 @@ SQLite
 
 Put sqlite3*.h from the sqlite windows amlgamation in ~/sw/include
 
+OpenSSL
+--------
+
+First install ActiveState Perl if you dont already have perl in windows
+Download and untar the openssl tarball, follow the instructions in INSTALL.W32 (use no-asm)
+to install use prefix q:\openssl
+
+perl Configure VC-WIN32 no-asm enable-static-engine --prefix=Q:/openssl
+ms\do_ms.bat
+nmake -f ms\ntdll.mak
+nmake -f ms\ntdll.mak test
+nmake -f ms\ntdll.mak install
+
 Qt
 --------
 
 Extract Qt sourcecode to C:\Qt\4.x.x. Run configure and make::
 
-    configure -opensource -release -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs && nmake
+    configure -opensource -release -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs -openssl -I Q:\openssl\include -L Q:\openssl\lib && nmake
 
 SIP
 -----

src/calibre/__init__.py

@@ -3,11 +3,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import uuid, sys, os, re, logging, time, random, \
-       __builtin__, warnings, multiprocessing
-from contextlib import closing
-from urllib import getproxies
-from urllib2 import unquote as urllib2_unquote
+import sys, os, re, time, random, __builtin__, warnings
 __builtin__.__dict__['dynamic_property'] = lambda(func): func(None)
 from htmlentitydefs import name2codepoint
 from math import floor
@@ -16,25 +12,51 @@ from functools import partial
 warnings.simplefilter('ignore', DeprecationWarning)
 
 
-from calibre.constants import iswindows, isosx, islinux, isfreebsd, isfrozen, \
-                              terminal_controller, preferred_encoding, \
-                              __appname__, __version__, __author__, \
-                              win32event, win32api, winerror, fcntl, \
-                              filesystem_encoding, plugins, config_dir
-from calibre.startup import winutil, winutilerror, guess_type
+from calibre.constants import (iswindows, isosx, islinux, isfreebsd, isfrozen,
+                              preferred_encoding, __appname__, __version__, __author__,
+                              win32event, win32api, winerror, fcntl,
+                              filesystem_encoding, plugins, config_dir)
+from calibre.startup import winutil, winutilerror
 
-if islinux and not getattr(sys, 'frozen', False):
-    # Imported before PyQt4 to workaround PyQt4 util-linux conflict on gentoo
+if False and islinux and not getattr(sys, 'frozen', False):
+    # Imported before PyQt4 to workaround PyQt4 util-linux conflict discovered on gentoo
+    # See http://bugs.gentoo.org/show_bug.cgi?id=317557
+    # Importing uuid is slow so get rid of this at some point, maybe in a few
+    # years when even Debian has caught up
+    # Also remember to remove it from site.py in the binary builds
+    import uuid
     uuid.uuid4()
 
 if False:
     # Prevent pyflakes from complaining
     winutil, winutilerror, __appname__, islinux, __version__
-    fcntl, win32event, isfrozen, __author__, terminal_controller
-    winerror, win32api, isfreebsd, guess_type
+    fcntl, win32event, isfrozen, __author__
+    winerror, win32api, isfreebsd
 
-import cssutils
-cssutils.log.setLevel(logging.WARN)
+_mt_inited = False
+def _init_mimetypes():
+    global _mt_inited
+    import mimetypes
+    mimetypes.init([P('mime.types')])
+    _mt_inited = True
+
+def guess_type(*args, **kwargs):
+    import mimetypes
+    if not _mt_inited:
+        _init_mimetypes()
+    return mimetypes.guess_type(*args, **kwargs)
+
+def guess_all_extensions(*args, **kwargs):
+    import mimetypes
+    if not _mt_inited:
+        _init_mimetypes()
+    return mimetypes.guess_all_extensions(*args, **kwargs)
+
+def get_types_map():
+    import mimetypes
+    if not _mt_inited:
+        _init_mimetypes()
+    return mimetypes.types_map
 
 def to_unicode(raw, encoding='utf-8', errors='strict'):
     if isinstance(raw, unicode):
@@ -182,6 +204,7 @@ class CommandLineError(Exception):
     pass
 
 def setup_cli_handlers(logger, level):
+    import logging
     if os.environ.get('CALIBRE_WORKER', None) is not None and logger.handlers:
         return
     logger.setLevel(level)
@@ -243,6 +266,7 @@ def extract(path, dir):
     extractor(path, dir)
 
 def get_proxies(debug=True):
+    from urllib import getproxies
     proxies = getproxies()
     for key, proxy in list(proxies.items()):
         if not proxy or '..' in proxy:
@@ -386,6 +410,7 @@ class StreamReadWrapper(object):
 
 def detect_ncpus():
     """Detects the number of effective CPUs in the system"""
+    import multiprocessing
     ans = -1
     try:
         ans = multiprocessing.cpu_count()
@@ -550,6 +575,9 @@ def get_download_filename(url, cookie_file=None):
     '''
     Get a local filename for a URL using the content disposition header
     '''
+    from contextlib import closing
+    from urllib2 import unquote as urllib2_unquote
+
     filename = ''
 
     br = browser()
@@ -679,4 +707,3 @@ main()
     ipshell()
     sys.argv = old_argv
 
-

src/calibre/constants.py

@@ -1,28 +1,32 @@
+from future_builtins import map
+
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
-__appname__   = 'calibre'
-__version__   = '0.7.56'
-__author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
-
-import re, importlib
-_ver = __version__.split('.')
-_ver = [int(re.search(r'(\d+)', x).group(1)) for x in _ver]
-numeric_version = tuple(_ver)
+__appname__   = u'calibre'
+numeric_version = (0, 7, 57)
+__version__   = u'.'.join(map(unicode, numeric_version))
+__author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 
 '''
 Various run time constants.
 '''
 
-import sys, locale, codecs, os
-from calibre.utils.terminfo import TerminalController
+import sys, locale, codecs, os, importlib, collections
 
-terminal_controller = TerminalController(sys.stdout)
+_tc = None
+def terminal_controller():
+    global _tc
+    if _tc is None:
+        from calibre.utils.terminfo import TerminalController
+        _tc = TerminalController(sys.stdout)
+    return _tc
 
-iswindows = 'win32' in sys.platform.lower() or 'win64' in sys.platform.lower()
-isosx     = 'darwin' in sys.platform.lower()
-isnewosx = isosx and getattr(sys, 'new_app_bundle', False)
-isfreebsd = 'freebsd' in sys.platform.lower()
+_plat = sys.platform.lower()
+iswindows = 'win32' in _plat or 'win64' in _plat
+isosx     = 'darwin' in _plat
+isnewosx  = isosx and getattr(sys, 'new_app_bundle', False)
+isfreebsd = 'freebsd' in _plat
 islinux   = not(iswindows or isosx or isfreebsd)
 isfrozen  = hasattr(sys, 'frozen')
 isunix = isosx or islinux
@@ -41,6 +45,7 @@ fcntl      = None if iswindows else importlib.import_module('fcntl')
 filesystem_encoding = sys.getfilesystemencoding()
 if filesystem_encoding is None: filesystem_encoding = 'utf-8'
 
+
 DEBUG = False
 
 def debug():
@@ -48,15 +53,12 @@ def debug():
     DEBUG = True
 
 # plugins {{{
-plugins = None
-if plugins is None:
-    # Load plugins
-    def load_plugins():
-        plugins = {}
-        plugin_path = sys.extensions_location
-        sys.path.insert(0, plugin_path)
 
-        for plugin in [
+class Plugins(collections.Mapping):
+
+    def __init__(self):
+        self._plugins = {}
+        plugins = [
                 'pictureflow',
                 'lzx',
                 'msdes',
@@ -70,19 +72,44 @@ if plugins is None:
                 'chm_extra',
                 'icu',
                 'speedup',
-            ] + \
-                    (['winutil'] if iswindows else []) + \
-                    (['usbobserver'] if isosx else []):
-            try:
-                p, err = importlib.import_module(plugin), ''
-            except Exception as err:
-                p = None
-                err = str(err)
-            plugins[plugin] = (p, err)
-        sys.path.remove(plugin_path)
-        return plugins
+            ]
+        if iswindows:
+            plugins.append('winutil')
+        if isosx:
+            plugins.append('usbobserver')
+        self.plugins = frozenset(plugins)
 
-    plugins = load_plugins()
+    def load_plugin(self, name):
+        if name in self._plugins:
+            return
+        sys.path.insert(0, sys.extensions_location)
+        try:
+            p, err = importlib.import_module(name), ''
+        except Exception as err:
+            p = None
+            err = str(err)
+        self._plugins[name] = (p, err)
+        sys.path.remove(sys.extensions_location)
+
+    def __iter__(self):
+        return iter(self.plugins)
+
+    def __len__(self):
+        return len(self.plugins)
+
+    def __contains__(self, name):
+        return name in self.plugins
+
+    def __getitem__(self, name):
+        if name not in self.plugins:
+            raise KeyError('No plugin named %r'%name)
+        self.load_plugin(name)
+        return self._plugins[name]
+
+
+plugins = None
+if plugins is None:
+    plugins = Plugins()
 # }}}
 
 # config_dir {{{

src/calibre/customize/builtins.py

@@ -9,7 +9,6 @@ from calibre.customize import FileTypePlugin, MetadataReaderPlugin, \
 from calibre.constants import numeric_version
 from calibre.ebooks.metadata.archive import ArchiveExtract, get_cbz_metadata
 from calibre.ebooks.metadata.opf2 import metadata_to_opf
-from calibre.ebooks.oeb.base import OEB_IMAGES
 from calibre.utils.config import test_eight_code
 
 # To archive plugins {{{
@@ -98,6 +97,8 @@ class TXT2TXTZ(FileTypePlugin):
     on_import = True
 
     def _get_image_references(self, txt, base_dir):
+        from calibre.ebooks.oeb.base import OEB_IMAGES
+
         images = []
 
         # Textile
@@ -626,8 +627,9 @@ if test_eight_code:
     from calibre.ebooks.metadata.sources.amazon import Amazon
     from calibre.ebooks.metadata.sources.openlibrary import OpenLibrary
     from calibre.ebooks.metadata.sources.isbndb import ISBNDB
+    from calibre.ebooks.metadata.sources.overdrive import OverDrive
 
-    plugins += [GoogleBooks, Amazon, OpenLibrary, ISBNDB]
+    plugins += [GoogleBooks, Amazon, OpenLibrary, ISBNDB, OverDrive]
 
 # }}}
 else:
@@ -1160,7 +1162,7 @@ class StoreManyBooksStore(StoreBase):
 class StoreMobileReadStore(StoreBase):
     name = 'MobileRead'
     description = _('Ebooks handcrafted with the utmost care')
-    actual_plugin = 'calibre.gui2.store.mobileread_plugin:MobileReadStore'
+    actual_plugin = 'calibre.gui2.store.mobileread.mobileread_plugin:MobileReadStore'
 
 class StoreOpenLibraryStore(StoreBase):
     name = 'Open Library'

src/calibre/customize/ui.py

@@ -22,6 +22,11 @@ from calibre.utils.config import make_config_dir, Config, ConfigProxy, \
 from calibre.ebooks.epub.fix import ePubFixer
 from calibre.ebooks.metadata.sources.base import Source
 
+builtin_names = frozenset([p.name for p in builtin_plugins])
+
+class NameConflict(ValueError):
+    pass
+
 def _config():
     c = Config('customize')
     c.add_opt('plugins', default={}, help=_('Installed plugins'))
@@ -355,6 +360,9 @@ def set_file_type_metadata(stream, mi, ftype):
 def add_plugin(path_to_zip_file):
     make_config_dir()
     plugin = load_plugin(path_to_zip_file)
+    if plugin.name in builtin_names:
+        raise NameConflict(
+            'A builtin plugin with the name %r already exists' % plugin.name)
     plugin = initialize_plugin(plugin, path_to_zip_file)
     plugins = config['plugins']
     zfp = os.path.join(plugin_dir, plugin.name+'.zip')
@@ -506,7 +514,11 @@ def initialize_plugin(plugin, path_to_zip_file):
 def initialize_plugins():
     global _initialized_plugins
     _initialized_plugins = []
-    for zfp in list(config['plugins'].values()) + builtin_plugins:
+    conflicts = [name for name in config['plugins'] if name in
+            builtin_names]
+    for p in conflicts:
+        remove_plugin(p)
+    for zfp in list(config['plugins'].itervalues()) + builtin_plugins:
         try:
             try:
                 plugin = load_plugin(zfp) if not isinstance(zfp, type) else zfp

src/calibre/debug.py

@@ -106,7 +106,7 @@ def migrate(old, new):
     from calibre.library.database import LibraryDatabase
     from calibre.library.database2 import LibraryDatabase2
     from calibre.utils.terminfo import ProgressBar
-    from calibre import terminal_controller
+    from calibre.constants import terminal_controller
     class Dummy(ProgressBar):
         def setLabelText(self, x): pass
         def setAutoReset(self, y): pass
@@ -119,7 +119,7 @@ def migrate(old, new):
 
     db = LibraryDatabase(old)
     db2 = LibraryDatabase2(new)
-    db2.migrate_old(db, Dummy(terminal_controller, 'Migrating database...'))
+    db2.migrate_old(db, Dummy(terminal_controller(), 'Migrating database...'))
     prefs['library_path'] = os.path.abspath(new)
     print 'Database migrated to', os.path.abspath(new)
 

src/calibre/devices/android/driver.py

@@ -108,10 +108,10 @@ class ANDROID(USBMS):
             'SGH-T849', '_MB300', 'A70S', 'S_ANDROID', 'A101IT', 'A70H',
             'IDEOS_TABLET', 'MYTOUCH_4G', 'UMS_COMPOSITE', 'SCH-I800_CARD',
             '7', 'A956', 'A955', 'A43', 'ANDROID_PLATFORM', 'TEGRA_2',
-            'MB860', 'MULTI-CARD', 'MID7015A']
+            'MB860', 'MULTI-CARD', 'MID7015A', 'INCREDIBLE']
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
-            'A70S', 'A101IT', '7']
+            'A70S', 'A101IT', '7', 'INCREDIBLE']
 
     OSX_MAIN_MEM = 'Android Device Main Memory'
 

src/calibre/devices/apple/driver.py

@@ -201,8 +201,9 @@ class ITUNES(DriverBase):
     #  0x1294   iPhone 3GS
     #  0x1297   iPhone 4
     #  0x129a   iPad
+    #  0x12a2   iPad2
     VENDOR_ID = [0x05ac]
-    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a]
+    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x12a2]
     BCD = [0x01]
 
     # Plugboard ID
@@ -421,7 +422,7 @@ class ITUNES(DriverBase):
 
                         cached_books[this_book.path] = {
                          'title':book.name(),
-                         'author':[book.artist()],
+                         'author':book.artist().split(' & '),
                          'lib_book':library_books[this_book.path] if this_book.path in library_books else None,
                          'dev_book':book,
                          'uuid': book.composer()
@@ -459,7 +460,7 @@ class ITUNES(DriverBase):
 
                             cached_books[this_book.path] = {
                              'title':book.Name,
-                             'author':book.Artist,
+                             'author':book.artist().split(' & '),
                              'lib_book':library_books[this_book.path] if this_book.path in library_books else None,
                              'uuid': book.Composer,
                              'format': 'pdf' if book.KindAsString.startswith('PDF') else 'epub'
@@ -1021,7 +1022,9 @@ class ITUNES(DriverBase):
         if isosx:
             for (i,file) in enumerate(files):
                 format = file.rpartition('.')[2].lower()
-                path = self.path_template % (metadata[i].title, metadata[i].author[0],format)
+                path = self.path_template % (metadata[i].title,
+                                             authors_to_string(metadata[i].authors),
+                                             format)
                 self._remove_existing_copy(path, metadata[i])
                 fpath = self._get_fpath(file, metadata[i], format, update_md=True)
                 db_added, lb_added = self._add_new_copy(fpath, metadata[i])
@@ -1034,9 +1037,11 @@ class ITUNES(DriverBase):
                 if DEBUG:
                     self.log.info("ITUNES.upload_books()")
                     self.log.info(" adding '%s' by '%s' uuid:%s to self.cached_books" %
-                                  ( metadata[i].title, metadata[i].author, metadata[i].uuid))
+                                  (metadata[i].title,
+                                   authors_to_string(metadata[i].authors),
+                                   metadata[i].uuid))
                 self.cached_books[this_book.path] = {
-                   'author': metadata[i].author,
+                   'author': authors_to_string(metadata[i].authors),
                  'dev_book': db_added,
                    'format': format,
                  'lib_book': lb_added,
@@ -1055,7 +1060,9 @@ class ITUNES(DriverBase):
 
                 for (i,file) in enumerate(files):
                     format = file.rpartition('.')[2].lower()
-                    path = self.path_template % (metadata[i].title, metadata[i].author[0],format)
+                    path = self.path_template % (metadata[i].title,
+                                                 authors_to_string(metadata[i].authors),
+                                                 format)
                     self._remove_existing_copy(path, metadata[i])
                     fpath = self._get_fpath(file, metadata[i],format, update_md=True)
                     db_added, lb_added = self._add_new_copy(fpath, metadata[i])
@@ -1075,9 +1082,11 @@ class ITUNES(DriverBase):
                     if DEBUG:
                         self.log.info("ITUNES.upload_books()")
                         self.log.info(" adding '%s' by '%s' uuid:%s to self.cached_books" %
-                                      ( metadata[i].title, metadata[i].author, metadata[i].uuid))
+                                      (metadata[i].title,
+                                       authors_to_string(metadata[i].authors),
+                                       metadata[i].uuid))
                     self.cached_books[this_book.path] = {
-                       'author': metadata[i].author[0],
+                       'author': authors_to_string(metadata[i].authors),
                      'dev_book': db_added,
                        'format': format,
                      'lib_book': lb_added,
@@ -1190,7 +1199,7 @@ class ITUNES(DriverBase):
                         base_fn = base_fn.rpartition('.')[0]
                         db_added = self._find_device_book(
                             { 'title': base_fn if format == 'pdf' else metadata.title,
-                             'author': metadata.authors[0],
+                             'author': authors_to_string(metadata.authors),
                                'uuid': metadata.uuid,
                              'format': format})
                     return db_added
@@ -1255,7 +1264,7 @@ class ITUNES(DriverBase):
                 base_fn = base_fn.rpartition('.')[0]
                 added = self._find_library_book(
                     { 'title': base_fn if format == 'pdf' else metadata.title,
-                     'author': metadata.author[0],
+                     'author': authors_to_string(metadata.authors),
                        'uuid': metadata.uuid,
                      'format': format})
         return added
@@ -1314,7 +1323,7 @@ class ITUNES(DriverBase):
                         with open(metadata.cover,'r+b') as cd:
                             cover_data = cd.read()
                 except:
-                    self.problem_titles.append("'%s' by %s" % (metadata.title, metadata.author[0]))
+                    self.problem_titles.append("'%s' by %s" % (metadata.title, authors_to_string(metadata.authors)))
                     self.log.error("  error scaling '%s' for '%s'" % (metadata.cover,metadata.title))
 
                     import traceback
@@ -1389,7 +1398,7 @@ class ITUNES(DriverBase):
                 thumb_path = path.rpartition('.')[0] + '.jpg'
                 zfw.writestr(thumb_path, thumb)
             except:
-                self.problem_titles.append("'%s' by %s" % (metadata.title, metadata.author[0]))
+                self.problem_titles.append("'%s' by %s" % (metadata.title, authors_to_string(metadata.authors)))
                 self.log.error("   error converting '%s' to thumb for '%s'" % (metadata.cover,metadata.title))
             finally:
                 try:
@@ -1407,7 +1416,7 @@ class ITUNES(DriverBase):
         if DEBUG:
             self.log.info(" ITUNES._create_new_book()")
 
-        this_book = Book(metadata.title, authors_to_string(metadata.author))
+        this_book = Book(metadata.title, authors_to_string(metadata.authors))
         this_book.datetime = time.gmtime()
         this_book.db_id = None
         this_book.device_collections = []
@@ -2451,7 +2460,7 @@ class ITUNES(DriverBase):
             for book in self.cached_books:
                 if self.cached_books[book]['uuid'] == metadata.uuid   or \
                    (self.cached_books[book]['title'] == metadata.title and \
-                   self.cached_books[book]['author'] == metadata.authors[0]):
+                   self.cached_books[book]['author'] == authors_to_string(metadata.authors)):
                     self.update_list.append(self.cached_books[book])
                     self._remove_from_device(self.cached_books[book])
                     if DEBUG:
@@ -2470,7 +2479,7 @@ class ITUNES(DriverBase):
             for book in self.cached_books:
                 if self.cached_books[book]['uuid'] == metadata.uuid   or \
                    (self.cached_books[book]['title'] == metadata.title and \
-                    self.cached_books[book]['author'] == metadata.authors[0]):
+                    self.cached_books[book]['author'] == authors_to_string(metadata.authors)):
                     self.update_list.append(self.cached_books[book])
                     self._remove_from_iTunes(self.cached_books[book])
                     if DEBUG:
@@ -2939,13 +2948,13 @@ class ITUNES(DriverBase):
     def _xform_metadata_via_plugboard(self, book, format):
         ''' Transform book metadata from plugboard templates '''
         if DEBUG:
-            self.log.info("  ITUNES._xform_metadata_via_plugboard()")
+            self.log.info(" ITUNES._xform_metadata_via_plugboard()")
 
         if self.plugboard_func:
             pb = self.plugboard_func(self.DEVICE_PLUGBOARD_NAME, format, self.plugboards)
             newmi = book.deepcopy_metadata()
             newmi.template_to_attribute(book, pb)
-            if DEBUG:
+            if pb is not None and DEBUG:
                 self.log.info(" transforming %s using %s:" % (format, pb))
                 self.log.info("       title: %s %s" % (book.title, ">>> %s" %
                                            newmi.title if book.title != newmi.title else ''))
@@ -3062,7 +3071,7 @@ class ITUNES_ASYNC(ITUNES):
 
                     cached_books[this_book.path] = {
                      'title':library_books[book].name(),
-                     'author':[library_books[book].artist()],
+                     'author':library_books[book].artist().split(' & '),
                      'lib_book':library_books[book],
                      'dev_book':None,
                      'uuid': library_books[book].composer(),
@@ -3102,7 +3111,7 @@ class ITUNES_ASYNC(ITUNES):
 
                         cached_books[this_book.path] = {
                          'title':library_books[book].Name,
-                         'author':library_books[book].Artist,
+                         'author':library_books[book].Artist.split(' & '),
                          'lib_book':library_books[book],
                          'uuid': library_books[book].Composer,
                          'format': format
@@ -3288,7 +3297,7 @@ class Book(Metadata):
     See ebooks.metadata.book.base
     '''
     def __init__(self,title,author):
-        Metadata.__init__(self, title, authors=[author])
+        Metadata.__init__(self, title, authors=author.split(' & '))
 
     @property
     def title_sorter(self):

src/calibre/devices/kindle/apnx.py

@@ -164,7 +164,7 @@ class APNXBuilder(object):
                 if c == '/':
                     closing = True
                     continue
-                elif c == 'p':
+                elif c in ('d', 'p'):
                     if closing:
                         in_p = False
                     else:

src/calibre/devices/scanner.py

@@ -8,7 +8,7 @@ manner.
 import sys, os, re
 from threading import RLock
 
-from calibre import iswindows, isosx, plugins, islinux
+from calibre.constants import iswindows, isosx, plugins, islinux
 
 osx_scanner = win_scanner = linux_scanner = None
 

src/calibre/ebooks/__init__.py

@@ -7,7 +7,7 @@ Code for the conversion of ebook formats and the reading of metadata
 from various formats.
 '''
 
-import traceback, os
+import traceback, os, re
 from calibre import CurrentDir
 
 class ConversionError(Exception):
@@ -169,3 +169,42 @@ def calibre_cover(title, author_string, series_string=None,
         lines.append(TextLine(series_string, author_size))
     return create_cover_page(lines, I('library.png'), output_format='jpg')
 
+UNIT_RE = re.compile(r'^(-*[0-9]*[.]?[0-9]*)\s*(%|em|ex|en|px|mm|cm|in|pt|pc)$')
+
+def unit_convert(value, base, font, dpi):
+    ' Return value in pts'
+    if isinstance(value, (int, long, float)):
+        return value
+    try:
+        return float(value) * 72.0 / dpi
+    except:
+        pass
+    result = value
+    m = UNIT_RE.match(value)
+    if m is not None and m.group(1):
+        value = float(m.group(1))
+        unit = m.group(2)
+        if unit == '%':
+            result = (value / 100.0) * base
+        elif unit == 'px':
+            result = value * 72.0 / dpi
+        elif unit == 'in':
+            result = value * 72.0
+        elif unit == 'pt':
+            result = value
+        elif unit == 'em':
+            result = value * font
+        elif unit in ('ex', 'en'):
+            # This is a hack for ex since we have no way to know
+            # the x-height of the font
+            font = font
+            result = value * font * 0.5
+        elif unit == 'pc':
+            result = value * 12.0
+        elif unit == 'mm':
+            result = value * 0.04
+        elif unit == 'cm':
+            result = value * 0.40
+    return result
+
+

src/calibre/ebooks/chm/reader.py

@@ -5,8 +5,8 @@ __copyright__  = '2008, Kovid Goyal <kovid at kovidgoyal.net>,' \
                  ' and Alex Bramley <a.bramley at gmail.com>.'
 
 import os, re
-from mimetypes import guess_type as guess_mimetype
 
+from calibre import guess_type as guess_mimetype
 from calibre.ebooks.BeautifulSoup import BeautifulSoup, NavigableString
 from calibre.constants import iswindows, filesystem_encoding
 from calibre.utils.chm.chm import CHMFile

src/calibre/ebooks/conversion/plumber.py

@@ -14,7 +14,8 @@ from calibre.ebooks.conversion.preprocess import HTMLPreProcessor
 from calibre.ptempfile import PersistentTemporaryDirectory
 from calibre.utils.date import parse_date
 from calibre.utils.zipfile import ZipFile
-from calibre import extract, walk, isbytestring, filesystem_encoding
+from calibre import (extract, walk, isbytestring, filesystem_encoding,
+        get_types_map)
 from calibre.constants import __version__
 
 DEBUG_README=u'''
@@ -875,6 +876,9 @@ OptionRecommendation(name='sr3_replace',
         if self.opts.verbose:
             self.log.filter_level = self.log.DEBUG
         self.flush()
+        import cssutils, logging
+        cssutils.log.setLevel(logging.WARN)
+        get_types_map() # Ensure the mimetypes module is intialized
 
         if self.opts.debug_pipeline is not None:
             self.opts.verbose = max(self.opts.verbose, 4)

src/calibre/ebooks/conversion/preprocess.py

@@ -399,7 +399,7 @@ class HTMLPreProcessor(object):
                   (re.compile(u'˙\s*(<br.*?>)*\s*Z', re.UNICODE), lambda match: u'Ż'),
 
                   # If pdf printed from a browser then the header/footer has a reliable pattern
-                  (re.compile(r'((?<=</a>)\s*file:////?[A-Z].*<br>|file:////?[A-Z].*<br>(?=\s*<hr>))', re.IGNORECASE), lambda match: ''),
+                  (re.compile(r'((?<=</a>)\s*file:/{2,4}[A-Z].*<br>|file:////?[A-Z].*<br>(?=\s*<hr>))', re.IGNORECASE), lambda match: ''),
 
                   # Center separator lines
                   (re.compile(u'<br>\s*(?P<break>([*#•✦=]+\s*)+)\s*<br>'), lambda match: '<p>\n<p style="text-align:center">' + match.group(1) + '</p>'),

src/calibre/ebooks/conversion/utils.py

@@ -764,6 +764,7 @@ class HeuristicProcessor(object):
         # Multiple sequential blank paragraphs are merged with appropriate margins
         # If non-blank scene breaks exist they are center aligned and styled with appropriate margins.
         if getattr(self.extra_opts, 'format_scene_breaks', False):
+            html = re.sub('(?i)<div[^>]*>\s*<br(\s?/)?>\s*</div>', '<p></p>', html)
             html = self.detect_whitespace(html)
             html = self.detect_soft_breaks(html)
             blanks_count = len(self.any_multi_blank.findall(html))

src/calibre/ebooks/fb2/fb2ml.py

@@ -10,7 +10,6 @@ Transform OEB content into FB2 markup
 
 from base64 import b64encode
 from datetime import datetime
-from mimetypes import types_map
 import re
 import uuid
 
@@ -18,9 +17,6 @@ from lxml import etree
 
 from calibre import prepare_string_for_xml
 from calibre.constants import __appname__, __version__
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace
-from calibre.ebooks.oeb.stylizer import Stylizer
-from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES, OPF
 from calibre.utils.magick import Image
 
 class FB2MLizer(object):
@@ -71,7 +67,7 @@ class FB2MLizer(object):
             return u'<?xml version="1.0" encoding="UTF-8"?>' + output
 
     def clean_text(self, text):
-        # Condense empty paragraphs into a line break. 
+        # Condense empty paragraphs into a line break.
         text = re.sub(r'(?miu)(<p>\s*</p>\s*){3,}', '<empty-line />', text)
         # Remove empty paragraphs.
         text = re.sub(r'(?miu)<p>\s*</p>', '', text)
@@ -100,6 +96,7 @@ class FB2MLizer(object):
         return text
 
     def fb2_header(self):
+        from calibre.ebooks.oeb.base import OPF
         metadata = {}
         metadata['title'] = self.oeb_book.metadata.title[0].value
         metadata['appname'] = __appname__
@@ -180,6 +177,8 @@ class FB2MLizer(object):
         return u'</FictionBook>'
 
     def get_cover(self):
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
+
         cover_href = None
 
         # Get the raster cover if it's available.
@@ -213,6 +212,8 @@ class FB2MLizer(object):
         return u''
 
     def get_text(self):
+        from calibre.ebooks.oeb.base import XHTML
+        from calibre.ebooks.oeb.stylizer import Stylizer
         text = ['<body>']
 
         # Create main section if there are no others to create
@@ -248,6 +249,8 @@ class FB2MLizer(object):
         '''
         This function uses the self.image_hrefs dictionary mapping. It is populated by the dump_text function.
         '''
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
+
         images = []
         for item in self.oeb_book.manifest:
             # Don't write the image if it's not referenced in the document's text.
@@ -255,7 +258,7 @@ class FB2MLizer(object):
                 continue
             if item.media_type in OEB_RASTER_IMAGES:
                 try:
-                    if not item.media_type == types_map['.jpeg'] or not item.media_type == types_map['.jpg']:
+                    if item.media_type != 'image/jpeg':
                         im = Image()
                         im.load(item.data)
                         im.set_compression_quality(70)
@@ -344,6 +347,8 @@ class FB2MLizer(object):
 
         @return: List of string representing the XHTML converted to FB2 markup.
         '''
+        from calibre.ebooks.oeb.base import XHTML_NS, barename, namespace
+
         # Ensure what we are converting is not a string and that the fist tag is part of the XHTML namespace.
         if not isinstance(elem_tree.tag, basestring) or namespace(elem_tree.tag) != XHTML_NS:
             return []

src/calibre/ebooks/html/input.py

@@ -315,7 +315,8 @@ class HTMLInput(InputFormatPlugin):
         from calibre import guess_type
         from calibre.ebooks.oeb.transforms.metadata import \
             meta_info_to_oeb_metadata
-        import cssutils
+        import cssutils, logging
+        cssutils.log.setLevel(logging.WARN)
         self.OEB_STYLES = OEB_STYLES
         oeb = create_oebbook(log, None, opts, self,
                 encoding=opts.input_encoding, populate=False)

src/calibre/ebooks/html/meta.py

@@ -4,7 +4,6 @@ __copyright__ = '2010, Fabian Grassl <fg@jusmeum.de>'
 __docformat__ = 'restructuredtext en'
 
 
-from calibre.ebooks.oeb.base import namespace, barename, DC11_NS
 
 class EasyMeta(object):
 
@@ -12,6 +11,7 @@ class EasyMeta(object):
         self.meta = meta
 
     def __iter__(self):
+        from calibre.ebooks.oeb.base import namespace, barename, DC11_NS
         meta = self.meta
         for item_name in meta.items:
             for item in meta[item_name]:

src/calibre/ebooks/html/output.py

@@ -12,7 +12,6 @@ from os.path import dirname, abspath, relpath, exists, basename
 from lxml import etree
 from templite import Templite
 
-from calibre.ebooks.oeb.base import element
 from calibre.customize.conversion import OutputFormatPlugin, OptionRecommendation
 from calibre import CurrentDir
 from calibre.ptempfile import PersistentTemporaryDirectory
@@ -51,6 +50,7 @@ class HTMLOutput(OutputFormatPlugin):
         '''
         Generate table of contents
         '''
+        from calibre.ebooks.oeb.base import element
         with CurrentDir(output_dir):
             def build_node(current_node, parent=None):
                 if parent is None:

src/calibre/ebooks/htmlz/output.py

@@ -12,7 +12,6 @@ from lxml import etree
 
 from calibre.customize.conversion import OutputFormatPlugin, \
     OptionRecommendation
-from calibre.ebooks.oeb.base import OEB_IMAGES, SVG_MIME
 from calibre.ptempfile import TemporaryDirectory
 from calibre.utils.zipfile import ZipFile
 
@@ -42,6 +41,8 @@ class HTMLZOutput(OutputFormatPlugin):
     ])
 
     def convert(self, oeb_book, output_path, input_plugin, opts, log):
+        from calibre.ebooks.oeb.base import OEB_IMAGES, SVG_MIME
+
         # HTML
         if opts.htmlz_css_type == 'inline':
             from calibre.ebooks.htmlz.oeb2html import OEB2HTMLInlineCSSizer
@@ -72,7 +73,7 @@ class HTMLZOutput(OutputFormatPlugin):
                 for item in oeb_book.manifest:
                     if item.media_type in OEB_IMAGES and item.href in images:
                         if item.media_type == SVG_MIME:
-                            data = unicode(etree.tostring(item.data, encoding=unicode)) 
+                            data = unicode(etree.tostring(item.data, encoding=unicode))
                         else:
                             data = item.data
                         fname = os.path.join(tdir, 'images', images[item.href])

src/calibre/ebooks/metadata/__init__.py

@@ -6,11 +6,11 @@ __docformat__ = 'restructuredtext en'
 """
 Provides abstraction for metadata reading.writing from a variety of ebook formats.
 """
-import os, mimetypes, sys, re
+import os, sys, re
 from urllib import unquote, quote
 from urlparse import urlparse
 
-from calibre import relpath
+from calibre import relpath, guess_type
 
 from calibre.utils.config import tweaks
 
@@ -118,7 +118,7 @@ class Resource(object):
         self.path = None
         self.fragment = ''
         try:
-            self.mime_type = mimetypes.guess_type(href_or_path)[0]
+            self.mime_type = guess_type(href_or_path)[0]
         except:
             self.mime_type = None
         if self.mime_type is None:

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

@@ -592,7 +592,7 @@ class Metadata(object):
             elif datatype == 'bool':
                 res = _('Yes') if res else _('No')
             elif datatype == 'rating':
-                res = res/2
+                res = res/2.0
             return (name, unicode(res), orig_res, cmeta)
 
         # convert top-level ids into their value
@@ -625,6 +625,8 @@ class Metadata(object):
                 res = res + ' [%s]'%self.format_series_index()
             elif datatype == 'datetime':
                 res = format_date(res, fmeta['display'].get('date_format','dd MMM yyyy'))
+            elif datatype == 'rating':
+                res = res/2.0
             return (name, unicode(res), orig_res, fmeta)
 
         return (None, None, None, None)

src/calibre/ebooks/metadata/fb2.py

@@ -5,11 +5,12 @@ __copyright__ = '2008, Anatoly Shipitsin <norguhtar at gmail.com>'
 
 '''Read meta information from fb2 files'''
 
-import mimetypes, os
+import os
 from base64 import b64decode
 from lxml import etree
 from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.chardet import xml_to_unicode
+from calibre import guess_all_extensions
 
 XLINK_NS     = 'http://www.w3.org/1999/xlink'
 def XLINK(name):
@@ -71,7 +72,7 @@ def get_metadata(stream):
             binary = XPath('//fb2:binary[@id="%s"]'%id)(root)
             if binary:
                 mt = binary[0].get('content-type', 'image/jpeg')
-                exts = mimetypes.guess_all_extensions(mt)
+                exts = guess_all_extensions(mt)
                 if not exts:
                     exts = ['.jpg']
                 cdata = (exts[0][1:], b64decode(tostring(binary[0])))

src/calibre/ebooks/metadata/opf2.py

@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 lxml based OPF parser.
 '''
 
-import re, sys, unittest, functools, os, mimetypes, uuid, glob, cStringIO, json
+import re, sys, unittest, functools, os, uuid, glob, cStringIO, json
 from urllib import unquote
 from urlparse import urlparse
 
@@ -20,7 +20,7 @@ from calibre.ebooks.metadata import string_to_authors, MetaInformation, check_is
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.utils.date import parse_date, isoformat
 from calibre.utils.localization import get_lang
-from calibre import prints
+from calibre import prints, guess_type
 from calibre.utils.cleantext import clean_ascii_chars
 
 class Resource(object): # {{{
@@ -42,7 +42,7 @@ class Resource(object): # {{{
         self.path = None
         self.fragment = ''
         try:
-            self.mime_type = mimetypes.guess_type(href_or_path)[0]
+            self.mime_type = guess_type(href_or_path)[0]
         except:
             self.mime_type = None
         if self.mime_type is None:
@@ -1000,7 +1000,7 @@ class OPF(object): # {{{
                 for t in ('cover', 'other.ms-coverimage-standard', 'other.ms-coverimage'):
                     for item in self.guide:
                         if item.type.lower() == t:
-                            self.create_manifest_item(item.href(), mimetypes.guess_type(path)[0])
+                            self.create_manifest_item(item.href(), guess_type(path)[0])
 
         return property(fget=fget, fset=fset)
 

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

@@ -25,6 +25,7 @@ msprefs.defaults['max_tags'] = 20
 msprefs.defaults['wait_after_first_identify_result'] = 30 # seconds
 msprefs.defaults['wait_after_first_cover_result'] = 60 # seconds
 msprefs.defaults['swap_author_names'] = False
+msprefs.defaults['fewer_tags'] = True
 
 # Google covers are often poor quality (scans/errors) but they have high
 # resolution, so they trump covers from better sources. So make sure they
@@ -274,26 +275,34 @@ class Source(Plugin):
 
         if authors:
             # Leave ' in there for Irish names
-            pat = re.compile(r'[-,:;+!@#$%^&*(){}.`~"\s\[\]/]')
+            remove_pat = re.compile(r'[,!@#$%^&*(){}`~"\s\[\]/]')
+            replace_pat = re.compile(r'[-+.:;]')
             if only_first_author:
                 authors = authors[:1]
             for au in authors:
+                au = replace_pat.sub(' ', au)
                 parts = au.split()
                 if ',' in au:
                     # au probably in ln, fn form
                     parts = parts[1:] + parts[:1]
                 for tok in parts:
-                    tok = pat.sub('', tok).strip()
+                    tok = remove_pat.sub('', tok).strip()
                     if len(tok) > 2 and tok.lower() not in ('von', ):
                         yield tok
 
 
-    def get_title_tokens(self, title):
+    def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
         '''
         Take a title and return a list of tokens useful for an AND search query.
-        Excludes connectives and punctuation.
+        Excludes connectives(optionally) and punctuation.
         '''
         if title:
+            # strip sub-titles
+            if strip_subtitle:
+                subtitle = re.compile(r'([\(\[\{].*?[\)\]\}]|[/:\\].*$)')
+                if len(subtitle.sub('', title)) > 1:
+                    title = subtitle.sub('', title)
+
             title_patterns = [(re.compile(pat, re.IGNORECASE), repl) for pat, repl in
             [
                 # Remove things like: (2010) (Omnibus) etc.
@@ -305,17 +314,20 @@ class Source(Plugin):
                 (r'(\d+),(\d+)', r'\1\2'),
                 # Remove hyphens only if they have whitespace before them
                 (r'(\s-)', ' '),
-                # Remove single quotes
-                (r"'", ''),
+                # Remove single quotes not followed by 's'
+                (r"'(?!s)", ''),
                 # Replace other special chars with a space
                 (r'''[:,;+!@#$%^&*(){}.`~"\s\[\]/]''', ' ')
             ]]
+
             for pat, repl in title_patterns:
                 title = pat.sub(repl, title)
+
             tokens = title.split()
             for token in tokens:
                 token = token.strip()
-                if token and token.lower() not in ('a', 'and', 'the'):
+                if token and (not strip_joiners or token.lower() not in ('a',
+                    'and', 'the', '&')):
                     yield token
 
     def split_jobs(self, jobs, num):
@@ -363,7 +375,12 @@ class Source(Plugin):
     def get_book_url(self, identifiers):
         '''
         Return the URL for the book identified by identifiers at this source.
-        If no URL is found, return None.
+        This URL must be browseable to by a human using a browser. It is meant
+        to provide a clickable link for the user to easily visit the books page
+        at this source.
+        If no URL is found, return None. This method must be quick, and
+        consistent, so only implement it if it is possible to construct the URL
+        from a known scheme given identifiers.
         '''
         return None
 

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

@@ -42,6 +42,10 @@ class Worker(Thread):
             self.log.exception('Plugin', self.plugin.name, 'failed')
         self.plugin.dl_time_spent = time.time() - start
 
+    @property
+    def name(self):
+        return self.plugin.name
+
 def is_worker_alive(workers):
     for w in workers:
         if w.is_alive():
@@ -216,7 +220,7 @@ class ISBNMerge(object):
 
         # We assume the smallest set of tags has the least cruft in it
         ans.tags = self.length_merge('tags', results,
-                null_value=ans.tags)
+                null_value=ans.tags, shortest=msprefs['fewer_tags'])
 
         # We assume the longest series has the most info in it
         ans.series = self.length_merge('series', results,
@@ -348,7 +352,11 @@ def identify(log, abort, # {{{
 
         if (first_result_at is not None and time.time() - first_result_at >
                 wait_time):
-            log('Not waiting any longer for more results')
+            log.warn('Not waiting any longer for more results. Still running'
+                    ' sources:')
+            for worker in workers:
+                if worker.is_alive():
+                    log.debug('\t' + worker.name)
             abort.set()
             break
 
@@ -382,7 +390,11 @@ def identify(log, abort, # {{{
             log(plog)
         log('\n'+'*'*80)
 
+        dummy = Metadata(_('Unknown'))
         for i, result in enumerate(presults):
+            for f in plugin.prefs['ignore_fields']:
+                if ':' not in f:
+                    setattr(result, f, getattr(dummy, f))
             result.relevance_in_source = i
             result.has_cached_cover_url = (plugin.cached_cover_url_is_reliable
                     and plugin.get_cached_cover_url(result.identifiers) is not
@@ -400,7 +412,7 @@ def identify(log, abort, # {{{
 
     if msprefs['txt_comments']:
         for r in results:
-            if r.plugin.has_html_comments and r.comments:
+            if r.identify_plugin.has_html_comments and r.comments:
                 r.comments = html2text(r.comments)
 
     max_tags = msprefs['max_tags']
@@ -433,7 +445,7 @@ def urls_from_identifiers(identifiers): # {{{
             pass
     isbn = identifiers.get('isbn', None)
     if isbn:
-        ans.append(('ISBN',
+        ans.append((isbn,
             'http://www.worldcat.org/search?q=bn%%3A%s&qt=advanced'%isbn))
     return ans
 # }}}
@@ -444,13 +456,18 @@ if __name__ == '__main__': # tests {{{
     from calibre.ebooks.metadata.sources.test import (test_identify,
             title_test, authors_test)
     tests = [
+            (
+                {'title':'Magykal Papers',
+                    'authors':['Sage']},
+                [title_test('The Magykal Papers', exact=True)],
+            ),
+
 
             ( # An e-book ISBN not on Amazon, one of the authors is
               # unknown to Amazon
                 {'identifiers':{'isbn': '9780307459671'},
                     'title':'Invisible Gorilla', 'authors':['Christopher Chabris']},
-                [title_test('The Invisible Gorilla',
-                    exact=True), authors_test(['Christopher Chabris', 'Daniel Simons'])]
+                [title_test('The Invisible Gorilla', exact=True)]
 
             ),
 

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

@@ -0,0 +1,455 @@
+#!/usr/bin/env  python
+from __future__ import (unicode_literals, division, absolute_import,
+                        print_function)
+
+__license__   = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+'''
+Fetch metadata using Overdrive Content Reserve
+'''
+import re, random, mechanize, copy, json
+from threading import RLock
+from Queue import Queue, Empty
+
+from lxml import html
+from lxml.html import soupparser
+
+from calibre.ebooks.metadata import check_isbn
+from calibre.ebooks.metadata.sources.base import Source, Option
+from calibre.ebooks.metadata.book.base import Metadata
+from calibre.ebooks.chardet import xml_to_unicode
+from calibre.library.comments import sanitize_comments_html
+
+ovrdrv_data_cache = {}
+cache_lock = RLock()
+base_url = 'http://search.overdrive.com/'
+
+
+class OverDrive(Source):
+
+    name = 'Overdrive'
+    description = _('Downloads metadata from Overdrive\'s Content Reserve')
+
+    capabilities = frozenset(['identify', 'cover'])
+    touched_fields = frozenset(['title', 'authors', 'tags', 'pubdate',
+        'comments', 'publisher', 'identifier:isbn', 'series', 'series_index',
+        'language', 'identifier:overdrive'])
+    has_html_comments = True
+    supports_gzip_transfer_encoding = False
+    cached_cover_url_is_reliable = True
+
+    options = (
+            Option('get_full_metadata', 'bool', False,
+                _('Download all metadata (slow)'),
+                _('Enable this option to gather all metadata available from Overdrive.')),
+            )
+
+    config_help_message = '<p>'+_('Additional metadata can be taken from Overdrive\'s book detail'
+            ' page. This includes a limited set of tags used by libraries, comments, language,'
+            ' and the ebook ISBN. Collecting this data is disabled by default due to the extra'
+            ' time required. Check the download all metadata option below to'
+            ' enable downloading this data.')
+
+    def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
+            identifiers={}, timeout=30):
+        ovrdrv_id = identifiers.get('overdrive', None)
+        isbn = identifiers.get('isbn', None)
+
+        br = self.browser
+        ovrdrv_data = self.to_ovrdrv_data(br, log, title, authors, ovrdrv_id)
+        if ovrdrv_data:
+            title = ovrdrv_data[8]
+            authors = ovrdrv_data[6]
+            mi = Metadata(title, authors)
+            self.parse_search_results(ovrdrv_data, mi)
+            if ovrdrv_id is None:
+                ovrdrv_id = ovrdrv_data[7]
+
+            if self.prefs['get_full_metadata']:
+                self.get_book_detail(br, ovrdrv_data[1], mi, ovrdrv_id, log)
+
+            if isbn is not None:
+                self.cache_isbn_to_identifier(isbn, ovrdrv_id)
+
+            result_queue.put(mi)
+
+        return None
+    # }}}
+
+    def download_cover(self, log, result_queue, abort, # {{{
+            title=None, authors=None, identifiers={}, timeout=30):
+        cached_url = self.get_cached_cover_url(identifiers)
+        if cached_url is None:
+            log.info('No cached cover found, running identify')
+            rq = Queue()
+            self.identify(log, rq, abort, title=title, authors=authors,
+                    identifiers=identifiers)
+            if abort.is_set():
+                return
+            results = []
+            while True:
+                try:
+                    results.append(rq.get_nowait())
+                except Empty:
+                    break
+            results.sort(key=self.identify_results_keygen(
+                title=title, authors=authors, identifiers=identifiers))
+            for mi in results:
+                cached_url = self.get_cached_cover_url(mi.identifiers)
+                if cached_url is not None:
+                    break
+        if cached_url is None:
+            log.info('No cover found')
+            return
+
+        if abort.is_set():
+            return
+
+        ovrdrv_id = identifiers.get('overdrive', None)
+        br = self.browser
+        req = mechanize.Request(cached_url)
+        if ovrdrv_id is not None:
+            referer = self.get_base_referer()+'ContentDetails-Cover.htm?ID='+ovrdrv_id
+            req.add_header('referer', referer)
+
+        log('Downloading cover from:', cached_url)
+        try:
+            cdata = br.open_novisit(req, timeout=timeout).read()
+            result_queue.put((self, cdata))
+        except:
+            log.exception('Failed to download cover from:', cached_url)
+    # }}}
+
+    def get_cached_cover_url(self, identifiers): # {{{
+        url = None
+        ovrdrv_id = identifiers.get('overdrive', None)
+        if ovrdrv_id is None:
+            isbn = identifiers.get('isbn', None)
+            if isbn is not None:
+                ovrdrv_id = self.cached_isbn_to_identifier(isbn)
+        if ovrdrv_id is not None:
+            url = self.cached_identifier_to_cover_url(ovrdrv_id)
+
+        return url
+    # }}}
+
+    def get_base_referer(self): # to be used for passing referrer headers to cover download
+        choices = [
+            'http://overdrive.chipublib.org/82DC601D-7DDE-4212-B43A-09D821935B01/10/375/en/',
+            'http://emedia.clevnet.org/9D321DAD-EC0D-490D-BFD8-64AE2C96ECA8/10/241/en/',
+            'http://singapore.lib.overdrive.com/F11D55BE-A917-4D63-8111-318E88B29740/10/382/en/',
+            'http://ebooks.nypl.org/20E48048-A377-4520-BC43-F8729A42A424/10/257/en/',
+            'http://spl.lib.overdrive.com/5875E082-4CB2-4689-9426-8509F354AFEF/10/335/en/'
+        ]
+        return choices[random.randint(0, len(choices)-1)]
+
+    def format_results(self, reserveid, od_title, subtitle, series, publisher, creators, thumbimage, worldcatlink, formatid):
+        fix_slashes = re.compile(r'\\/')
+        thumbimage = fix_slashes.sub('/', thumbimage)
+        worldcatlink = fix_slashes.sub('/', worldcatlink)
+        cover_url = re.sub('(?P<img>(Ima?g(eType-)?))200', '\g<img>100', thumbimage)
+        social_metadata_url = base_url+'TitleInfo.aspx?ReserveID='+reserveid+'&FormatID='+formatid
+        series_num = ''
+        if not series:
+            if subtitle:
+                title = od_title+': '+subtitle
+            else:
+                title = od_title
+        else:
+            title = od_title
+            m = re.search("([0-9]+$)", subtitle)
+            if m:
+                series_num = float(m.group(1))
+        return [cover_url, social_metadata_url, worldcatlink, series, series_num, publisher, creators, reserveid, title]
+
+    def safe_query(self, br, query_url, post=''):
+        '''
+        The query must be initialized by loading an empty search results page
+        this page attempts to set a cookie that Mechanize doesn't like
+        copy the cookiejar to a separate instance and make a one-off request with the temp cookiejar
+        '''
+        goodcookies = br._ua_handlers['_cookies'].cookiejar
+        clean_cj = mechanize.CookieJar()
+        cookies_to_copy = []
+        for cookie in goodcookies:
+            copied_cookie = copy.deepcopy(cookie)
+            cookies_to_copy.append(copied_cookie)
+        for copied_cookie in cookies_to_copy:
+            clean_cj.set_cookie(copied_cookie)
+
+        if post:
+            br.open_novisit(query_url, post)
+        else:
+            br.open_novisit(query_url)
+
+        br.set_cookiejar(clean_cj)
+
+    def overdrive_search(self, br, log, q, title, author):
+        # re-initialize the cookiejar to so that it's clean
+        clean_cj = mechanize.CookieJar()
+        br.set_cookiejar(clean_cj)
+        q_query = q+'default.aspx/SearchByKeyword'
+        q_init_search = q+'SearchResults.aspx'
+        # get first author as string - convert this to a proper cleanup function later
+        author_tokens = list(self.get_author_tokens(author,
+                only_first_author=True))
+        title_tokens = list(self.get_title_tokens(title,
+                strip_joiners=False, strip_subtitle=True))
+
+        if len(title_tokens) >= len(author_tokens):
+            initial_q = ' '.join(title_tokens)
+            xref_q = '+'.join(author_tokens)
+        else:
+            initial_q = ' '.join(author_tokens)
+            xref_q = '+'.join(title_tokens)
+        #log.error('Initial query is %s'%initial_q)
+        #log.error('Cross reference query is %s'%xref_q)
+        q_xref = q+'SearchResults.svc/GetResults?iDisplayLength=50&sSearch='+xref_q
+        query = '{"szKeyword":"'+initial_q+'"}'
+
+        # main query, requires specific Content Type header
+        req = mechanize.Request(q_query)
+        req.add_header('Content-Type', 'application/json; charset=utf-8')
+        br.open_novisit(req, query)
+
+        # initiate the search without messing up the cookiejar
+        self.safe_query(br, q_init_search)
+
+        # get the search results object
+        results = False
+        while results == False:
+            xreq = mechanize.Request(q_xref)
+            xreq.add_header('X-Requested-With', 'XMLHttpRequest')
+            xreq.add_header('Referer', q_init_search)
+            xreq.add_header('Accept', 'application/json, text/javascript, */*')
+            raw = br.open_novisit(xreq).read()
+            for m in re.finditer(ur'"iTotalDisplayRecords":(?P<displayrecords>\d+).*?"iTotalRecords":(?P<totalrecords>\d+)', raw):
+                if int(m.group('displayrecords')) >= 1:
+                    results = True
+                elif int(m.group('totalrecords')) >= 1:
+                    xref_q = ''
+                    q_xref = q+'SearchResults.svc/GetResults?iDisplayLength=50&sSearch='+xref_q
+                elif int(m.group('totalrecords')) == 0:
+                    return ''
+
+        return self.sort_ovrdrv_results(raw, title, title_tokens, author, author_tokens)
+
+
+    def sort_ovrdrv_results(self, raw, title=None, title_tokens=None, author=None, author_tokens=None, ovrdrv_id=None):
+        close_matches = []
+        raw = re.sub('.*?\[\[(?P<content>.*?)\]\].*', '[[\g<content>]]', raw)
+        results = json.loads(raw)
+        #print results
+        # The search results are either from a keyword search or a multi-format list from a single ID,
+        # sort through the results for closest match/format
+        if results:
+            for reserveid, od_title, subtitle, edition, series, publisher, format, formatid, creators, \
+                    thumbimage, shortdescription, worldcatlink, excerptlink, creatorfile, sorttitle, \
+                    availabletolibrary, availabletoretailer, relevancyrank, unknown1, unknown2, unknown3 in results:
+                #print "this record's title is "+od_title+", subtitle is "+subtitle+", author[s] are "+creators+", series is "+series
+                if ovrdrv_id is not None and int(formatid) in [1, 50, 410, 900]:
+                    #print "overdrive id is not None, searching based on format type priority"
+                    return self.format_results(reserveid, od_title, subtitle, series, publisher,
+                            creators, thumbimage, worldcatlink, formatid)
+                else:
+                    creators = creators.split(', ')
+                    # if an exact match in a preferred format occurs
+                    if (author and creators[0] == author[0]) and od_title == title and int(formatid) in [1, 50, 410, 900] and thumbimage:
+                        return self.format_results(reserveid, od_title, subtitle, series, publisher,
+                                creators, thumbimage, worldcatlink, formatid)
+                    else:
+                        close_title_match = False
+                        close_author_match = False
+                        for token in title_tokens:
+                            if od_title.lower().find(token.lower()) != -1:
+                                close_title_match = True
+                            else:
+                                close_title_match = False
+                                break
+                        for author in creators:
+                            for token in author_tokens:
+                                if author.lower().find(token.lower()) != -1:
+                                    close_author_match = True
+                                else:
+                                    close_author_match = False
+                                    break
+                            if close_author_match:
+                                break
+                        if close_title_match and close_author_match and int(formatid) in [1, 50, 410, 900] and thumbimage:
+                            if subtitle and series:
+                                close_matches.insert(0, self.format_results(reserveid, od_title, subtitle, series, publisher, creators, thumbimage, worldcatlink, formatid))
+                            else:
+                                close_matches.append(self.format_results(reserveid, od_title, subtitle, series, publisher, creators, thumbimage, worldcatlink, formatid))
+            if close_matches:
+                return close_matches[0]
+            else:
+                return ''
+        else:
+            return ''
+
+    def overdrive_get_record(self, br, q, ovrdrv_id):
+        search_url = q+'SearchResults.aspx?ReserveID={'+ovrdrv_id+'}'
+        results_url = q+'SearchResults.svc/GetResults?sEcho=1&iColumns=18&sColumns=ReserveID%2CTitle%2CSubtitle%2CEdition%2CSeries%2CPublisher%2CFormat%2CFormatID%2CCreators%2CThumbImage%2CShortDescription%2CWorldCatLink%2CExcerptLink%2CCreatorFile%2CSortTitle%2CAvailableToLibrary%2CAvailableToRetailer%2CRelevancyRank&iDisplayStart=0&iDisplayLength=10&sSearch=&bEscapeRegex=true&iSortingCols=1&iSortCol_0=17&sSortDir_0=asc'
+
+        # re-initialize the cookiejar to so that it's clean
+        clean_cj = mechanize.CookieJar()
+        br.set_cookiejar(clean_cj)
+        # get the base url to set the proper session cookie
+        br.open_novisit(q)
+
+        # initialize the search
+        self.safe_query(br, search_url)
+
+        # get the results
+        req = mechanize.Request(results_url)
+        req.add_header('X-Requested-With', 'XMLHttpRequest')
+        req.add_header('Referer', search_url)
+        req.add_header('Accept', 'application/json, text/javascript, */*')
+        raw = br.open_novisit(req)
+        raw = str(list(raw))
+        clean_cj = mechanize.CookieJar()
+        br.set_cookiejar(clean_cj)
+        return self.sort_ovrdrv_results(raw, None, None, None, ovrdrv_id)
+
+
+    def find_ovrdrv_data(self, br, log, title, author, isbn, ovrdrv_id=None):
+        q = base_url
+        if ovrdrv_id is None:
+           return self.overdrive_search(br, log, q, title, author)
+        else:
+           return self.overdrive_get_record(br, q, ovrdrv_id)
+
+
+
+    def to_ovrdrv_data(self, br, log, title=None, author=None, ovrdrv_id=None):
+        '''
+        Takes either a title/author combo or an Overdrive ID.  One of these
+        two must be passed to this function.
+        '''
+        if ovrdrv_id is not None:
+            with cache_lock:
+                ans = ovrdrv_data_cache.get(ovrdrv_id, None)
+            if ans:
+                return ans
+            elif ans is False:
+                return None
+            else:
+                ovrdrv_data = self.find_ovrdrv_data(br, log, title, author, ovrdrv_id)
+        else:
+            try:
+                ovrdrv_data = self.find_ovrdrv_data(br, log, title, author, ovrdrv_id)
+            except:
+                import traceback
+                traceback.print_exc()
+                ovrdrv_data = None
+        with cache_lock:
+            ovrdrv_data_cache[ovrdrv_id] = ovrdrv_data if ovrdrv_data else False
+
+        return ovrdrv_data if ovrdrv_data else False
+
+
+    def parse_search_results(self, ovrdrv_data, mi):
+        '''
+        Parse the formatted search results from the initial Overdrive query and
+        add the values to the metadta.
+
+        The list object has these values:
+        [cover_url[0], social_metadata_url[1], worldcatlink[2], series[3], series_num[4],
+        publisher[5], creators[6], reserveid[7], title[8]]
+
+        '''
+        ovrdrv_id = ovrdrv_data[7]
+        mi.set_identifier('overdrive', ovrdrv_id)
+
+        if len(ovrdrv_data[3]) > 1:
+            mi.series = ovrdrv_data[3]
+            if ovrdrv_data[4]:
+                try:
+                    mi.series_index = float(ovrdrv_data[4])
+                except:
+                    pass
+        mi.publisher = ovrdrv_data[5]
+        mi.authors = ovrdrv_data[6]
+        mi.title = ovrdrv_data[8]
+        cover_url = ovrdrv_data[0]
+        if cover_url:
+            self.cache_identifier_to_cover_url(ovrdrv_id,
+                    cover_url)
+
+
+    def get_book_detail(self, br, metadata_url, mi, ovrdrv_id, log):
+        try:
+            raw = br.open_novisit(metadata_url).read()
+        except Exception, e:
+            if callable(getattr(e, 'getcode', None)) and \
+                    e.getcode() == 404:
+                return False
+            raise
+        raw = xml_to_unicode(raw, strip_encoding_pats=True,
+                resolve_entities=True)[0]
+        try:
+            root = soupparser.fromstring(raw)
+        except:
+            return False
+
+        pub_date = root.xpath("//div/label[@id='ctl00_ContentPlaceHolder1_lblPubDate']/text()")
+        lang = root.xpath("//div/label[@id='ctl00_ContentPlaceHolder1_lblLanguage']/text()")
+        subjects = root.xpath("//div/label[@id='ctl00_ContentPlaceHolder1_lblSubjects']/text()")
+        ebook_isbn = root.xpath("//td/label[@id='ctl00_ContentPlaceHolder1_lblIdentifier']/text()")
+        desc = root.xpath("//div/label[@id='ctl00_ContentPlaceHolder1_lblDescription']/ancestor::div[1]")
+
+        if pub_date:
+            from calibre.utils.date import parse_date
+            try:
+                mi.pubdate = parse_date(pub_date[0].strip())
+            except:
+                pass
+        if lang:
+            lang = lang[0].strip().lower()
+            mi.language = {'english':'en', 'french':'fr', 'german':'de',
+                    'spanish':'es'}.get(lang, None)
+
+        if ebook_isbn:
+            #print "ebook isbn is "+str(ebook_isbn[0])
+            isbn = check_isbn(ebook_isbn[0].strip())
+            if isbn:
+                self.cache_isbn_to_identifier(isbn, ovrdrv_id)
+                mi.isbn = isbn
+        if subjects:
+            mi.tags = [tag.strip() for tag in subjects[0].split(',')]
+
+        if desc:
+            desc = desc[0]
+            desc = html.tostring(desc, method='html', encoding=unicode).strip()
+            # remove all attributes from tags
+            desc = re.sub(r'<([a-zA-Z0-9]+)\s[^>]+>', r'<\1>', desc)
+            # Remove comments
+            desc = re.sub(r'(?s)<!--.*?-->', '', desc)
+            mi.comments = sanitize_comments_html(desc)
+
+        return None
+
+
+if __name__ == '__main__':
+    # To run these test use:
+    # calibre-debug -e src/calibre/ebooks/metadata/sources/overdrive.py
+    from calibre.ebooks.metadata.sources.test import (test_identify_plugin,
+            title_test, authors_test)
+    test_identify_plugin(OverDrive.name,
+        [
+
+            (
+                {'title':'Foundation and Earth',
+                    'authors':['Asimov']},
+                [title_test('Foundation and Earth', exact=True),
+                    authors_test(['Isaac Asimov'])]
+            ),
+
+            (
+                {'title': 'Elephants', 'authors':['Agatha']},
+                [title_test('Elephants Can Remember', exact=False),
+                    authors_test(['Agatha Christie'])]
+            ),
+    ])

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

@@ -15,14 +15,17 @@ from calibre.customize.ui import metadata_plugins
 from calibre import prints, sanitize_file_name2
 from calibre.ebooks.metadata import check_isbn
 from calibre.ebooks.metadata.sources.base import (create_log,
-        get_cached_cover_urls)
+        get_cached_cover_urls, msprefs)
 
 def isbn_test(isbn):
     isbn_ = check_isbn(isbn)
 
     def test(mi):
         misbn = check_isbn(mi.isbn)
-        return misbn and misbn == isbn_
+        if misbn and misbn == isbn_:
+            return True
+        prints('ISBN test failed. Expected: \'%s\' found \'%s\''%(isbn_, misbn))
+        return False
 
     return test
 
@@ -32,8 +35,11 @@ def title_test(title, exact=False):
 
     def test(mi):
         mt = mi.title.lower()
-        return (exact and mt == title) or \
-                (not exact and title in mt)
+        if (exact and mt == title) or \
+                (not exact and title in mt):
+            return True
+        prints('Title test failed. Expected: \'%s\' found \'%s\''%(title, mt))
+        return False
 
     return test
 
@@ -42,7 +48,39 @@ def authors_test(authors):
 
     def test(mi):
         au = set([x.lower() for x in mi.authors])
-        return au == authors
+        if msprefs['swap_author_names']:
+            def revert_to_fn_ln(a):
+                if ',' not in a:
+                    return a
+                parts = a.split(',', 1)
+                t = parts[-1]
+                parts = parts[:-1]
+                parts.insert(0, t)
+                return ' '.join(parts)
+
+            au = set([revert_to_fn_ln(x) for x in au])
+
+        if au == authors:
+            return True
+        prints('Author test failed. Expected: \'%s\' found \'%s\''%(authors, au))
+        return False
+
+    return test
+
+def series_test(series, series_index):
+    series = series.lower()
+
+    def test(mi):
+        ms = mi.series.lower() if mi.series else ''
+        if (ms == series) and (series_index == mi.series_index):
+            return True
+        if mi.series:
+            prints('Series test failed. Expected: \'%s [%d]\' found \'%s[%d]\''% \
+                        (series, series_index, ms, mi.series_index))
+        else:
+            prints('Series test failed. Expected: \'%s [%d]\' found no series'% \
+                        (series, series_index))
+        return False
 
     return test
 

src/calibre/ebooks/mobi/reader.py

@@ -20,7 +20,7 @@ from calibre.utils.filenames import ascii_filename
 from calibre.utils.date import parse_date
 from calibre.utils.cleantext import clean_ascii_chars
 from calibre.ptempfile import TemporaryDirectory
-from calibre.ebooks import DRMError
+from calibre.ebooks import DRMError, unit_convert
 from calibre.ebooks.chardet import ENCODING_PATS
 from calibre.ebooks.mobi import MobiError
 from calibre.ebooks.mobi.huffcdic import HuffReader
@@ -258,6 +258,8 @@ class MobiReader(object):
                 }
                 ''')
         self.tag_css_rules = {}
+        self.left_margins = {}
+        self.text_indents = {}
 
         if hasattr(filename_or_stream, 'read'):
             stream = filename_or_stream
@@ -567,9 +569,21 @@ class MobiReader(object):
                     elif tag.tag == 'img':
                         tag.set('width', width)
                     else:
-                        styles.append('text-indent: %s' % self.ensure_unit(width))
+                        ewidth = self.ensure_unit(width)
+                        styles.append('text-indent: %s' % ewidth)
+                        try:
+                            ewidth_val = unit_convert(ewidth, 12, 500, 166)
+                            self.text_indents[tag] = ewidth_val
+                        except:
+                            pass
                         if width.startswith('-'):
                             styles.append('margin-left: %s' % self.ensure_unit(width[1:]))
+                            try:
+                                ewidth_val = unit_convert(ewidth[1:], 12, 500, 166)
+                                self.left_margins[tag] = ewidth_val
+                            except:
+                                pass
+
             if attrib.has_key('align'):
                 align = attrib.pop('align').strip()
                 if align:
@@ -661,6 +675,26 @@ class MobiReader(object):
             if hasattr(parent, 'remove'):
                 parent.remove(tag)
 
+    def get_left_whitespace(self, tag):
+
+        def whitespace(tag):
+            lm = ti = 0.0
+            if tag.tag == 'p':
+                ti = unit_convert('1.5em', 12, 500, 166)
+            if tag.tag == 'blockquote':
+                lm = unit_convert('2em', 12, 500, 166)
+            lm = self.left_margins.get(tag, lm)
+            ti = self.text_indents.get(tag, ti)
+            return lm + ti
+
+        parent = tag
+        ans = 0.0
+        while parent is not None:
+            ans += whitespace(parent)
+            parent = parent.getparent()
+
+        return ans
+
     def create_opf(self, htmlfile, guide=None, root=None):
         mi = getattr(self.book_header.exth, 'mi', self.embedded_mi)
         if mi is None:
@@ -731,16 +765,45 @@ class MobiReader(object):
                             except:
                                 text = ''
                             text = ent_pat.sub(entity_to_unicode, text)
-                            tocobj.add_item(toc.partition('#')[0], href[1:],
+                            item = tocobj.add_item(toc.partition('#')[0], href[1:],
                                 text)
+                            item.left_space = int(self.get_left_whitespace(x))
                             found = True
                     if reached and found and x.get('class', None) == 'mbp_pagebreak':
                         break
             if tocobj is not None:
+                tocobj = self.structure_toc(tocobj)
                 opf.set_toc(tocobj)
 
         return opf, ncx_manifest_entry
 
+    def structure_toc(self, toc):
+        indent_vals = set()
+        for item in toc:
+            indent_vals.add(item.left_space)
+        if len(indent_vals) > 6 or len(indent_vals) < 2:
+            # Too many or too few levels, give up
+            return toc
+        indent_vals = sorted(indent_vals)
+
+        last_found = [None for i in indent_vals]
+
+        newtoc = TOC()
+
+        def find_parent(level):
+            candidates = last_found[:level]
+            for x in reversed(candidates):
+                if x is not None:
+                    return x
+            return newtoc
+
+        for item in toc:
+            level = indent_vals.index(item.left_space)
+            parent = find_parent(level)
+            last_found[level] = parent.add_item(item.href, item.fragment,
+                        item.text)
+
+        return newtoc
 
     def sizeof_trailing_entries(self, data):
         def sizeof_trailing_entry(ptr, psize):

src/calibre/ebooks/oeb/base.py

@@ -8,23 +8,18 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
 import os, re, uuid, logging
-from mimetypes import types_map
 from collections import defaultdict
 from itertools import count
 from urlparse import urldefrag, urlparse, urlunparse, urljoin
 from urllib import unquote as urlunquote
 
 from lxml import etree, html
-from cssutils import CSSParser, parseString, parseStyle, replaceUrls
-from cssutils.css import CSSRule
-
-import calibre
-from calibre.constants import filesystem_encoding
+from calibre.constants import filesystem_encoding, __version__
 from calibre.translations.dynamic import translate
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.ebooks.oeb.entitydefs import ENTITYDEFS
 from calibre.ebooks.conversion.preprocess import CSSPreProcessor
-from calibre import isbytestring, as_unicode
+from calibre import isbytestring, as_unicode, get_types_map
 
 RECOVER_PARSER = etree.XMLParser(recover=True, no_network=True)
 
@@ -179,6 +174,9 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
     If the ``link_repl_func`` returns None, the attribute or
     tag text will be removed completely.
     '''
+    from cssutils import parseString, parseStyle, replaceUrls, log
+    log.setLevel(logging.WARN)
+
     if resolve_base_href:
         resolve_base_href(root)
     for el, attrib, link, pos in iterlinks(root, find_links_in_css=False):
@@ -248,7 +246,7 @@ def rewrite_links(root, link_repl_func, resolve_base_href=False):
                 el.attrib['style'] = repl
 
 
-
+types_map = get_types_map()
 EPUB_MIME      = types_map['.epub']
 XHTML_MIME     = types_map['.xhtml']
 CSS_MIME       = types_map['.css']
@@ -1075,7 +1073,9 @@ class Manifest(object):
 
 
         def _parse_css(self, data):
-
+            from cssutils.css import CSSRule
+            from cssutils import CSSParser, log
+            log.setLevel(logging.WARN)
             def get_style_rules_from_import(import_rule):
                 ans = []
                 if not import_rule.styleSheet:
@@ -2011,7 +2011,7 @@ class OEBBook(object):
             name='dtb:uid', content=unicode(self.uid))
         etree.SubElement(head, NCX('meta'),
             name='dtb:depth', content=str(self.toc.depth()))
-        generator = ''.join(['calibre (', calibre.__version__, ')'])
+        generator = ''.join(['calibre (', __version__, ')'])
         etree.SubElement(head, NCX('meta'),
             name='dtb:generator', content=generator)
         etree.SubElement(head, NCX('meta'),

src/calibre/ebooks/oeb/profile.py

@@ -1,75 +0,0 @@
-'''
-Device profiles.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
-from itertools import izip
-
-FONT_SIZES = [('xx-small', 1),
-              ('x-small',  None),
-              ('small',    2),
-              ('medium',   3),
-              ('large',    4),
-              ('x-large',  5),
-              ('xx-large', 6),
-              (None,       7)]
-
-
-class Profile(object):
-    def __init__(self, width, height, dpi, fbase, fsizes):
-        self.width = (float(width) / dpi) * 72.
-        self.height = (float(height) / dpi) * 72.
-        self.dpi = float(dpi)
-        self.fbase = float(fbase)
-        self.fsizes = []
-        for (name, num), size in izip(FONT_SIZES, fsizes):
-            self.fsizes.append((name, num, float(size)))
-        self.fnames = dict((name, sz) for name, _, sz in self.fsizes if name)
-        self.fnums = dict((num, sz) for _, num, sz in self.fsizes if num)
-
-
-PROFILES = {
-    'PRS505':
-        Profile(width=584, height=754, dpi=168.451, fbase=12,
-                fsizes=[7.5, 9, 10, 12, 15.5, 20, 22, 24]),
-
-    'MSReader':
-        Profile(width=480, height=652, dpi=96, fbase=13,
-                fsizes=[10, 11, 13, 16, 18, 20, 22, 26]),
-
-    # Not really, but let's pretend
-    'Mobipocket':
-        Profile(width=600, height=800, dpi=96, fbase=18,
-                fsizes=[14, 14, 16, 18, 20, 22, 24, 26]),
-    
-    # No clue on usable screen size; DPI should be good
-    'HanlinV3':
-        Profile(width=584, height=754, dpi=168.451, fbase=16,
-                fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
-
-    'CybookG3':
-        Profile(width=600, height=800, dpi=168.451, fbase=16,
-                fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
-
-    'Kindle':
-        Profile(width=525, height=640, dpi=168.451, fbase=16,
-                fsizes=[12, 12, 14, 16, 18, 20, 22, 24]),
-    
-    'Browser':
-        Profile(width=800, height=600, dpi=100.0, fbase=12,
-                fsizes=[5, 7, 9, 12, 13.5, 17, 20, 22, 24])
-    }
-
-
-class Context(object):
-    PROFILES = PROFILES
-    
-    def __init__(self, source, dest):
-        if source in PROFILES:
-            source = PROFILES[source]
-        if dest in PROFILES:
-            dest = PROFILES[dest]
-        self.source = source
-        self.dest = dest

src/calibre/ebooks/oeb/reader.py

@@ -10,11 +10,9 @@ import sys, os, uuid, copy, re, cStringIO
 from itertools import izip
 from urlparse import urldefrag, urlparse
 from urllib import unquote as urlunquote
-from mimetypes import guess_type
 from collections import defaultdict
 
 from lxml import etree
-import cssutils
 
 from calibre.ebooks.oeb.base import OPF1_NS, OPF2_NS, OPF2_NSMAP, DC11_NS, \
     DC_NSES, OPF, xml2text
@@ -30,6 +28,7 @@ from calibre.ebooks.oeb.entitydefs import ENTITYDEFS
 from calibre.utils.localization import get_lang
 from calibre.ptempfile import TemporaryDirectory
 from calibre.constants import __appname__, __version__
+from calibre import guess_type
 
 __all__ = ['OEBReader']
 
@@ -172,6 +171,7 @@ class OEBReader(object):
         return bad
 
     def _manifest_add_missing(self, invalid):
+        import cssutils
         manifest = self.oeb.manifest
         known = set(manifest.hrefs)
         unchecked = set(manifest.values())

src/calibre/ebooks/oeb/stylizer.py

@@ -12,16 +12,17 @@ import os, itertools, re, logging, copy, unicodedata
 from weakref import WeakKeyDictionary
 from xml.dom import SyntaxErr as CSSSyntaxError
 import cssutils
-from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
-    CSSValueList, CSSFontFaceRule, cssproperties
+from cssutils.css import (CSSStyleRule, CSSPageRule, CSSStyleDeclaration,
+    CSSValueList, CSSFontFaceRule, cssproperties)
 from cssutils import profile as cssprofiles
 from lxml import etree
 from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError
-
 from calibre import force_unicode
+from calibre.ebooks import unit_convert
 from calibre.ebooks.oeb.base import XHTML, XHTML_NS, CSS_MIME, OEB_STYLES
 from calibre.ebooks.oeb.base import XPNSMAP, xpath, urlnormalize
-from calibre.ebooks.oeb.profile import PROFILES
+
+cssutils.log.setLevel(logging.WARN)
 
 _html_css_stylesheet = None
 
@@ -121,10 +122,10 @@ class CSSSelector(etree.XPath):
 class Stylizer(object):
     STYLESHEETS = WeakKeyDictionary()
 
-    def __init__(self, tree, path, oeb, opts, profile=PROFILES['PRS505'],
+    def __init__(self, tree, path, oeb, opts, profile=None,
             extra_css='', user_css=''):
         self.oeb, self.opts = oeb, opts
-        self.profile = profile
+        self.profile = opts.input_profile
         self.logger = oeb.logger
         item = oeb.manifest.hrefs[path]
         basename = os.path.basename(path)
@@ -443,7 +444,6 @@ class Stylizer(object):
 
 
 class Style(object):
-    UNIT_RE = re.compile(r'^(-*[0-9]*[.]?[0-9]*)\s*(%|em|ex|en|px|mm|cm|in|pt|pc)$')
     MS_PAT = re.compile(r'^\s*(mso-|panose-|text-underline|tab-interval)')
 
     def __init__(self, element, stylizer):
@@ -506,43 +506,11 @@ class Style(object):
         return result
 
     def _unit_convert(self, value, base=None, font=None):
-        ' Return value in pts'
-        if isinstance(value, (int, long, float)):
-            return value
-        try:
-            return float(value) * 72.0 / self._profile.dpi
-        except:
-            pass
-        result = value
-        m = self.UNIT_RE.match(value)
-        if m is not None and m.group(1):
-            value = float(m.group(1))
-            unit = m.group(2)
-            if unit == '%':
-                if base is None:
-                    base = self.width
-                result = (value / 100.0) * base
-            elif unit == 'px':
-                result = value * 72.0 / self._profile.dpi
-            elif unit == 'in':
-                result = value * 72.0
-            elif unit == 'pt':
-                result = value
-            elif unit == 'em':
-                font = font or self.fontSize
-                result = value * font
-            elif unit in ('ex', 'en'):
-                # This is a hack for ex since we have no way to know
-                # the x-height of the font
-                font = font or self.fontSize
-                result = value * font * 0.5
-            elif unit == 'pc':
-                result = value * 12.0
-            elif unit == 'mm':
-                result = value * 0.04
-            elif unit == 'cm':
-                result = value * 0.40
-        return result
+        'Return value in pts'
+        if base is None:
+            base = self.width
+        font = font or self.fontSize
+        return unit_convert(value, base, font, self._profile.dpi)
 
     def pt_to_px(self, value):
         return (self._profile.dpi / 72.0) * value

src/calibre/ebooks/oeb/transforms/filenames.py

@@ -9,7 +9,6 @@ import posixpath
 from urlparse import urldefrag, urlparse
 
 from lxml import etree
-import cssutils
 
 from calibre.ebooks.oeb.base import rewrite_links, urlnormalize
 
@@ -25,6 +24,7 @@ class RenameFiles(object): # {{{
         self.renamed_items_map = renamed_items_map
 
     def __call__(self, oeb, opts):
+        import cssutils
         self.log = oeb.logger
         self.opts = opts
         self.oeb = oeb

src/calibre/ebooks/oeb/transforms/trimmanifest.py

@@ -8,8 +8,6 @@ __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 from urlparse import urldefrag
 
-import cssutils
-
 from calibre.ebooks.oeb.base import CSS_MIME, OEB_DOCS
 from calibre.ebooks.oeb.base import urlnormalize, iterlinks
 
@@ -23,6 +21,7 @@ class ManifestTrimmer(object):
         return cls()
 
     def __call__(self, oeb, context):
+        import cssutils
         oeb.logger.info('Trimming unused files from manifest...')
         self.opts = context
         used = set()

src/calibre/ebooks/pdb/ereader/writer.py

@@ -21,7 +21,6 @@ except ImportError:
 import cStringIO
 
 from calibre.ebooks.pdb.formatwriter import FormatWriter
-from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
 from calibre.ebooks.pdb.header import PdbHeaderBuilder
 from calibre.ebooks.pml.pmlml import PMLMLizer
 
@@ -135,6 +134,7 @@ class Writer(FormatWriter):
         62-...: Raw image data in 8 bit PNG format.
         '''
         images = []
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
 
         for item in manifest:
             if item.media_type in OEB_RASTER_IMAGES and item.href in image_hrefs.keys():

src/calibre/ebooks/pml/output.py

@@ -18,7 +18,6 @@ from calibre.customize.conversion import OutputFormatPlugin
 from calibre.customize.conversion import OptionRecommendation
 from calibre.ptempfile import TemporaryDirectory
 from calibre.utils.zipfile import ZipFile
-from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
 from calibre.ebooks.pml.pmlml import PMLMLizer
 
 class PMLOutput(OutputFormatPlugin):
@@ -60,6 +59,7 @@ class PMLOutput(OutputFormatPlugin):
             pmlz.add_dir(tdir)
 
     def write_images(self, manifest, image_hrefs, out_dir, opts):
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
         for item in manifest:
             if item.media_type in OEB_RASTER_IMAGES and item.href in image_hrefs.keys():
                 if opts.full_image_depth:

src/calibre/ebooks/pml/pmlml.py

@@ -12,8 +12,6 @@ import re
 
 from lxml import etree
 
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace
-from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.ebooks.pdb.ereader import image_name
 from calibre.ebooks.pml import unipmlcode
 
@@ -110,6 +108,9 @@ class PMLMLizer(object):
         return output
 
     def get_cover_page(self):
+        from calibre.ebooks.oeb.stylizer import Stylizer
+        from calibre.ebooks.oeb.base import XHTML
+
         output = u''
         if 'cover' in self.oeb_book.guide:
             output += '\\m="cover.png"\n'
@@ -125,6 +126,9 @@ class PMLMLizer(object):
         return output
 
     def get_text(self):
+        from calibre.ebooks.oeb.stylizer import Stylizer
+        from calibre.ebooks.oeb.base import XHTML
+
         text = [u'']
         for item in self.oeb_book.spine:
             self.log.debug('Converting %s to PML markup...' % item.href)
@@ -180,7 +184,7 @@ class PMLMLizer(object):
         links = set(re.findall(r'(?<=\\q="#).+?(?=")', text))
         for unused in anchors.difference(links):
             text = text.replace('\\Q="%s"' % unused, '')
-            
+
         # Remove \Cn tags that are within \x and \Xn tags
         text = re.sub(ur'(?msu)(?P<t>\\(x|X[0-4]))(?P<a>.*?)(?P<c>\\C[0-4]\s*=\s*"[^"]*")(?P<b>.*?)(?P=t)', '\g<t>\g<a>\g<b>\g<t>', text)
 
@@ -214,6 +218,8 @@ class PMLMLizer(object):
         return text
 
     def dump_text(self, elem, stylizer, page, tag_stack=[]):
+        from calibre.ebooks.oeb.base import XHTML_NS, barename, namespace
+
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:
             return []

src/calibre/ebooks/rb/rbml.py

@@ -11,8 +11,6 @@ Transform OEB content into RB compatible markup.
 import re
 
 from calibre import prepare_string_for_xml
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace
-from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.ebooks.rb import unique_name
 
 TAGS = [
@@ -81,6 +79,8 @@ class RBMLizer(object):
         return output
 
     def get_cover_page(self):
+        from calibre.ebooks.oeb.stylizer import Stylizer
+        from calibre.ebooks.oeb.base import XHTML
         output = u''
         if 'cover' in self.oeb_book.guide:
             if self.name_map.get(self.oeb_book.guide['cover'].href, None):
@@ -109,6 +109,9 @@ class RBMLizer(object):
         return ''.join(toc)
 
     def get_text(self):
+        from calibre.ebooks.oeb.stylizer import Stylizer
+        from calibre.ebooks.oeb.base import XHTML
+
         output = [u'']
         for item in self.oeb_book.spine:
             self.log.debug('Converting %s to RocketBook HTML...' % item.href)
@@ -137,6 +140,8 @@ class RBMLizer(object):
         return text
 
     def dump_text(self, elem, stylizer, page, tag_stack=[]):
+        from calibre.ebooks.oeb.base import XHTML_NS, barename, namespace
+
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:
             return [u'']

src/calibre/ebooks/rb/writer.py

@@ -18,7 +18,6 @@ import cStringIO
 from calibre.ebooks.rb.rbml import RBMLizer
 from calibre.ebooks.rb import HEADER
 from calibre.ebooks.rb import unique_name
-from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
 from calibre.constants import __appname__, __version__
 
 TEXT_RECORD_SIZE = 4096
@@ -111,6 +110,7 @@ class RBWriter(object):
         return (size, pages)
 
     def _images(self, manifest):
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
         images = []
         used_names = []
 

src/calibre/ebooks/rtf/rtfml.py

@@ -14,9 +14,6 @@ import cStringIO
 
 from lxml import etree
 
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace, \
-    OEB_RASTER_IMAGES
-from calibre.ebooks.oeb.stylizer import Stylizer
 from calibre.ebooks.metadata import authors_to_string
 from calibre.utils.filenames import ascii_text
 from calibre.utils.magick.draw import save_cover_data_to, identify_data
@@ -100,6 +97,8 @@ class RTFMLizer(object):
         return self.mlize_spine()
 
     def mlize_spine(self):
+        from calibre.ebooks.oeb.base import XHTML
+        from calibre.ebooks.oeb.stylizer import Stylizer
         output = self.header()
         if 'titlepage' in self.oeb_book.guide:
             href = self.oeb_book.guide['titlepage'].href
@@ -154,6 +153,8 @@ class RTFMLizer(object):
         return ' }'
 
     def insert_images(self, text):
+        from calibre.ebooks.oeb.base import OEB_RASTER_IMAGES
+
         for item in self.oeb_book.manifest:
             if item.media_type in OEB_RASTER_IMAGES:
                 src = os.path.basename(item.href)
@@ -201,6 +202,8 @@ class RTFMLizer(object):
         return text
 
     def dump_text(self, elem, stylizer, tag_stack=[]):
+        from calibre.ebooks.oeb.base import XHTML_NS, namespace, barename
+
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:
             p = elem.getparent()

src/calibre/ebooks/snb/input.py

@@ -7,7 +7,6 @@ __docformat__ = 'restructuredtext en'
 import os, uuid
 
 from calibre.customize.conversion import InputFormatPlugin
-from calibre.ebooks.oeb.base import DirContainer
 from calibre.ebooks.snb.snbfile import SNBFile
 from calibre.ptempfile import TemporaryDirectory
 from calibre.utils.filenames import ascii_filename
@@ -30,6 +29,7 @@ class SNBInput(InputFormatPlugin):
 
     def convert(self, stream, options, file_ext, log,
                 accelerators):
+        from calibre.ebooks.oeb.base import DirContainer
         log.debug("Parsing SNB file...")
         snbFile = SNBFile()
         try:

src/calibre/ebooks/snb/snbfile.py

@@ -5,7 +5,8 @@ __copyright__ = '2010, Li Fanxi <lifanxi@freemindworld.com>'
 __docformat__ = 'restructuredtext en'
 
 import sys, struct, zlib, bz2, os
-from mimetypes import types_map
+
+from calibre import guess_type
 
 class FileStream:
     def IsBinary(self):
@@ -180,7 +181,7 @@ class SNBFile:
                 file = open(os.path.join(path, fname), 'wb')
                 file.write(f.fileBody)
                 file.close()
-                fileNames.append((fname, types_map[ext]))
+                fileNames.append((fname, guess_type('a'+ext)[0]))
         return fileNames
 
     def Output(self, outputFile):

src/calibre/ebooks/snb/snbml.py

@@ -13,8 +13,6 @@ import re
 
 from lxml import etree
 
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace
-from calibre.ebooks.oeb.stylizer import Stylizer
 
 def ProcessFileName(fileName):
     # Flat the path
@@ -81,6 +79,8 @@ class SNBMLizer(object):
                     body.append(entity)
 
     def mlize(self):
+        from calibre.ebooks.oeb.base import XHTML
+        from calibre.ebooks.oeb.stylizer import Stylizer
         output = [ u'' ]
         stylizer = Stylizer(self.item.data, self.item.href, self.oeb_book, self.opts, self.opts.output_profile)
         content = unicode(etree.tostring(self.item.data.find(XHTML('body')), encoding=unicode))
@@ -208,6 +208,7 @@ class SNBMLizer(object):
         return text
 
     def dump_text(self, subitems, elem, stylizer, end='', pre=False, li = ''):
+        from calibre.ebooks.oeb.base import XHTML_NS, barename, namespace
 
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:

src/calibre/ebooks/txt/output.py

@@ -11,7 +11,6 @@ from lxml import etree
 
 from calibre.customize.conversion import OutputFormatPlugin, \
     OptionRecommendation
-from calibre.ebooks.oeb.base import OEB_IMAGES
 from calibre.ebooks.txt.txtml import TXTMLizer
 from calibre.ebooks.txt.newlines import TxtNewlines, specified_newlines
 from calibre.ptempfile import TemporaryDirectory, TemporaryFile
@@ -103,12 +102,13 @@ class TXTOutput(OutputFormatPlugin):
 
 
 class TXTZOutput(TXTOutput):
-    
+
     name = 'TXTZ Output'
     author = 'John Schember'
     file_type = 'txtz'
 
     def convert(self, oeb_book, output_path, input_plugin, opts, log):
+        from calibre.ebooks.oeb.base import OEB_IMAGES
         with TemporaryDirectory('_txtz_output') as tdir:
             # TXT
             with TemporaryFile('index.txt') as tf:
@@ -123,10 +123,10 @@ class TXTZOutput(TXTOutput):
                         os.makedirs(path)
                     with open(os.path.join(tdir, item.href), 'wb') as imgf:
                         imgf.write(item.data)
-            
+
             # Metadata
-            with open(os.path.join(tdir, 'metadata.opf'), 'wb') as mdataf: 
+            with open(os.path.join(tdir, 'metadata.opf'), 'wb') as mdataf:
                 mdataf.write(etree.tostring(oeb_book.metadata.to_opf1()))
-            
+
             txtz = ZipFile(output_path, 'w')
             txtz.add_dir(tdir)

src/calibre/ebooks/txt/txtml.py

@@ -12,8 +12,6 @@ import re
 
 from lxml import etree
 
-from calibre.ebooks.oeb.base import XHTML, XHTML_NS, barename, namespace
-from calibre.ebooks.oeb.stylizer import Stylizer
 
 BLOCK_TAGS = [
     'div',
@@ -58,12 +56,14 @@ class TXTMLizer(object):
         self.toc_titles = []
         self.toc_ids = []
         self.last_was_heading = False
-        
+
         self.create_flat_toc(self.oeb_book.toc)
 
         return self.mlize_spine()
 
     def mlize_spine(self):
+        from calibre.ebooks.oeb.base import XHTML
+        from calibre.ebooks.oeb.stylizer import Stylizer
         output = [u'']
         output.append(self.get_toc())
         for item in self.oeb_book.spine:
@@ -139,7 +139,7 @@ class TXTMLizer(object):
         # when remove paragraph spacing is enabled.
         text = re.sub('(?imu)^[ ]+', '', text)
         text = re.sub('(?imu)[ ]+$', '', text)
-        
+
         # Remove empty space and newlines at the beginning of the document.
         text = re.sub(r'(?u)^[ \n]+', '', text)
 
@@ -185,6 +185,7 @@ class TXTMLizer(object):
         @stylizer: The style information attached to the element.
         @page: OEB page used to determine absolute urls.
         '''
+        from calibre.ebooks.oeb.base import XHTML_NS, barename, namespace
 
         if not isinstance(elem.tag, basestring) \
            or namespace(elem.tag) != XHTML_NS:

src/calibre/gui2/__init__.py

@@ -4,19 +4,17 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, sys, Queue, threading
 from threading import RLock
 from urllib import unquote
-
-from PyQt4.Qt import QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt, \
-                         QByteArray, QTranslator, QCoreApplication, QThread, \
-                         QEvent, QTimer, pyqtSignal, QDate, QDesktopServices, \
-                         QFileDialog, QFileIconProvider, \
-                         QIcon, QApplication, QDialog, QUrl, QFont
+from PyQt4.Qt import (QVariant, QFileInfo, QObject, SIGNAL, QBuffer, Qt,
+                    QByteArray, QTranslator, QCoreApplication, QThread,
+                    QEvent, QTimer, pyqtSignal, QDate, QDesktopServices,
+                    QFileDialog, QFileIconProvider,
+                    QIcon, QApplication, QDialog, QUrl, QFont)
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
 from calibre.constants import islinux, iswindows, isfreebsd, isfrozen, isosx
 from calibre.utils.config import Config, ConfigProxy, dynamic, JSONConfig
 from calibre.utils.localization import set_qt_translator
-from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
 from calibre.ebooks.metadata import MetaInformation
 from calibre.utils.date import UNDEFINED_DATE
 
@@ -156,7 +154,9 @@ def _config():
     c.add_opt('plugin_search_history', default=[],
         help='Search history for the recipe scheduler')
     c.add_opt('worker_limit', default=6,
-            help=_('Maximum number of waiting worker processes'))
+            help=_(
+        'Maximum number of simultaneous conversion/news download jobs. '
+        'This number is twice the actual value for historical reasons.'))
     c.add_opt('get_social_metadata', default=True,
             help=_('Download social metadata (tags/rating/etc.)'))
     c.add_opt('overwrite_author_title_metadata', default=True,
@@ -330,6 +330,7 @@ class GetMetadata(QObject):
                   id, args, kwargs)
 
     def _from_formats(self, id, args, kwargs):
+        from calibre.ebooks.metadata.meta import metadata_from_formats
         try:
             mi = metadata_from_formats(*args, **kwargs)
         except:
@@ -337,6 +338,7 @@ class GetMetadata(QObject):
         self.emit(SIGNAL('metadataf(PyQt_PyObject, PyQt_PyObject)'), id, mi)
 
     def _get_metadata(self, id, args, kwargs):
+        from calibre.ebooks.metadata.meta import get_metadata
         try:
             mi = get_metadata(*args, **kwargs)
         except:
@@ -738,3 +740,4 @@ def build_forms(srcdir, info=None):
 _df = os.environ.get('CALIBRE_DEVELOP_FROM', None)
 if _df and os.path.exists(_df):
     build_forms(_df)
+

src/calibre/gui2/actions/annotate.py

@@ -22,7 +22,7 @@ class FetchAnnotationsAction(InterfaceAction):
     action_type = 'current'
 
     def genesis(self):
-        pass
+        self.qaction.triggered.connect(self.fetch_annotations)
 
     def fetch_annotations(self, *args):
         # Generate a path_map from selected ids
@@ -52,6 +52,10 @@ class FetchAnnotationsAction(InterfaceAction):
             return path_map
 
         device = self.gui.device_manager.device
+        if not getattr(device, 'SUPPORTS_ANNOTATIONS', False):
+            return error_dialog(self.gui, _('Not supported'),
+                    _('Fetching annotations is not supported for this device'),
+                    show=True)
 
         if self.gui.current_view() is not self.gui.library_view:
             return error_dialog(self.gui, _('Use library only'),

src/calibre/gui2/actions/catalog.py

@@ -17,7 +17,7 @@ from calibre.gui2.actions import InterfaceAction
 class GenerateCatalogAction(InterfaceAction):
 
     name = 'Generate Catalog'
-    action_spec = (_('Create a catalog of the books in your calibre library'), None, None, None)
+    action_spec = (_('Create a catalog of the books in your calibre library'), 'catalog.png', 'Catalog builder', None)
     dont_add_to = frozenset(['menubar-device', 'toolbar-device', 'context-menu-device'])
 
     def generate_catalog(self):

src/calibre/gui2/actions/edit_metadata.py

@@ -8,14 +8,15 @@ __docformat__ = 'restructuredtext en'
 import os
 from functools import partial
 
-from PyQt4.Qt import Qt, QMenu, QModelIndex
+from PyQt4.Qt import Qt, QMenu, QModelIndex, QTimer
 
-from calibre.gui2 import error_dialog, config, Dispatcher
+from calibre.gui2 import error_dialog, config, Dispatcher, question_dialog
 from calibre.gui2.dialogs.metadata_single import MetadataSingleDialog
 from calibre.gui2.dialogs.metadata_bulk import MetadataBulkDialog
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.dialogs.tag_list_editor import TagListEditor
 from calibre.gui2.actions import InterfaceAction
+from calibre.ebooks.metadata import authors_to_string
 from calibre.utils.icu import sort_key
 from calibre.utils.config import test_eight_code
 
@@ -37,8 +38,6 @@ class EditMetadataAction(InterfaceAction):
         md.addSeparator()
         if test_eight_code:
             dall = self.download_metadata
-            dident = partial(self.download_metadata, covers=False)
-            dcovers = partial(self.download_metadata, identify=False)
         else:
             dall = partial(self.download_metadata_old, False, covers=True)
             dident = partial(self.download_metadata_old, False, covers=False)
@@ -47,9 +46,9 @@ class EditMetadataAction(InterfaceAction):
 
         md.addAction(_('Download metadata and covers'), dall,
                 Qt.ControlModifier+Qt.Key_D)
-        md.addAction(_('Download only metadata'), dident)
-        md.addAction(_('Download only covers'), dcovers)
         if not test_eight_code:
+            md.addAction(_('Download only metadata'), dident)
+            md.addAction(_('Download only covers'), dcovers)
             md.addAction(_('Download only social metadata'),
                 partial(self.download_metadata_old, False, covers=False,
                     set_metadata=False, set_social_metadata=True))
@@ -80,7 +79,8 @@ class EditMetadataAction(InterfaceAction):
         self.qaction.setEnabled(enabled)
         self.action_merge.setEnabled(enabled)
 
-    def download_metadata(self, identify=True, covers=True, ids=None):
+    # Download metadata {{{
+    def download_metadata(self, ids=None):
         if ids is None:
             rows = self.gui.library_view.selectionModel().selectedRows()
             if not rows or len(rows) == 0:
@@ -90,14 +90,73 @@ class EditMetadataAction(InterfaceAction):
             ids = [db.id(row.row()) for row in rows]
         from calibre.gui2.metadata.bulk_download2 import start_download
         start_download(self.gui, ids,
-                Dispatcher(self.bulk_metadata_downloaded), identify, covers)
+                Dispatcher(self.metadata_downloaded))
 
-    def bulk_metadata_downloaded(self, job):
+    def metadata_downloaded(self, job):
         if job.failed:
             self.gui.job_exception(job, dialog_title=_('Failed to download metadata'))
             return
-        from calibre.gui2.metadata.bulk_download2 import proceed
-        proceed(self.gui, job)
+        from calibre.gui2.metadata.bulk_download2 import get_job_details
+        id_map, failed_ids, failed_covers, all_failed, det_msg = \
+                                            get_job_details(job)
+        if all_failed:
+            return error_dialog(self.gui, _('Download failed'),
+            _('Failed to download metadata or covers for any of the %d'
+               ' book(s).') % len(id_map), det_msg=det_msg, show=True)
+
+        self.gui.status_bar.show_message(_('Metadata download completed'), 3000)
+
+        msg = '<p>' + _('Finished downloading metadata for <b>%d book(s)</b>. '
+            'Proceed with updating the metadata in your library?')%len(id_map)
+
+        show_copy_button = False
+        if failed_ids or failed_covers:
+            show_copy_button = True
+            msg += '<p>'+_('Could not download metadata and/or covers for %d of the books. Click'
+                    ' "Show details" to see which books.')%len(failed_ids)
+
+        payload = (id_map, failed_ids, failed_covers)
+        from calibre.gui2.dialogs.message_box import ProceedNotification
+        p = ProceedNotification(self.apply_downloaded_metadata,
+                payload, job.html_details,
+                _('Download log'), _('Download complete'), msg,
+                det_msg=det_msg, show_copy_button=show_copy_button,
+                parent=self.gui)
+        p.show()
+
+    def apply_downloaded_metadata(self, payload):
+        id_map, failed_ids, failed_covers = payload
+        id_map = dict([(k, v) for k, v in id_map.iteritems() if k not in
+            failed_ids])
+        if not id_map:
+            return
+
+        modified = set()
+        db = self.gui.current_db
+
+        for i, mi in id_map.iteritems():
+            lm = db.metadata_last_modified(i, index_is_id=True)
+            if lm > mi.last_modified:
+                title = db.title(i, index_is_id=True)
+                authors = db.authors(i, index_is_id=True)
+                if authors:
+                    authors = [x.replace('|', ',') for x in authors.split(',')]
+                    title += ' - ' + authors_to_string(authors)
+                modified.add(title)
+
+        if modified:
+            from calibre.utils.icu import lower
+
+            modified = sorted(modified, key=lower)
+            if not question_dialog(self.gui, _('Some books changed'), '<p>'+
+                    _('The metadata for some books in your library has'
+                        ' changed since you started the download. If you'
+                        ' proceed, some of those changes may be overwritten. '
+                        'Click "Show details" to see the list of changed books. '
+                        'Do you want to proceed?'), det_msg='\n'.join(modified)):
+                return
+
+        self.apply_metadata_changes(id_map)
 
     def download_metadata_old(self, checked, covers=True, set_metadata=True,
             set_social_metadata=None):
@@ -142,6 +201,7 @@ class EditMetadataAction(InterfaceAction):
                 x.updated, cr)
             if self.gui.cover_flow:
                 self.gui.cover_flow.dataChanged()
+    # }}}
 
     def edit_metadata(self, checked, bulk=None):
         '''
@@ -468,4 +528,89 @@ class EditMetadataAction(InterfaceAction):
             self.gui.upload_collections(model.db, view=view, oncard=oncard)
             view.reset()
 
+    # Apply bulk metadata changes {{{
+    def apply_metadata_changes(self, id_map, title=None, msg=''):
+        '''
+        Apply the metadata changes in id_map to the database synchronously
+        id_map must be a mapping of ids to Metadata objects. Set any fields you
+        do not want updated in the Metadata object to null. An easy way to do
+        that is to create a metadata object as Metadata(_('Unknown')) and then
+        only set the fields you want changed on this object.
+        '''
+        if title is None:
+            title = _('Applying changed metadata')
+        self.apply_id_map = list(id_map.iteritems())
+        self.apply_current_idx = 0
+        self.apply_failures = []
+        self.applied_ids = []
+        self.apply_pd = None
+        if len(self.apply_id_map) > 1:
+            from calibre.gui2.dialogs.progress import ProgressDialog
+            self.apply_pd = ProgressDialog(title, msg, min=0,
+                    max=len(self.apply_id_map)-1, parent=self.gui,
+                    cancelable=False)
+            self.apply_pd.setModal(True)
+            self.apply_pd.show()
+        self.do_one_apply()
+
+
+    def do_one_apply(self):
+        if self.apply_current_idx >= len(self.apply_id_map):
+            return self.finalize_apply()
+
+        i, mi = self.apply_id_map[self.apply_current_idx]
+        db = self.gui.current_db
+        try:
+            set_title = not mi.is_null('title')
+            set_authors = not mi.is_null('authors')
+            db.set_metadata(i, mi, commit=False, set_title=set_title,
+                    set_authors=set_authors, notify=False)
+            self.applied_ids.append(i)
+        except:
+            import traceback
+            self.apply_failures.append((i, traceback.format_exc()))
+
+        try:
+            if mi.cover:
+                os.remove(mi.cover)
+        except:
+            pass
+
+        self.apply_current_idx += 1
+        if self.apply_pd is not None:
+            self.apply_pd.value += 1
+        QTimer.singleShot(50, self.do_one_apply)
+
+    def finalize_apply(self):
+        db = self.gui.current_db
+        db.commit()
+
+        if self.apply_pd is not None:
+            self.apply_pd.hide()
+
+        if self.apply_failures:
+            msg = []
+            for i, tb in self.apply_failures:
+                title = db.title(i, index_is_id=True)
+                authors = db.authors(i, index_is_id=True)
+                if authors:
+                    authors = [x.replace('|', ',') for x in authors.split(',')]
+                    title += ' - ' + authors_to_string(authors)
+                msg.append(title+'\n\n'+tb+'\n'+('*'*80))
+
+            error_dialog(self.gui, _('Some failures'),
+                _('Failed to apply updated metadata for some books'
+                    ' in your library. Click "Show Details" to see '
+                    'details.'), det_msg='\n\n'.join(msg), show=True)
+        if self.applied_ids:
+            cr = self.gui.library_view.currentIndex().row()
+            self.gui.library_view.model().refresh_ids(
+                self.applied_ids, cr)
+            if self.gui.cover_flow:
+                self.gui.cover_flow.dataChanged()
+
+        self.apply_id_map = []
+        self.apply_pd = None
+
+    # }}}
 

src/calibre/gui2/actions/store.py

@@ -11,6 +11,7 @@ from functools import partial
 from PyQt4.Qt import QMenu
 
 from calibre.gui2.actions import InterfaceAction
+from calibre.gui2.dialogs.confirm_delete import confirm
 
 class StoreAction(InterfaceAction):
 
@@ -31,9 +32,35 @@ class StoreAction(InterfaceAction):
         self.qaction.setMenu(self.store_menu)
 
     def search(self):
-        from calibre.gui2.store.search import SearchDialog
+        self.show_disclaimer()
+        from calibre.gui2.store.search.search import SearchDialog
         sd = SearchDialog(self.gui.istores, self.gui)
         sd.exec_()
 
     def open_store(self, store_plugin):
+        self.show_disclaimer()
         store_plugin.open(self.gui)
+
+    def show_disclaimer(self):
+        confirm(('<p>' +
+            _('Calibre helps you find the ebooks you want by searching '
+            'the websites of various commercial and public domain '
+            'book sources for you.') +
+            '<p>' +
+            _('Using the integrated search you can easily find which '
+            'store has the book you are looking for, at the best price. '
+            'You also get DRM status and other useful information.')
+            + '<p>' +
+            _('All transactions (paid or otherwise) are handled between '
+            'you and the book seller. '
+            'Calibre is not part of this process and any issues related '
+            'to a purchase should be directed to the website you are '
+            'buying from. Be sure to double check that any books you get '
+            'will work with your e-book reader, especially if the book you '
+            'are buying has '
+            '<a href="http://drmfree.calibre-ebook.com/about#drm">DRM</a>.'
+            )), 'about_get_books_msg',
+            parent=self.gui, show_cancel_button=False,
+            confirm_msg=_('Show this message again'),
+            pixmap='dialog_information.png', title=_('About Get Books'))
+

src/calibre/gui2/book_details.py

@@ -418,6 +418,7 @@ class BookDetails(QWidget): # {{{
             if y is None:
                 # Local image
                 self.cover_view.paste_from_clipboard(x)
+                self.update_layout()
             else:
                 self.remote_file_dropped.emit(x, y)
                 # We do not support setting cover *and* adding formats for
@@ -449,6 +450,7 @@ class BookDetails(QWidget): # {{{
         self.setAcceptDrops(True)
         self._layout = DetailsLayout(vertical, self)
         self.setLayout(self._layout)
+        self.current_path = ''
 
         self.cover_view = CoverView(vertical, self)
         self.cover_view.cover_changed.connect(self.cover_changed.emit)
@@ -482,15 +484,19 @@ class BookDetails(QWidget): # {{{
     def show_data(self, data):
         self.book_info.show_data(data)
         self.cover_view.show_data(data)
+        self.current_path = data.get(_('Path'), '')
+        self.update_layout()
+
+    def update_layout(self):
         self._layout.do_layout(self.rect())
         try:
             sz = self.cover_view.pixmap.size()
         except:
             sz = QSize(0, 0)
         self.setToolTip(
-                '<p>'+_('Double-click to open Book Details window') +
-                '<br><br>' + _('Path') + ': ' + data.get(_('Path'), '') +
-                '<br><br>' + _('Cover size: %dx%d')%(sz.width(), sz.height())
+            '<p>'+_('Double-click to open Book Details window') +
+            '<br><br>' + _('Path') + ': ' + self.current_path +
+            '<br><br>' + _('Cover size: %dx%d')%(sz.width(), sz.height())
         )
 
     def reset_info(self):

src/calibre/gui2/custom_column_widgets.py

@@ -289,6 +289,7 @@ class Series(Base):
         values = self.all_values = list(self.db.all_custom(num=self.col_id))
         values.sort(key=sort_key)
         w = MultiCompleteComboBox(parent)
+        w.set_separator(None)
         w.setSizeAdjustPolicy(w.AdjustToMinimumContentsLengthWithIcon)
         w.setMinimumContentsLength(25)
         self.name_widget = w

src/calibre/gui2/device.py

@@ -7,7 +7,7 @@ import os, traceback, Queue, time, cStringIO, re, sys
 from threading import Thread
 
 from PyQt4.Qt import QMenu, QAction, QActionGroup, QIcon, SIGNAL, \
-                     Qt, pyqtSignal, QDialog
+                     Qt, pyqtSignal, QDialog, QObject
 
 from calibre.customize.ui import available_input_formats, available_output_formats, \
     device_plugins
@@ -25,12 +25,10 @@ from calibre.devices.errors import FreeSpaceError
 from calibre.devices.apple.driver import ITUNES_ASYNC
 from calibre.devices.folder_device.driver import FOLDER_DEVICE
 from calibre.devices.bambook.driver import BAMBOOK, BAMBOOKWifi
-from calibre.ebooks.metadata.meta import set_metadata
 from calibre.constants import DEBUG
 from calibre.utils.config import prefs, tweaks
 from calibre.utils.magick.draw import thumbnail
-from calibre.library.save_to_disk import plugboard_any_device_value, \
-                                         plugboard_any_format_value
+from calibre.library.save_to_disk import find_plugboard
 # }}}
 
 class DeviceJob(BaseJob): # {{{
@@ -93,23 +91,6 @@ class DeviceJob(BaseJob): # {{{
 
     # }}}
 
-def find_plugboard(device_name, format, plugboards):
-    cpb = None
-    if format in plugboards:
-        cpb = plugboards[format]
-    elif plugboard_any_format_value in plugboards:
-        cpb = plugboards[plugboard_any_format_value]
-    if cpb is not None:
-        if device_name in cpb:
-            cpb = cpb[device_name]
-        elif plugboard_any_device_value in cpb:
-            cpb = cpb[plugboard_any_device_value]
-        else:
-            cpb = None
-    if DEBUG:
-        prints('Device using plugboard', format, device_name, cpb)
-    return cpb
-
 def device_name_for_plugboards(device_class):
     if hasattr(device_class, 'DEVICE_PLUGBOARD_NAME'):
         return device_class.DEVICE_PLUGBOARD_NAME
@@ -352,6 +333,7 @@ class DeviceManager(Thread): # {{{
 
     def _upload_books(self, files, names, on_card=None, metadata=None, plugboards=None):
         '''Upload books to device: '''
+        from calibre.ebooks.metadata.meta import set_metadata
         if hasattr(self.connected_device, 'set_plugboards') and \
                 callable(self.connected_device.set_plugboards):
             self.connected_device.set_plugboards(plugboards, find_plugboard)
@@ -605,6 +587,24 @@ class DeviceMenu(QMenu): # {{{
 
     # }}}
 
+class DeviceSignals(QObject):
+    #: This signal is emitted once, after metadata is downloaded from the
+    #: connected device.
+    #: The sequence: gui.device_manager.is_device_connected will become True,
+    #: and the device_connection_changed signal will be emitted,
+    #: then sometime later gui.device_metadata_available will be signaled.
+    #: This does not mean that there are no more jobs running. Automatic metadata
+    #: management might have kicked off a sync_booklists to write new metadata onto
+    #: the device, and that job might still be running when the signal is emitted.
+    device_metadata_available = pyqtSignal()
+
+    #: This signal is emitted once when the device is detected and once when
+    #: it is disconnected. If the parameter is True, then it is a connection,
+    #: otherwise a disconnection.
+    device_connection_changed = pyqtSignal(object)
+
+device_signals = DeviceSignals()
+
 class DeviceMixin(object): # {{{
 
     def __init__(self):
@@ -753,6 +753,7 @@ class DeviceMixin(object): # {{{
             self.location_manager.update_devices()
             self.library_view.set_device_connected(self.device_connected)
             self.refresh_ondevice()
+        device_signals.device_connection_changed.emit(connected)
 
     def info_read(self, job):
         '''
@@ -791,6 +792,7 @@ class DeviceMixin(object): # {{{
         self.sync_news()
         self.sync_catalogs()
         self.refresh_ondevice()
+        device_signals.device_metadata_available.emit()
 
     def refresh_ondevice(self, reset_only = False):
         '''
@@ -892,7 +894,7 @@ class DeviceMixin(object): # {{{
                 sub_dest_parts.append('')
             to = sub_dest_parts[0]
             fmts = sub_dest_parts[1]
-            subject = ';'.join(sub_dest_parts[2:]) 
+            subject = ';'.join(sub_dest_parts[2:])
             fmts = [x.strip().lower() for x in fmts.split(',')]
             self.send_by_mail(to, fmts, delete, subject=subject)
 

src/calibre/gui2/dialogs/confirm_delete.py

@@ -24,11 +24,18 @@ class Dialog(QDialog, Ui_Dialog):
         dynamic[confirm_config_name(self.name)] = self.again.isChecked()
 
 
-def confirm(msg, name, parent=None, pixmap='dialog_warning.png'):
+def confirm(msg, name, parent=None, pixmap='dialog_warning.png', title=None,
+        show_cancel_button=True, confirm_msg=None):
     if not dynamic.get(confirm_config_name(name), True):
         return True
     d = Dialog(msg, name, parent)
     d.label.setPixmap(QPixmap(I(pixmap)))
     d.setWindowIcon(QIcon(I(pixmap)))
+    if title is not None:
+        d.setWindowTitle(title)
+    if not show_cancel_button:
+        d.buttonBox.button(d.buttonBox.Cancel).setVisible(False)
+    if confirm_msg is not None:
+        d.again.setText(confirm_msg)
     d.resize(d.sizeHint())
     return d.exec_() == d.Accepted

src/calibre/gui2/dialogs/message_box.py

@@ -6,13 +6,13 @@ __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 
-from PyQt4.Qt import QDialog, QIcon, QApplication, QSize, QKeySequence, \
-    QAction, Qt
+from PyQt4.Qt import (QDialog, QIcon, QApplication, QSize, QKeySequence,
+    QAction, Qt, QTextBrowser, QDialogButtonBox, QVBoxLayout)
 
 from calibre.constants import __version__
 from calibre.gui2.dialogs.message_box_ui import Ui_Dialog
 
-class MessageBox(QDialog, Ui_Dialog):
+class MessageBox(QDialog, Ui_Dialog): # {{{
 
     ERROR = 0
     WARNING = 1
@@ -111,6 +111,90 @@ class MessageBox(QDialog, Ui_Dialog):
         self.det_msg_toggle.setVisible(bool(msg))
         self.det_msg.setVisible(False)
         self.do_resize()
+# }}}
+
+class ViewLog(QDialog): # {{{
+
+    def __init__(self, title, html, parent=None):
+        QDialog.__init__(self, parent)
+        self.l = l = QVBoxLayout()
+        self.setLayout(l)
+
+        self.tb = QTextBrowser(self)
+        self.tb.setHtml('<pre style="font-family: monospace">%s</pre>' % html)
+        l.addWidget(self.tb)
+
+        self.bb = QDialogButtonBox(QDialogButtonBox.Ok)
+        self.bb.accepted.connect(self.accept)
+        self.bb.rejected.connect(self.reject)
+        self.copy_button = self.bb.addButton(_('Copy to clipboard'),
+                self.bb.ActionRole)
+        self.copy_button.setIcon(QIcon(I('edit-copy.png')))
+        self.copy_button.clicked.connect(self.copy_to_clipboard)
+        l.addWidget(self.bb)
+        self.setModal(False)
+        self.resize(QSize(700, 500))
+        self.setWindowTitle(title)
+        self.setWindowIcon(QIcon(I('debug.png')))
+        self.show()
+
+    def copy_to_clipboard(self):
+        txt = self.tb.toPlainText()
+        QApplication.clipboard().setText(txt)
+# }}}
+
+
+_proceed_memory = []
+
+class ProceedNotification(MessageBox): # {{{
+
+    def __init__(self, callback, payload, html_log, log_viewer_title, title, msg,
+            det_msg='', show_copy_button=False, parent=None):
+        '''
+        A non modal popup that notifies the user that a background task has
+        been completed.
+
+        :param callback: A callable that is called with payload if the user
+        asks to proceed. Note that this is always called in the GUI thread
+        :param payload: Arbitrary object, passed to callback
+        :param html_log: An HTML or plain text log
+        :param log_viewer_title: The title for the log viewer window
+        :param title: The title fo rthis popup
+        :param msg: The msg to display
+        :param det_msg: Detailed message
+        '''
+        MessageBox.__init__(self, MessageBox.QUESTION, title, msg,
+                det_msg=det_msg, show_copy_button=show_copy_button,
+                parent=parent)
+        self.payload = payload
+        self.html_log = html_log
+        self.log_viewer_title = log_viewer_title
+        self.finished.connect(self.do_proceed, type=Qt.QueuedConnection)
+
+        self.vlb = self.bb.addButton(_('View log'), self.bb.ActionRole)
+        self.vlb.setIcon(QIcon(I('debug.png')))
+        self.vlb.clicked.connect(self.show_log)
+        self.det_msg_toggle.setVisible(bool(det_msg))
+        self.setModal(False)
+        self.callback = callback
+        _proceed_memory.append(self)
+
+    def show_log(self):
+        self.log_viewer = ViewLog(self.log_viewer_title, self.html_log,
+                parent=self)
+
+    def do_proceed(self, result):
+        try:
+            if result == self.Accepted:
+                self.callback(self.payload)
+        finally:
+            # Ensure this notification is garbage collected
+            self.callback = None
+            self.setParent(None)
+            self.finished.disconnect()
+            self.vlb.clicked.disconnect()
+            _proceed_memory.remove(self)
+# }}}
 
 if __name__ == '__main__':
     app = QApplication([])

src/calibre/gui2/dialogs/metadata_bulk.py

@@ -13,7 +13,6 @@ from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog
 from calibre.gui2.dialogs.tag_editor import TagEditor
 from calibre.ebooks.metadata import string_to_authors, authors_to_string, title_sort
 from calibre.ebooks.metadata.book.base import composite_formatter
-from calibre.ebooks.metadata.meta import get_metadata
 from calibre.gui2.custom_column_widgets import populate_metadata_page
 from calibre.gui2 import error_dialog, ResizableDialog, UNDEFINED_QDATE, \
     gprefs, question_dialog
@@ -26,6 +25,7 @@ from calibre.utils.magick.draw import identify_data
 from calibre.utils.date import qt_to_dt
 
 def get_cover_data(path): # {{{
+    from calibre.ebooks.metadata.meta import get_metadata
     old = prefs['read_file_metadata']
     if not old:
         prefs['read_file_metadata'] = True

src/calibre/gui2/dialogs/metadata_single.py

@@ -25,7 +25,6 @@ from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.metadata import string_to_authors, \
         authors_to_string, check_isbn, title_sort
 from calibre.ebooks.metadata.covers import download_cover
-from calibre.ebooks.metadata.meta import get_metadata
 from calibre.ebooks.metadata import MetaInformation
 from calibre.utils.config import prefs, tweaks
 from calibre.utils.date import qt_to_dt, local_tz, utcfromtimestamp
@@ -353,6 +352,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
             self.formats_changed = True
 
     def get_selected_format_metadata(self):
+        from calibre.ebooks.metadata.meta import get_metadata
         old = prefs['read_file_metadata']
         if not old:
             prefs['read_file_metadata'] = True

src/calibre/gui2/dialogs/tweak_epub.py

@@ -12,6 +12,7 @@ from zipfile import ZipFile, ZIP_DEFLATED, ZIP_STORED
 
 from PyQt4.Qt import QDialog
 
+from calibre.constants import isosx
 from calibre.gui2 import open_local_file
 from calibre.gui2.dialogs.tweak_epub_ui import Ui_Dialog
 from calibre.libunzip import extract as zipextract
@@ -42,11 +43,19 @@ class TweakEpub(QDialog, Ui_Dialog):
         self.move(parent_loc.x(),parent_loc.y())
 
     def cleanup(self):
+        if isosx:
+            try:
+                import appscript
+                self.finder = appscript.app('Finder')
+                self.finder.Finder_windows[os.path.basename(self._exploded)].close()
+            except:
+                # appscript fails to load on 10.4
+                pass
+
         # Delete directory containing exploded ePub
         if self._exploded is not None:
             shutil.rmtree(self._exploded, ignore_errors=True)
 
-
     def display_exploded(self):
         '''
         Generic subprocess launch of native file browser

src/calibre/gui2/jobs.py

@@ -169,11 +169,11 @@ class JobManager(QAbstractTableModel): # {{{
                 job.update()
                 if orig_state != job.run_state:
                     needs_reset = True
+                    if job.is_finished:
+                        self.job_done.emit(len(self.unfinished_jobs()))
             if needs_reset:
                 self.jobs.sort()
                 self.reset()
-                if job.is_finished:
-                    self.job_done.emit(len(self.unfinished_jobs()))
             else:
                 for job in jobs:
                     idx = self.jobs.index(job)

src/calibre/gui2/layout.py

@@ -156,8 +156,6 @@ class SearchBar(QWidget): # {{{
         x = ComboBoxWithHelp(self)
         x.setMaximumSize(QSize(150, 16777215))
         x.setObjectName("search_restriction")
-        x.setToolTip(_('Books display will be restricted to those matching the '
-                       'selected saved search'))
         l.addWidget(x)
         parent.search_restriction = x
 

src/calibre/gui2/library/models.py

@@ -18,7 +18,6 @@ from calibre.ptempfile import PersistentTemporaryFile
 from calibre.utils.config import tweaks, prefs
 from calibre.utils.date import dt_factory, qt_to_dt, isoformat
 from calibre.utils.icu import sort_key
-from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
 from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.library.caches import _match, CONTAINS_MATCH, EQUALS_MATCH, \
     REGEXP_MATCH, MetadataBackup, force_to_bool
@@ -478,6 +477,7 @@ class BooksModel(QAbstractTableModel): # {{{
     def get_preferred_formats_from_ids(self, ids, formats,
                               set_metadata=False, specific_format=None,
                               exclude_auto=False, mode='r+b'):
+        from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
         ans = []
         need_auto = []
         if specific_format is not None:
@@ -526,6 +526,7 @@ class BooksModel(QAbstractTableModel): # {{{
     def get_preferred_formats(self, rows, formats, paths=False,
                               set_metadata=False, specific_format=None,
                               exclude_auto=False):
+        from calibre.ebooks.metadata.meta import set_metadata as _set_metadata
         ans = []
         need_auto = []
         if specific_format is not None:

src/calibre/gui2/main.py

@@ -19,6 +19,9 @@ from calibre.utils.config import prefs, dynamic
 from calibre.library.database2 import LibraryDatabase2
 from calibre.library.sqlite import sqlite, DatabaseException
 
+if iswindows:
+    winutil = plugins['winutil'][0]
+
 def option_parser():
     parser = _option_parser('''\
 %prog [opts] [path_to_ebook]
@@ -80,8 +83,7 @@ def get_library_path(parent=None):
     if library_path is None: # Need to migrate to new database layout
         base = os.path.expanduser('~')
         if iswindows:
-            base = plugins['winutil'][0].special_folder_path(
-                    plugins['winutil'][0].CSIDL_PERSONAL)
+            base = winutil.special_folder_path(winutil.CSIDL_PERSONAL)
             if not base or not os.path.exists(base):
                 from PyQt4.Qt import QDir
                 base = unicode(QDir.homePath()).replace('/', os.sep)

src/calibre/gui2/metadata/basic_widgets.py

@@ -24,7 +24,7 @@ from calibre.ebooks.metadata.meta import get_metadata
 from calibre.gui2 import file_icon_provider, UNDEFINED_QDATE, UNDEFINED_DATE, \
         choose_files, error_dialog, choose_images, question_dialog
 from calibre.utils.date import local_tz, qt_to_dt
-from calibre import strftime, fit_image
+from calibre import strftime
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.customize.ui import run_plugins_on_import
 from calibre.utils.date import utcfromtimestamp
@@ -278,11 +278,13 @@ class AuthorSortEdit(EnLineEdit):
 
     def copy_to_authors(self):
         aus = self.current_val
+        meth = tweaks['author_sort_copy_method']
         if aus:
             ln, _, rest = aus.partition(',')
             if rest:
-                au = rest.strip() + ' ' + ln.strip()
-                self.authors_edit.current_val = [au]
+                if meth in ('invert', 'nocomma', 'comma'):
+                    aus = rest.strip() + ' ' + ln.strip()
+            self.authors_edit.current_val = [aus]
 
     def auto_generate(self, *args):
         au = unicode(self.authors_edit.text())
@@ -465,16 +467,22 @@ class FormatsManager(QWidget): # {{{
         self.metadata_from_format_button = QToolButton(self)
         self.metadata_from_format_button.setIcon(QIcon(I('edit_input.png')))
         self.metadata_from_format_button.setIconSize(QSize(32, 32))
+        self.metadata_from_format_button.setToolTip(
+                _('Set metadata for the book from the selected format'))
 
         self.add_format_button = QToolButton(self)
         self.add_format_button.setIcon(QIcon(I('add_book.png')))
         self.add_format_button.setIconSize(QSize(32, 32))
         self.add_format_button.clicked.connect(self.add_format)
+        self.add_format_button.setToolTip(
+                _('Add a format to this book'))
 
         self.remove_format_button = QToolButton(self)
         self.remove_format_button.setIcon(QIcon(I('trash.png')))
         self.remove_format_button.setIconSize(QSize(32, 32))
         self.remove_format_button.clicked.connect(self.remove_format)
+        self.remove_format_button.setToolTip(
+                _('Remove the selected format from this book'))
 
         self.formats = FormatList(self)
         self.formats.setAcceptDrops(True)
@@ -664,12 +672,7 @@ class Cover(ImageView): # {{{
         self.frame_size = (sz.width()//3, sz.height())
 
     def sizeHint(self):
-        sz = ImageView.sizeHint(self)
-        w, h = sz.width(), sz.height()
-        resized, nw, nh = fit_image(w, h, self.frame_size[0],
-                self.frame_size[1])
-        if resized:
-            sz = QSize(nw, nh)
+        sz = QSize(self.frame_size[0], self.frame_size[1])
         return sz
 
     def select_cover(self, *args):
@@ -939,7 +942,13 @@ class IdentifiersEdit(QLineEdit): # {{{
         def fset(self, val):
             if not val:
                 val = {}
-            txt = ', '.join(['%s:%s'%(k, v) for k, v in val.iteritems()])
+            def keygen(x):
+                x = x[0]
+                if x == 'isbn':
+                    x = '00isbn'
+                return x
+            ids = sorted(val.iteritems(), key=keygen)
+            txt = ', '.join(['%s:%s'%(k, v) for k, v in ids])
             self.setText(txt.strip())
             self.setCursorPosition(0)
         return property(fget=fget, fset=fset)
@@ -959,7 +968,7 @@ class IdentifiersEdit(QLineEdit): # {{{
         tt = self.BASE_TT
         extra = ''
         if not isbn:
-            col = 'rgba(0,255,0,0%)'
+            col = 'none'
         elif check_isbn(isbn) is not None:
             col = 'rgba(0,255,0,20%)'
             extra = '\n\n'+_('This ISBN number is valid')

src/calibre/gui2/metadata/bulk_download2.py

@@ -7,251 +7,119 @@ __license__   = 'GPL v3'
 __copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os
 from functools import partial
 from itertools import izip
+from threading import Event
 
-from PyQt4.Qt import (QIcon, QDialog, QVBoxLayout, QTextBrowser, QSize,
-        QDialogButtonBox, QApplication, QTimer, QLabel, QProgressBar)
+from PyQt4.Qt import (QIcon, QDialog,
+        QDialogButtonBox, QLabel, QGridLayout, QPixmap, Qt)
 
-from calibre.gui2.dialogs.message_box import MessageBox
 from calibre.gui2.threaded_jobs import ThreadedJob
-from calibre.utils.icu import lower
-from calibre.ebooks.metadata import authors_to_string
-from calibre.gui2 import question_dialog, error_dialog
 from calibre.ebooks.metadata.sources.identify import identify, msprefs
 from calibre.ebooks.metadata.sources.covers import download_cover
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.customize.ui import metadata_plugins
 from calibre.ptempfile import PersistentTemporaryFile
 
+# Start download {{{
 def show_config(gui, parent):
     from calibre.gui2.preferences import show_config_widget
     show_config_widget('Sharing', 'Metadata download', parent=parent,
             gui=gui, never_shutdown=True)
 
-def start_download(gui, ids, callback, identify, covers):
-    q = MessageBox(MessageBox.QUESTION,  _('Schedule download?'),
+class ConfirmDialog(QDialog):
+
+    def __init__(self, ids, parent):
+        QDialog.__init__(self, parent)
+        self.setWindowTitle(_('Schedule download?'))
+        self.setWindowIcon(QIcon(I('dialog_question.png')))
+
+        l = self.l = QGridLayout()
+        self.setLayout(l)
+
+        i = QLabel(self)
+        i.setPixmap(QPixmap(I('dialog_question.png')))
+        l.addWidget(i, 0, 0)
+
+        t = QLabel(
             '<p>'+_('The download of metadata for the <b>%d selected book(s)</b> will'
                 ' run in the background. Proceed?')%len(ids) +
             '<p>'+_('You can monitor the progress of the download '
                 'by clicking the rotating spinner in the bottom right '
                 'corner.') +
             '<p>'+_('When the download completes you will be asked for'
-                ' confirmation before calibre applies the downloaded metadata.'),
-            show_copy_button=False, parent=gui)
-    b = q.bb.addButton(_('Configure download'), q.bb.ActionRole)
-    b.setIcon(QIcon(I('config.png')))
-    b.clicked.connect(partial(show_config, gui, q))
-    q.det_msg_toggle.setVisible(False)
+                ' confirmation before calibre applies the downloaded metadata.')
+            )
+        t.setWordWrap(True)
+        l.addWidget(t, 0, 1)
+        l.setColumnStretch(0, 1)
+        l.setColumnStretch(1, 100)
 
-    ret = q.exec_()
-    b.clicked.disconnect()
-    if ret != q.Accepted:
+        self.identify = self.covers = True
+        self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
+        self.bb.rejected.connect(self.reject)
+        b = self.bb.addButton(_('Download only &metadata'),
+                self.bb.AcceptRole)
+        b.clicked.connect(self.only_metadata)
+        b.setIcon(QIcon(I('edit_input.png')))
+        b = self.bb.addButton(_('Download only &covers'),
+                self.bb.AcceptRole)
+        b.clicked.connect(self.only_covers)
+        b.setIcon(QIcon(I('default_cover.png')))
+        b = self.b = self.bb.addButton(_('&Configure download'), self.bb.ActionRole)
+        b.setIcon(QIcon(I('config.png')))
+        b.clicked.connect(partial(show_config, parent, self))
+        l.addWidget(self.bb, 1, 0, 1, 2)
+        b = self.bb.addButton(_('Download &both'),
+                self.bb.AcceptRole)
+        b.clicked.connect(self.accept)
+        b.setDefault(True)
+        b.setAutoDefault(True)
+        b.setIcon(QIcon(I('ok.png')))
+
+        self.resize(self.sizeHint())
+        b.setFocus(Qt.OtherFocusReason)
+
+    def only_metadata(self):
+        self.covers = False
+        self.accept()
+
+    def only_covers(self):
+        self.identify = False
+        self.accept()
+
+def start_download(gui, ids, callback):
+    d = ConfirmDialog(ids, gui)
+    ret = d.exec_()
+    d.b.clicked.disconnect()
+    if ret != d.Accepted:
         return
 
     job = ThreadedJob('metadata bulk download',
             _('Download metadata for %d books')%len(ids),
-            download, (ids, gui.current_db, identify, covers), {}, callback)
+            download, (ids, gui.current_db, d.identify, d.covers), {}, callback)
     gui.job_manager.run_threaded_job(job)
     gui.status_bar.show_message(_('Metadata download started'), 3000)
-
-
-class ViewLog(QDialog): # {{{
-
-    def __init__(self, html, parent=None):
-        QDialog.__init__(self, parent)
-        self.l = l = QVBoxLayout()
-        self.setLayout(l)
-
-        self.tb = QTextBrowser(self)
-        self.tb.setHtml('<pre style="font-family: monospace">%s</pre>' % html)
-        l.addWidget(self.tb)
-
-        self.bb = QDialogButtonBox(QDialogButtonBox.Ok)
-        self.bb.accepted.connect(self.accept)
-        self.bb.rejected.connect(self.reject)
-        self.copy_button = self.bb.addButton(_('Copy to clipboard'),
-                self.bb.ActionRole)
-        self.copy_button.setIcon(QIcon(I('edit-copy.png')))
-        self.copy_button.clicked.connect(self.copy_to_clipboard)
-        l.addWidget(self.bb)
-        self.setModal(False)
-        self.resize(QSize(700, 500))
-        self.setWindowTitle(_('Download log'))
-        self.setWindowIcon(QIcon(I('debug.png')))
-        self.show()
-
-    def copy_to_clipboard(self):
-        txt = self.tb.toPlainText()
-        QApplication.clipboard().setText(txt)
-
-_vl = None
-def view_log(job, parent):
-    global _vl
-    _vl = ViewLog(job.html_details, parent)
-
 # }}}
 
-class ApplyDialog(QDialog):
-
-    def __init__(self, id_map, gui):
-        QDialog.__init__(self, gui)
-
-        self.l = l = QVBoxLayout()
-        self.setLayout(l)
-        l.addWidget(QLabel(_('Applying downloaded metadata to your library')))
-
-        self.pb = QProgressBar(self)
-        l.addWidget(self.pb)
-        self.pb.setMinimum(0)
-        self.pb.setMaximum(len(id_map))
-
-        self.bb = QDialogButtonBox(QDialogButtonBox.Cancel)
-        self.bb.rejected.connect(self.reject)
-        self.bb.accepted.connect(self.accept)
-        l.addWidget(self.bb)
-
-        self.gui = gui
-        self.id_map = list(id_map.iteritems())
-        self.current_idx = 0
-
-        self.failures = []
-        self.ids = []
-        self.canceled = False
-
-        QTimer.singleShot(20, self.do_one)
-
-    def do_one(self):
-        if self.canceled:
-            return
-        i, mi = self.id_map[self.current_idx]
-        db = self.gui.current_db
-        try:
-            set_title = not mi.is_null('title')
-            set_authors = not mi.is_null('authors')
-            db.set_metadata(i, mi, commit=False, set_title=set_title,
-                    set_authors=set_authors)
-            self.ids.append(i)
-        except:
-            import traceback
-            self.failures.append((i, traceback.format_exc()))
-
-        try:
-            if mi.cover:
-                os.remove(mi.cover)
-        except:
-            pass
-
-        self.pb.setValue(self.pb.value()+1)
-
-        if self.current_idx >= len(self.id_map) - 1:
-            self.finalize()
-        else:
-            self.current_idx += 1
-            QTimer.singleShot(20, self.do_one)
-
-    def reject(self):
-        self.canceled = True
-        QDialog.reject(self)
-
-    def finalize(self):
-        if self.canceled:
-            return
-        if self.failures:
-            msg = []
-            db = self.gui.current_db
-            for i, tb in self.failures:
-                title = db.title(i, index_is_id=True)
-                authors = db.authors(i, index_is_id=True)
-                if authors:
-                    authors = [x.replace('|', ',') for x in authors.split(',')]
-                    title += ' - ' + authors_to_string(authors)
-                msg.append(title+'\n\n'+tb+'\n'+('*'*80))
-
-            error_dialog(self, _('Some failures'),
-                _('Failed to apply updated metadata for some books'
-                    ' in your library. Click "Show Details" to see '
-                    'details.'), det_msg='\n\n'.join(msg), show=True)
-        self.accept()
-        if self.ids:
-            cr = self.gui.library_view.currentIndex().row()
-            self.gui.library_view.model().refresh_ids(
-                self.ids, cr)
-            if self.gui.cover_flow:
-                self.gui.cover_flow.dataChanged()
-
-_amd = None
-def apply_metadata(job, gui, q, result):
-    global _amd
-    q.vlb.clicked.disconnect()
-    q.finished.disconnect()
-    if result != q.Accepted:
-        return
-    id_map, failed_ids, failed_covers, title_map = job.result
-    id_map = dict([(k, v) for k, v in id_map.iteritems() if k not in
-        failed_ids])
-    if not id_map:
-        return
-
-    modified = set()
-    db = gui.current_db
-
-    for i, mi in id_map.iteritems():
-        lm = db.metadata_last_modified(i, index_is_id=True)
-        if lm > mi.last_modified:
-            title = db.title(i, index_is_id=True)
-            authors = db.authors(i, index_is_id=True)
-            if authors:
-                authors = [x.replace('|', ',') for x in authors.split(',')]
-                title += ' - ' + authors_to_string(authors)
-            modified.add(title)
-
-    if modified:
-        modified = sorted(modified, key=lower)
-        if not question_dialog(gui, _('Some books changed'), '<p>'+
-                _('The metadata for some books in your library has'
-                    ' changed since you started the download. If you'
-                    ' proceed, some of those changes may be overwritten. '
-                    'Click "Show details" to see the list of changed books. '
-                    'Do you want to proceed?'), det_msg='\n'.join(modified)):
-            return
-
-    _amd = ApplyDialog(id_map, gui)
-    _amd.exec_()
-
-def proceed(gui, job):
-    gui.status_bar.show_message(_('Metadata download completed'), 3000)
-    id_map, failed_ids, failed_covers, title_map = job.result
-    fmsg = det_msg = ''
-    if failed_ids or failed_covers:
-        fmsg = '<p>'+_('Could not download metadata and/or covers for %d of the books. Click'
-                ' "Show details" to see which books.')%len(failed_ids)
-        det_msg = []
-        for i in failed_ids | failed_covers:
-            title = title_map[i]
-            if i in failed_ids:
-                title += (' ' + _('(Failed metadata)'))
-            if i in failed_covers:
-                title += (' ' + _('(Failed cover)'))
-            det_msg.append(title)
-    msg = '<p>' + _('Finished downloading metadata for <b>%d book(s)</b>. '
-        'Proceed with updating the metadata in your library?')%len(id_map)
-    q = MessageBox(MessageBox.QUESTION, _('Download complete'),
-            msg + fmsg, det_msg='\n'.join(det_msg), show_copy_button=bool(failed_ids),
-            parent=gui)
-    q.vlb = q.bb.addButton(_('View log'), q.bb.ActionRole)
-    q.vlb.setIcon(QIcon(I('debug.png')))
-    q.vlb.clicked.connect(partial(view_log, job, q))
-    q.det_msg_toggle.setVisible(bool(failed_ids | failed_covers))
-    q.setModal(False)
-    q.show()
-    q.finished.connect(partial(apply_metadata, job, gui, q))
+def get_job_details(job):
+    id_map, failed_ids, failed_covers, title_map, all_failed = job.result
+    det_msg = []
+    for i in failed_ids | failed_covers:
+        title = title_map[i]
+        if i in failed_ids:
+            title += (' ' + _('(Failed metadata)'))
+        if i in failed_covers:
+            title += (' ' + _('(Failed cover)'))
+        det_msg.append(title)
+    det_msg = '\n'.join(det_msg)
+    return id_map, failed_ids, failed_covers, all_failed, det_msg
 
 def merge_result(oldmi, newmi):
     dummy = Metadata(_('Unknown'))
     for f in msprefs['ignore_fields']:
-        setattr(newmi, f, getattr(dummy, f))
+        if ':' not in f:
+            setattr(newmi, f, getattr(dummy, f))
     fields = set()
     for plugin in metadata_plugins(['identify']):
         fields |= plugin.touched_fields
@@ -276,6 +144,11 @@ def download(ids, db, do_identify, covers,
     title_map = {}
     ans = {}
     count = 0
+    all_failed = True
+    '''
+    # Test apply dialog
+    all_failed = do_identify = covers = False
+    '''
     for i, mi in izip(ids, metadata):
         if abort.is_set():
             log.error('Aborting...')
@@ -285,11 +158,12 @@ def download(ids, db, do_identify, covers,
         if do_identify:
             results = []
             try:
-                results = identify(log, abort, title=title, authors=authors,
+                results = identify(log, Event(), title=title, authors=authors,
                     identifiers=identifiers)
             except:
                 pass
             if results:
+                all_failed = False
                 mi = merge_result(mi, results[0])
                 identifiers = mi.identifiers
                 if not mi.is_null('rating'):
@@ -307,6 +181,7 @@ def download(ids, db, do_identify, covers,
                 with PersistentTemporaryFile('.jpg', 'downloaded-cover-') as f:
                     f.write(cdata[-1])
                     mi.cover = f.name
+                all_failed = False
             else:
                 failed_covers.add(i)
         ans[i] = mi
@@ -314,7 +189,7 @@ def download(ids, db, do_identify, covers,
         notifications.put((count/len(ids),
             _('Downloaded %d of %d')%(count, len(ids))))
     log('Download complete, with %d failures'%len(failed_ids))
-    return (ans, failed_ids, failed_covers, title_map)
+    return (ans, failed_ids, failed_covers, title_map, all_failed)
 
 
 

src/calibre/gui2/metadata/single.py

@@ -156,6 +156,9 @@ class MetadataSingleDialogBase(ResizableDialog):
 
         self.identifiers = IdentifiersEdit(self)
         self.basic_metadata_widgets.append(self.identifiers)
+        self.clear_identifiers_button = QToolButton(self)
+        self.clear_identifiers_button.setIcon(QIcon(I('trash.png')))
+        self.clear_identifiers_button.clicked.connect(self.identifiers.clear)
 
         self.publisher = PublisherEdit(self)
         self.basic_metadata_widgets.append(self.publisher)
@@ -323,7 +326,8 @@ class MetadataSingleDialogBase(ResizableDialog):
             mi = d.book
             dummy = Metadata(_('Unknown'))
             for f in msprefs['ignore_fields']:
-                setattr(mi, f, getattr(dummy, f))
+                if ':' not in f:
+                    setattr(mi, f, getattr(dummy, f))
             if mi is not None:
                 self.update_from_mi(mi)
             if d.cover_pixmap is not None:
@@ -541,8 +545,8 @@ class MetadataSingleDialog(MetadataSingleDialogBase): # {{{
         sto(self.rating, self.tags)
         create_row2(2, self.tags, self.tags_editor_button)
         sto(self.tags_editor_button, self.identifiers)
-        create_row2(3, self.identifiers)
-        sto(self.identifiers, self.timestamp)
+        create_row2(3, self.identifiers, self.clear_identifiers_button)
+        sto(self.clear_identifiers_button, self.timestamp)
         create_row2(4, self.timestamp, self.timestamp.clear_button)
         sto(self.timestamp.clear_button, self.pubdate)
         create_row2(5, self.pubdate, self.pubdate.clear_button)
@@ -657,7 +661,8 @@ class MetadataSingleDialogAlt1(MetadataSingleDialogBase): # {{{
         create_row(9, self.publisher, self.timestamp)
         create_row(10, self.timestamp, self.identifiers,
                    button=self.timestamp.clear_button, icon='trash.png')
-        create_row(11, self.identifiers, self.comments)
+        create_row(11, self.identifiers, self.comments,
+                   button=self.clear_identifiers_button, icon='trash.png')
         tl.addItem(QSpacerItem(1, 1, QSizePolicy.Fixed, QSizePolicy.Expanding),
                    12, 1, 1 ,1)
 

src/calibre/gui2/metadata/single_download.py

@@ -15,10 +15,10 @@ from operator import attrgetter
 from Queue import Queue, Empty
 
 from PyQt4.Qt import (QStyledItemDelegate, QTextDocument, QRectF, QIcon, Qt,
-        QStyle, QApplication, QDialog, QVBoxLayout, QLabel, QDialogButtonBox,
+        QApplication, QDialog, QVBoxLayout, QLabel, QDialogButtonBox,
         QStackedWidget, QWidget, QTableView, QGridLayout, QFontInfo, QPalette,
         QTimer, pyqtSignal, QAbstractTableModel, QVariant, QSize, QListView,
-        QPixmap, QAbstractListModel, QColor, QRect, QTextBrowser)
+        QPixmap, QAbstractListModel, QColor, QRect, QTextBrowser, QModelIndex)
 from PyQt4.QtWebKit import QWebView
 
 from calibre.customize.ui import metadata_plugins
@@ -52,12 +52,9 @@ class RichTextDelegate(QStyledItemDelegate): # {{{
         return ans
 
     def paint(self, painter, option, index):
+        QStyledItemDelegate.paint(self, painter, option, QModelIndex())
         painter.save()
         painter.setClipRect(QRectF(option.rect))
-        if hasattr(QStyle, 'CE_ItemViewItem'):
-            QApplication.style().drawControl(QStyle.CE_ItemViewItem, option, painter)
-        elif option.state & QStyle.State_Selected:
-            painter.fillRect(option.rect, option.palette.highlight())
         painter.translate(option.rect.topLeft())
         self.to_doc(index).drawContents(painter)
         painter.restore()
@@ -116,10 +113,17 @@ class CoverDelegate(QStyledItemDelegate): # {{{
 
     def paint(self, painter, option, index):
         QStyledItemDelegate.paint(self, painter, option, index)
-        if self.timer.isActive() and index.data(Qt.UserRole).toBool():
+        style = QApplication.style()
+        waiting = self.timer.isActive() and index.data(Qt.UserRole).toBool()
+        if waiting:
             rect = QRect(0, 0, self.spinner_width, self.spinner_width)
             rect.moveCenter(option.rect.center())
             self.draw_spinner(painter, rect)
+        else:
+            # Ensure the cover is rendered over any selection rect
+            style.drawItemPixmap(painter, option.rect, Qt.AlignTop|Qt.AlignHCenter,
+                QPixmap(index.data(Qt.DecorationRole)))
+
 # }}}
 
 class ResultsModel(QAbstractTableModel): # {{{
@@ -945,7 +949,7 @@ class CoverFetch(QDialog): # {{{
 # }}}
 
 if __name__ == '__main__':
-    #DEBUG_DIALOG = True
+    DEBUG_DIALOG = True
     app = QApplication([])
     d = FullFetch()
     d.start(title='great gatsby', authors=['fitzgerald'])

src/calibre/gui2/preferences/__init__.py

@@ -337,7 +337,13 @@ def show_config_widget(category, name, gui=None, show_restart_msg=False,
     bb.button(bb.RestoreDefaults).setEnabled(w.supports_restoring_to_defaults)
     bb.button(bb.Apply).setEnabled(False)
     bb.button(bb.Apply).clicked.connect(d.accept)
-    w.changed_signal.connect(lambda : bb.button(bb.Apply).setEnabled(True))
+    def onchange():
+        b = bb.button(bb.Apply)
+        b.setEnabled(True)
+        b.setDefault(True)
+        b.setAutoDefault(True)
+    w.changed_signal.connect(onchange)
+    bb.button(bb.Cancel).setFocus(True)
     l = QVBoxLayout()
     d.setLayout(l)
     l.addWidget(w)

src/calibre/gui2/preferences/behavior.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>672</width>
+    <width>941</width>
     <height>563</height>
    </rect>
   </property>
@@ -22,7 +22,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>10</width>
-       <height>00</height>
+       <height>0</height>
       </size>
      </property>
     </spacer>
@@ -50,13 +50,13 @@
    </item>
    <item row="2" column="2">
     <widget class="QCheckBox" name="opt_bools_are_tristate">
-     <property name="text">
-      <string>Yes/No columns have three values (Requires restart)</string>
-     </property>
      <property name="toolTip">
       <string>If checked, Yes/No custom columns values can be Yes, No, or Unknown.
 If not checked, the values can be Yes or No.</string>
      </property>
+     <property name="text">
+      <string>Yes/No columns have three values (Requires restart)</string>
+     </property>
     </widget>
    </item>
    <item row="4" column="0">
@@ -304,7 +304,7 @@ If not checked, the values can be Yes or No.</string>
      </layout>
     </widget>
    </item>
-   <item row="30" column="0" colspan="3">
+   <item row="9" column="2">
     <widget class="QPushButton" name="reset_confirmation_button">
      <property name="text">
       <string>Reset all disabled &amp;confirmation dialogs</string>

src/calibre/gui2/preferences/create_custom_column.py

@@ -158,7 +158,7 @@ class CreateCustomColumn(QDialog, Ui_QCreateCustomColumn):
                 {
                     'isbn': '{identifiers:select(isbn)}',
                     'formats': '{formats}',
-                    'last_modified':'''{last_modified:'format_date($, "dd MMM yy")'}'''
+                    'last_modified':'''{last_modified:'format_date($, "dd MMM yyyy")'}'''
                     }[which])
             self.composite_sort_by.setCurrentIndex(2 if which == 'last_modified' else 0)
 

src/calibre/gui2/preferences/main.py

@@ -87,6 +87,8 @@ class Category(QWidget): # {{{
         self.plugins = plugins
 
         self.bar = QToolBar(self)
+        self.bar.setStyleSheet(
+                'QToolBar { border: none; background: none }')
         self.bar.setIconSize(QSize(48, 48))
         self.bar.setMovable(False)
         self.bar.setFloatable(False)

src/calibre/gui2/preferences/metadata_sources.py

@@ -259,6 +259,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         r('wait_after_first_identify_result', msprefs)
         r('wait_after_first_cover_result', msprefs)
         r('swap_author_names', msprefs)
+        r('fewer_tags', msprefs)
 
         self.configure_plugin_button.clicked.connect(self.configure_plugin)
         self.sources_model = SourcesModel(self)

src/calibre/gui2/preferences/metadata_sources.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>781</width>
-    <height>300</height>
+    <height>394</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,7 @@
     <widget class="QStackedWidget" name="stack">
      <widget class="QWidget" name="page">
       <layout class="QGridLayout" name="gridLayout">
-       <item row="0" column="0" rowspan="6">
+       <item row="0" column="0" rowspan="7">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Metadata sources</string>
@@ -105,7 +105,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
+       <item row="4" column="1">
         <widget class="QLabel" name="label_2">
          <property name="text">
           <string>Max. number of &amp;tags to download:</string>
@@ -115,10 +115,10 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
+       <item row="4" column="2">
         <widget class="QSpinBox" name="opt_max_tags"/>
        </item>
-       <item row="4" column="1">
+       <item row="5" column="1">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Max. &amp;time to wait after first match is found:</string>
@@ -128,14 +128,14 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="2">
+       <item row="5" column="2">
         <widget class="QSpinBox" name="opt_wait_after_first_identify_result">
          <property name="suffix">
           <string> secs</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="6" column="1">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Max. time to wait after first &amp;cover is found:</string>
@@ -145,13 +145,24 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="2">
+       <item row="6" column="2">
         <widget class="QSpinBox" name="opt_wait_after_first_cover_result">
          <property name="suffix">
           <string> secs</string>
          </property>
         </widget>
        </item>
+       <item row="3" column="1" colspan="2">
+        <widget class="QCheckBox" name="opt_fewer_tags">
+         <property name="toolTip">
+          <string>&lt;p&gt;Different metadata sources have different sets of tags for the same book. If this option is checked, then calibre will use the smaller tag sets. These tend to be more like genres, while the larger tag sets tend to describe the books content.
+&lt;p&gt;Note that this option will only make a practical difference if one of the metadata sources has a genre like tag set for the book you are searching for. Most often, they all have large tag sets.</string>
+         </property>
+         <property name="text">
+          <string>Prefer &amp;fewer tags</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_2"/>

src/calibre/gui2/preferences/misc.py

@@ -6,19 +6,27 @@ __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 
-from calibre.gui2.preferences import ConfigWidgetBase, test_widget
+from calibre.gui2.preferences import ConfigWidgetBase, test_widget, Setting
 from calibre.gui2.preferences.misc_ui import Ui_Form
 from calibre.gui2 import error_dialog, config, open_local_file, info_dialog
 from calibre.constants import isosx
 
-# Check Integrity {{{
+class WorkersSetting(Setting):
+
+    def set_gui_val(self, val):
+        val = val//2
+        Setting.set_gui_val(self, val)
+
+    def get_gui_val(self):
+        val = Setting.get_gui_val(self)
+        return val * 2
 
 class ConfigWidget(ConfigWidgetBase, Ui_Form):
 
     def genesis(self, gui):
         self.gui = gui
         r = self.register
-        r('worker_limit', config, restart_required=True)
+        r('worker_limit', config, restart_required=True, setting=WorkersSetting)
         r('enforce_cpu_limit', config, restart_required=True)
         self.device_detection_button.clicked.connect(self.debug_device_detection)
         self.button_open_config_dir.clicked.connect(self.open_config_dir)

src/calibre/gui2/preferences/misc.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>&amp;Maximum number of waiting worker processes (needs restart):</string>
+      <string>Max. simultaneous conversion/news download jobs:</string>
      </property>
      <property name="buddy">
       <cstring>opt_worker_limit</cstring>
@@ -27,13 +27,7 @@
    <item row="0" column="1">
     <widget class="QSpinBox" name="opt_worker_limit">
      <property name="minimum">
-      <number>2</number>
-     </property>
-     <property name="maximum">
-      <number>10000</number>
-     </property>
-     <property name="singleStep">
-      <number>2</number>
+      <number>1</number>
      </property>
     </widget>
    </item>