KG updates 0.7.4

Changelog.yaml

@@ -4,6 +4,31 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.7.4
+  date: 2010-06-19
+
+  bug fixes:
+    - title: "Fix regression in 0.7.3 that broke creating custom columns of rating or text types"
+      
+    - title: "Fix cover browser breaking if you click on a book in the book list while cover browser is animated"
+
+    - title: "Fix a bug that could be triggered with the new book details pane if a book has a zero size cover"
+      tickets: [5889]
+
+    - title: "SONY driver: Fix bug preventing the editing of collections in the device view"
+
+  new recipes:
+    - title: Auto Prove
+      author: Gabriele Marini
+      
+    - title: Forbes India, Maximum PC, Today Online
+      author: rty
+
+  improved recipes:
+    - WSJ
+    - Psychology Today
+        
+
 - version: 0.7.3
   date: 2010-06-18
 

resources/recipes/auto_prove.recipe

@@ -0,0 +1,90 @@
+#!/usr/bin/env  python
+__license__     = 'GPL v3'
+__author__      = 'GabrieleMarini, based on Darko Miletic'
+__copyright__   = '2009, Darko Miletic <darko.miletic at gmail.com>, Gabriele Marini'
+__version__     = 'v1.02 Marini Gabriele '
+__date__        = '10, January 2010'
+__description__ = 'Italian daily newspaper'
+
+'''
+http://www.corrieredellosport.it/
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AutoPR(BasicNewsRecipe):
+    __author__     = 'Gabriele Marini'
+    description    = 'Auto and Formula 1'
+
+    cover_url      = 'http://www.auto.it/res/imgs/logo_Auto.png'
+
+
+    title          = u'Auto Prove'
+    publisher      = 'CONTE Editore'
+    category       = 'Sport'
+
+    language       = 'it'
+    timefmt        = '[%a, %d %b, %Y]'
+
+    oldest_article = 60
+    max_articles_per_feed = 20
+    use_embedded_content  = False
+    recursion             = 100
+
+    remove_javascript = True
+    no_stylesheets = True
+
+    #html2lrf_options = [
+    #                      '--comment', description
+    #                    , '--category', category
+    #                    , '--publisher', publisher
+    #                    , '--ignore-tables'
+    #                    ]
+
+    #html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\nlinearize_tables=True'
+
+    keep_only_tags = [
+                      dict(name='h2', attrs={'class':['tit_Article y_Txt']}),
+                      dict(name='h2', attrs={'class':['tit_Article']}),
+                      dict(name='div', attrs={'class':['box_Img newsdet_new ']}),
+                      dict(name='div', attrs={'class':['box_Img newsdet_as ']}),
+                      dict(name='table', attrs={'class':['table_A']}),
+                      dict(name='div', attrs={'class':['txt_Article txtBox_cms']}),
+                      dict(name='testoscheda')]
+
+    def parse_index(self):
+        feeds = []
+        for title, url in [
+             ("Prove su Strada"  , "http://www.auto.it/rss/prove+6.xml")
+            ]:
+            soup = self.index_to_soup(url)
+            soup = soup.find('channel')
+            print soup
+
+            for article in soup.findAllNext('item'):
+                title =  self.tag_to_string(article.title)
+                date = self.tag_to_string(article.pubDate)
+                description = self.tag_to_string(article.description)
+                link = self.tag_to_string(article.guid)
+#               print article
+                articles = self.create_links_append(link, date, description)
+                if articles:
+                   feeds.append((title, articles))
+            return feeds
+
+    def create_links_append(self, link, date, description):
+        current_articles = []
+
+        current_articles.append({'title': 'Generale', 'url': link,'description':description, 'date':date}),
+        current_articles.append({'title': 'Design', 'url': link.replace('scheda','design'),'description':'scheda', 'date':''}),
+        current_articles.append({'title': 'Interni', 'url': link.replace('scheda','interni'),'description':'Interni', 'date':''}),
+        current_articles.append({'title': 'Tecnica', 'url': link.replace('scheda','tecnica'),'description':'Tecnica', 'date':''}),
+        current_articles.append({'title': 'Su Strada', 'url': link.replace('scheda','su_strada'),'description':'Su Strada', 'date':''}),
+        current_articles.append({'title': 'Pagella', 'url': link.replace('scheda','pagella'),'description':'Pagella', 'date':''}),
+        current_articles.append({'title': 'Rilevamenti', 'url': link.replace('scheda','telemetria'),'description':'Rilevamenti', 'date':''})
+
+        return current_articles
+
+
+
+
+

resources/recipes/forbes_india.recipe

@@ -0,0 +1,55 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276934715(BasicNewsRecipe):
+    title          = u'Forbes India'
+    __author__            = 'rty'
+    description           = 'India Edition Forbes'
+    publisher             = 'Forbes India'
+    category              = 'Business News, Economy, India'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en_IN'
+    temp_files = []
+    articles_are_obfuscated = True
+    conversion_options = {'linearize_tables':True}
+    feeds          = [
+       (u'Contents', u'http://business.in.com/rssfeed/rss_all.xml'),
+                ]
+    extra_css = '''
+                   .t-10-gy-l{font-style: italic; font-size: small}
+                   .t-30-b-d{font-weight: bold; font-size: xx-large}
+                   .t-16-gy-l{font-weight: bold; font-size: x-large; font-syle: italic}
+                   .storycontent{font-size: 4px;font-family: Times New Roman;}
+                '''
+
+    remove_tags_before  = dict(name='div', attrs={'class':'pdl10 pdr15'})
+
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/printcontent/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def get_cover_url(self):
+        index = 'http://business.in.com/magazine/'
+        soup = self.index_to_soup(index)
+        for image in soup.findAll('a',{ "class" : "lbOn a-9-b-d" }):
+              return image['href']
+              #return image['href'] + '.jpg'
+        return None
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+           del item['style']
+        for item in soup.findAll(width=True):
+            del item['width']
+        return soup

resources/recipes/maximum_pc.recipe

@@ -0,0 +1,43 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276930924(BasicNewsRecipe):
+    title          = u'Maximum PC'
+    __author__           = 'rty'
+    description           = 'Maximum PC'
+    publisher             = 'http://www.maximumpc.com'
+    category              = 'news, computer, technology'
+    language = 'en'
+    oldest_article = 30
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en'
+    temp_files = []
+    articles_are_obfuscated = True
+    feeds          = [(u'News', u'http://www.maximumpc.com/articles/4/feed'),
+                          (u'Reviews', u'http://www.maximumpc.com/articles/40/feed'),
+                          (u'Editors Blog', u'http://www.maximumpc.com/articles/6/feed'),
+                          (u'How-to', u'http://www.maximumpc.com/articles/32/feed'),
+                          (u'Features', u'http://www.maximumpc.com/articles/31/feed'),
+                           (u'From the Magazine', u'http://www.maximumpc.com/articles/72/feed')
+                         ]
+    keep_only_tags = [
+                               dict(name='div', attrs={'class':['print-title','article_body']}),
+                              ]
+    remove_tags = [
+                    dict(name='div', attrs={'class':'comments-tags-actions'}),
+                          ]
+    remove_tags_before  = dict(name='div', attrs={'class':'print-title'})
+    remove_tags_after     = dict(name='div', attrs={'class':'meta-content'})
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/print/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name

resources/recipes/psych.recipe

@@ -1,39 +1,44 @@
+
+from calibre.ptempfile import PersistentTemporaryFile
 from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup
 
-class PsychologyToday(BasicNewsRecipe):
+class AdvancedUserRecipe1275708473(BasicNewsRecipe):
     title          = u'Psychology Today'
+    _author__ = 'rty'
+    publisher = u'www.psychologytoday.com'
+    category = u'Psychology'
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
     language = 'en'
-    __author__     = 'Krittika Goyal'
-    oldest_article = 1 #days
-    max_articles_per_feed = 25
-    #encoding = 'latin1'
-
-    remove_stylesheets = True
-    #remove_tags_before = dict(name='h1', attrs={'class':'heading'})
-    #remove_tags_after  = dict(name='td', attrs={'class':'newptool1'})
+    temp_files = []
+    articles_are_obfuscated = True
     remove_tags = [
-       dict(name='iframe'),
-       dict(name='div', attrs={'class':['pt-box-title', 'pt-box-content', 'blog-entry-footer', 'item-list', 'article-sub-meta']}),
-       dict(name='div', attrs={'id':['block-td_search_160', 'block-cam_search_160']}),
-       #dict(name='ul', attrs={'class':'article-tools'}),
-       #dict(name='ul', attrs={'class':'articleTools'}),
+                    dict(name='div', attrs={'class':['print-source_url','field-items','print-footer']}),
+                    dict(name='span', attrs={'class':'print-footnote'}),
                   ]
+    remove_tags_before  = dict(name='h1', attrs={'class':'print-title'})
+    remove_tags_after     = dict(name='div', attrs={'class':['field-items','print-footer']})
 
-    feeds          = [
-('PSY TODAY',
- 'http://www.psychologytoday.com/articles/index.rss'),
-]
+    feeds          = [(u'Contents', u'http://www.psychologytoday.com/articles/index.rss')]
 
-    def preprocess_html(self, soup):
-        story = soup.find(name='div', attrs={'id':'contentColumn'})
-        #td = heading.findParent(name='td')
-        #td.extract()
-        soup = BeautifulSoup('<html><head><title>t</title></head><body></body></html>')
-        body = soup.find(name='body')
-        body.insert(0, story)
-        for x in soup.findAll(name='p', text=lambda x:x and '--&gt;' in x):
-             p = x.findParent('p')
-             if p is not None:
-                  p.extract()
-        return soup
+    def get_article_url(self, article):
+       return article.get('link',  None)
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/print/[0-9]+', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def get_cover_url(self):
+        index = 'http://www.psychologytoday.com/magazine/'
+        soup = self.index_to_soup(index)
+        for image in soup.findAll('img',{ "class" : "imagefield imagefield-field_magazine_cover" }):
+              return image['src'] + '.jpg'
+        return None

resources/recipes/today_online.recipe

@@ -0,0 +1,59 @@
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1276486274(BasicNewsRecipe):
+    title          = u'Today Online - Singapore'
+    publisher             = 'MediaCorp Press Ltd - Singapore'
+    __author__ = 'rty'
+    category              = 'news, Singapore'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    remove_javascript = True
+    use_embedded_content   = False
+    no_stylesheets = True
+    language = 'en_SG'
+    temp_files = []
+    articles_are_obfuscated = True
+    masthead_url = 'http://www.todayonline.com/App_Themes/Default/images/icons/TodayOnlineLogo.gif'
+    conversion_options = {'linearize_tables':True}
+    extra_css = '''
+                   .author{font-style: italic; font-size: small}
+                   .date{font-style: italic; font-size: small}
+                   .Headline{font-weight: bold; font-size: xx-large}
+                   .headerStrap{font-weight: bold; font-size: x-large; font-syle: italic}
+                   .bodyText{font-size: 4px;font-family: Times New Roman;}
+                '''
+    keep_only_tags = [
+                                       dict(name='div', attrs={'id':['fullPrintBodyHolder']})
+                        ]
+    remove_tags_after = [  dict(name='div', attrs={'class':'button'})]
+
+
+    remove_tags = [
+                    dict(name='div', attrs={'class':['url','button']})
+                         ]
+    feeds          = [
+                         (u'Singapore', u'http://www.todayonline.com/RSS/Singapore'),
+                         (u'Hot News', u'http://www.todayonline.com/RSS/Hotnews'),
+                        (u'Today Online', u'http://www.todayonline.com/RSS/Todayonline'),
+                        (u'Voices', u'http://www.todayonline.com/RSS/Voices'),
+                        (u'Commentary', u'http://www.todayonline.com/RSS/Commentary'),
+                        (u'World', u'http://www.todayonline.com/RSS/World'),
+                        (u'Business', u'http://www.todayonline.com/RSS/Business'),
+                        (u'Column', u'http://www.todayonline.com/RSS/Columns'),
+                      ]
+
+    def get_obfuscated_article(self, url):
+        br = self.get_browser()
+        br.open(url)
+        response = br.follow_link(url_regex = r'/Print/', nr = 0)
+        html = response.read()
+        self.temp_files.append(PersistentTemporaryFile('_fa.html'))
+        self.temp_files[-1].write(html)
+        self.temp_files[-1].close()
+        return self.temp_files[-1].name
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+           del item['style']
+        return soup

resources/recipes/wsj.recipe

@@ -4,13 +4,14 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 
 from calibre.web.feeds.news import BasicNewsRecipe
+import copy
 
 # http://online.wsj.com/page/us_in_todays_paper.html
 
 class WallStreetJournal(BasicNewsRecipe):
 
-    title = 'The Wall Street Journal (US)'
-    __author__ = 'Kovid Goyal and Sujata Raman'
+    title = 'The Wall Street Journal'
+    __author__ = 'Kovid Goyal, Sujata Raman, and Joshua Oster-Morris'
     description = 'News and current affairs'
     needs_subscription = True
     language = 'en'
@@ -67,6 +68,16 @@ class WallStreetJournal(BasicNewsRecipe):
     def wsj_get_index(self):
         return self.index_to_soup('http://online.wsj.com/itp')
 
+    def wsj_add_feed(self,feeds,title,url):
+        self.log('Found section:', title)
+        if url.endswith('whatsnews'):
+           articles = self.wsj_find_wn_articles(url)
+        else:
+           articles = self.wsj_find_articles(url)
+        if articles:
+           feeds.append((title, articles))
+        return feeds  
+
     def parse_index(self):
         soup = self.wsj_get_index()
 
@@ -82,25 +93,62 @@ class WallStreetJournal(BasicNewsRecipe):
         div = soup.find('div', attrs={'class':'itpHeader'})
         div = div.find('ul', attrs={'class':'tab'})
         for a in div.findAll('a', href=lambda x: x and '/itp/' in x):
+            pageone = a['href'].endswith('pageone')
+            if pageone:
+               title = 'Front Section'
+               url = 'http://online.wsj.com' + a['href']
+               feeds = self.wsj_add_feed(feeds,title,url)
+               title = 'What''s News'
+               url = url.replace('pageone','whatsnews')             
+               feeds = self.wsj_add_feed(feeds,title,url)
+            else:
                title = self.tag_to_string(a)
                url = 'http://online.wsj.com' + a['href']
-            self.log('Found section:', title)
-            articles = self.wsj_find_articles(url)
-            if articles:
-                feeds.append((title, articles))
-
+               feeds = self.wsj_add_feed(feeds,title,url)
         return feeds
 
+    def wsj_find_wn_articles(self, url):
+        soup = self.index_to_soup(url)
+        articles = []
+
+        whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
+        if whats_news is not None:
+          for a in whats_news.findAll('a', href=lambda x: x and '/article/' in x):
+            container = a.findParent(['p'])
+            meta = a.find(attrs={'class':'meta_sectionName'})
+            if meta is not None:
+                meta.extract()
+            title = self.tag_to_string(a).strip()
+            url = a['href']
+            desc = ''
+            if container is not None:
+                desc = self.tag_to_string(container)
+
+            articles.append({'title':title, 'url':url,
+                'description':desc, 'date':''})
+
+            self.log('\tFound WN article:', title)
+
+        return articles
+
     def wsj_find_articles(self, url):
         soup = self.index_to_soup(url)
 
-        whats_news = soup.find('div', attrs={'class':lambda x: x and
-            'whatsNews-simple' in x})
+        whats_news = soup.find('div', attrs={'class':lambda x: x and 'whatsNews-simple' in x})
         if whats_news is not None:
            whats_news.extract()
 
         articles = []
 
+        flavorarea = soup.find('div', attrs={'class':lambda x: x and 'ahed' in x})
+        if flavorarea is not None:        
+           flavorstory = flavorarea.find('a', href=lambda x: x and x.startswith('/article'))
+           if flavorstory is not None:
+              flavorstory['class'] = 'mjLinkItem'
+              metapage = soup.find('span', attrs={'class':lambda x: x and 'meta_sectionName' in x})
+              if metapage is not None:
+                 flavorstory.append( copy.copy(metapage) ) #metapage should always be A1 because that should be first on the page
+
         for a in soup.findAll('a', attrs={'class':'mjLinkItem'}, href=True):
             container = a.findParent(['li', 'div'])
             meta = a.find(attrs={'class':'meta_sectionName'})
@@ -118,26 +166,9 @@ class WallStreetJournal(BasicNewsRecipe):
 
             self.log('\tFound article:', title)
 
-            '''
-            # Find related articles
-            a.extract()
-            for a in container.findAll('a', href=lambda x: x and '/article/'
-                    in x and 'articleTabs' not in x):
-                url = a['href']
-                if not url.startswith('http:'):
-                    url = 'http://online.wsj.com'+url
-                title = self.tag_to_string(a).strip()
-                if not title or title.startswith('['): continue
-                if title:
-                    articles.append({'title':self.tag_to_string(a),
-                        'url':url, 'description':'', 'date':''})
-                    self.log('\t\tFound related:', title)
-            '''
-
         return articles
 
 
     def cleanup(self):
         self.browser.open('http://online.wsj.com/logout?url=http://online.wsj.com')
 
-

src/calibre/constants.py

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

src/calibre/gui2/book_details.py

@@ -93,10 +93,16 @@ class CoverView(QWidget): # {{{
         self._current_pixmap_size = val
 
     def do_layout(self):
+        if self.rect().width() == 0 or self.rect().height() == 0:
+            return
         pixmap = self.pixmap
         pwidth, pheight = pixmap.width(), pixmap.height()
+        try:
             self.pwidth, self.pheight = fit_image(pwidth, pheight,
                             self.rect().width(), self.rect().height())[1:]
+        except:
+            self.pwidth, self.pheight = self.rect().width()-1, \
+                    self.rect().height()-1
         self.current_pixmap_size = QSize(self.pwidth, self.pheight)
         self.animation.setEndValue(self.current_pixmap_size)
 
@@ -120,7 +126,8 @@ class CoverView(QWidget): # {{{
         self.data = {'id':data.get('id', None)}
         if data.has_key('cover'):
             self.pixmap = QPixmap.fromImage(data.pop('cover'))
-            if self.pixmap.isNull():
+            if self.pixmap.isNull() or self.pixmap.width() < 5 or \
+                    self.pixmap.height() < 5:
                 self.pixmap = self.default_pixmap
         else:
             self.pixmap = self.default_pixmap

src/calibre/gui2/cover_flow.py

@@ -205,8 +205,8 @@ class CoverFlowMixin(object):
                     sm.select(index, sm.ClearAndSelect|sm.Rows)
                     self.library_view.setCurrentIndex(index)
         except:
-            pass
-
+            import traceback
+            traceback.print_exc()
 
     def sync_listview_to_cf(self, row):
         self.cf_last_updated_at = time.time()

src/calibre/gui2/library/models.py

@@ -919,8 +919,8 @@ class DeviceBooksModel(BooksModel): # {{{
         flags = QAbstractTableModel.flags(self, index)
         if index.isValid() and self.editable:
             cname = self.column_map[index.column()]
-            if cname in ('title', 'authors') or (cname == 'collection' and \
-                    self.db.supports_collections()):
+            if cname in ('title', 'authors') or \
+                    (cname == 'collections' and self.db.supports_collections()):
                 flags |= Qt.ItemIsEditable
         return flags
 

src/calibre/gui2/pictureflow/pictureflow.cpp

@@ -496,6 +496,7 @@ int PictureFlowPrivate::currentSlide() const
 
 void PictureFlowPrivate::setCurrentSlide(int index)
 {
+  animateTimer.stop();
   step = 0;
   centerIndex = qBound(index, 0, slideImages->count()-1);
   target = centerIndex;

src/calibre/translations/calibre.pot

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: calibre 0.7.3\n"
-"POT-Creation-Date: 2010-06-18 11:10+MDT\n"
-"PO-Revision-Date: 2010-06-18 11:10+MDT\n"
+"Project-Id-Version: calibre 0.7.4\n"
+"POT-Creation-Date: 2010-06-19 18:08+MDT\n"
+"PO-Revision-Date: 2010-06-19 18:08+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -422,55 +422,55 @@ msgstr ""
 msgid "Communicate with S60 phones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:78
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:77
 msgid "Communicate with iBooks through iTunes."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:84
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:83
 msgid "Apple device detected, launching iTunes, please wait ..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:227
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:230
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:226
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:229
 msgid "Updating device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:301
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:338
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:842
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:876
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:300
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:337
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:841
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:875
 msgid "%d of %d"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:345
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:881
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:344
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:880
 msgid "finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:519
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:518
 msgid ""
 "Some books not found in iTunes database.\n"
 "Delete using the iBooks app.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:742
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:741
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:28
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:744
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:743
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:30
 msgid "Ordered list of formats the device will accept"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:813
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:812
 msgid ""
 "Some cover art could not be converted.\n"
 "Click 'Show Details' for a list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2168
+#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2178
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:810
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:816
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:844
@@ -1547,10 +1547,10 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:34
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:201
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:202
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:207
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:208
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:214
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:215
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:184
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:99
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:67
@@ -2886,7 +2886,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:22
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:44
 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:53
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:309
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:114
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:115
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:116
@@ -2931,7 +2931,7 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:308
 msgid "Click to open Book Details window"
 msgstr ""