From 18a59e5f3af3d40640e990af2d7a84209ada7a15 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 14 Dec 2008 07:58:42 -0800
Subject: [PATCH] Updated recipe for The New Yorker (thanks to Darko Miletic)

---
 .pydevproject                               |   4 -
 src/calibre/gui2/images/news/new_yorker.png | Bin 0 -> 670 bytes
 src/calibre/gui2/images/news/newyorker.png  | Bin 4294 -> 0 bytes
 src/calibre/gui2/main.py                    |   2 +-
 src/calibre/gui2/status.py                  |   5 +-
 src/calibre/web/feeds/recipes/new_yorker.py | 112 ++++++--------------
 6 files changed, 39 insertions(+), 84 deletions(-)
 create mode 100644 src/calibre/gui2/images/news/new_yorker.png
 delete mode 100644 src/calibre/gui2/images/news/newyorker.png

diff --git a/.pydevproject b/.pydevproject
index 416319d077..fba36e6fb7 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -5,9 +5,5 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/calibre/src</path>
-<path>/calibre/devices</path>
-<path>/calibre/libprs500.devices.prs500</path>
-<path>/calibre/prs500</path>
-<path>/calibre/gui2</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/src/calibre/gui2/images/news/new_yorker.png b/src/calibre/gui2/images/news/new_yorker.png
new file mode 100644
index 0000000000000000000000000000000000000000..562b3b15557b5e95f5af373e3bc67e33f29bb035
GIT binary patch
literal 670
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%b@U_I1CZGssfk$L9
zkoEv$x0Bg+Ai=T%$8;bK*3S@gZ0%tN2FBx_E{-7<r+X(Fu72bo(t7?KmyxT;M!~iQ
zk2OcUcn&HFT;fPt?ewqxt6A7j)@zJM&#6t7U^%FzsS~6rB;Y6@y49p0e&dYVK>7Ew
zI}Fau`Ca&4=7M_UG}lc!lXXs)Sj~N*&Lns-YpYW1bxwznyLsQ!8IBir6w77TO?hl_
zpE)J6?lw<@#q;~?n68(08h%q<ay9GX-@5-oAC}*L|KC?_@(drf3ibQnH%90@_-!}s
zw5r)`UY9_Y<TvvlI#&HVa$faxk;&3^ub=G7vuSk~IzRuUgz{yRlclknbh>>m*F--2
zo*d#iDM7-`#Ok@s;fDgVmMPBlV`eb%JzTZdO`>h0K2u8~$NA5T*bf^7Xia5cc>GbK
zYte!LjRW6n&piKpVtR#4&h29*R;&y!cJ<xNX)D^v<0w#IA+zCbUg6G|g57r)ta_!L
zU?9<8*p{}LlVL@O7DGdbR%_JSw!3-k=RZ$4{ZxU&sixI{Cva_8;%zgx#epn=BCLxv
zoI*oOtYk&HUEh4KW^oi?tP>R6dwT!fJmvZ47ssu47IF2M)bjZ!&+Tm&GfXC&OnIbj
z^SZ)DiG%4&m92`<|J*sBS6EIvw0YCbH>c++aO{X%zfr=T!I5M2{=$#PW&-0^wZt`|
zB)KRxu_RSD1xPR$85mgT8XD;u8iyDfSeY7F8Jg%CSXdbtIM2_R4AYRCpOTqYiK)TF
b%E;6Ts2QxGAawp2paup{S3j3^P6<r_>V^m~

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/images/news/newyorker.png b/src/calibre/gui2/images/news/newyorker.png
deleted file mode 100644
index a5bb5ee183eca8e672b44fe71508f1913251cd5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4294
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

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 50e97f0825..1fdb76c2ee 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -258,7 +258,7 @@ class Main(MainWindow, Ui_MainWindow):
             db = LibraryDatabase2(self.library_path)
         except OSError, err:
             error_dialog(self, _('Bad database location'), unicode(err)).exec_()
-            dir = unicode(QFileDialog.getExistingDirectory(self, 
+            dir = unicode(QFileDialog.getExistingDirectory(self,
                             _('Choose a location for your ebook library.'), os.path.expanduser('~')))
             if not dir:
                 QCoreApplication.exit(1)
diff --git a/src/calibre/gui2/status.py b/src/calibre/gui2/status.py
index 86d44b641e..221a6fd12b 100644
--- a/src/calibre/gui2/status.py
+++ b/src/calibre/gui2/status.py
@@ -32,7 +32,10 @@ class BookInfoDisplay(QWidget):
             self.setMaximumWidth(width)
             QLabel.setPixmap(self, pixmap)
              
-            aspect_ratio = pixmap.width()/float(pixmap.height())
+            try:
+                aspect_ratio = pixmap.width()/float(pixmap.height())
+            except ZeroDivisionError:
+                aspect_ratio = 1
             self.setMaximumWidth(int(aspect_ratio*self.HEIGHT))
         
         def sizeHint(self):
diff --git a/src/calibre/web/feeds/recipes/new_yorker.py b/src/calibre/web/feeds/recipes/new_yorker.py
index ed9811c43b..f5ce85b351 100644
--- a/src/calibre/web/feeds/recipes/new_yorker.py
+++ b/src/calibre/web/feeds/recipes/new_yorker.py
@@ -1,78 +1,34 @@
-#!/usr/bin/env  python
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-import re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import NavigableString
-
-class NewYorker(BasicNewsRecipe):
-    
-    title       = 'The New Yorker'
-    __author__  = 'Kovid Goyal'
-    description = 'News and opinion'
-    
-    remove_tags = [
-                   dict(name='div', id=['printoptions', 'header', 'articleBottom']),
-                   dict(name='div', attrs={'class':['utils', 'icons']})
-                   ]
-    
-    
-    def parse_index(self):
-        toc_pat = re.compile(r'/magazine/toc/\d+/\d+/\d+/toc_\d+')
-        soup = self.soup(self.browser.open('http://www.newyorker.com/').read())
-        a = soup.find('a', href=toc_pat)
-        if a is None:
-            raise Exception('Could not find the current issue of The New Yorker')
-        href = a['href']
-        href = 'http://www.newyorker.com'+href[href.index('/magazine'):]
-        soup = self.soup(self.browser.open(href).read())
-        img = soup.find(id='inThisIssuePhoto')
-        if img is not None:
-            self.cover_url = 'http://www.newyorker.com'+img['src']
-            alt = img.get('alt', None)
-            if alt:
-                self.timefmt = ' [%s]'%alt
-        features = soup.findAll(attrs={'class':re.compile('feature')})
-        
-        category, sections, articles = None, [], []
-        for feature in features:
-            head = feature.find('img', alt=True, attrs={'class':'featurehed'})
-            if head is None:
-                continue
-            if articles:
-                sections.append((category, articles))
-            category, articles = head['alt'], []
-            if category in ('', 'AUDIO', 'VIDEO', 'BLOGS', 'GOINGS ON'):
-                continue
-            
-            for a in feature.findAll('a', href=True):
-                href = 'http://www.newyorker.com'+a['href']+'?printable=true'
-                title, in_title, desc = '', True, ''
-                for tag in a.contents:
-                    if getattr(tag, 'name', None) == 'br':
-                        in_title = False
-                        continue
-                    if isinstance(tag, NavigableString):
-                        text = unicode(tag)
-                        if in_title:
-                            title += text
-                        else:
-                            desc += text
-                if title and not 'Audio:' in title:
-                    art = {
-                           'title': title,
-                           'desc': desc, 'content':'',
-                           'url': href,
-                           'date': strftime('%a, %d %b'),
-                           }
-                    articles.append(art)
-                
-#        from IPython.Shell import IPShellEmbed
-#        ipshell = IPShellEmbed()
-#        ipshell()
-#        raise Exception()
-
-        return sections
\ No newline at end of file
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+newyorker.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class NewYorker(BasicNewsRecipe):
+    title                 = u'The New Yorker'
+    __author__            = 'Darko Miletic'
+    description           = 'Best of the US journalism'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = False
+    use_embedded_content  = False
+
+    keep_only_tags = [
+                        dict(name='div'  , attrs={'id':'printbody'   })
+                     ]
+    remove_tags = [
+                     dict(name='div'  , attrs={'class':'utils'       })
+                    ,dict(name='div'  , attrs={'id':'bottomFeatures' })
+                    ,dict(name='div'  , attrs={'id':'articleBottom'  })
+                  ]
+
+    feeds          = [
+                        (u'The New Yorker', u'http://feeds.newyorker.com/services/rss/feeds/everything.xml')
+                     ]
+
+    def print_version(self, url):
+        return url + '?printable=true'