Pull from trunk

resources/recipes/corriere_della_sera_it.recipe

@@ -9,22 +9,25 @@ __description__ = 'Italian daily newspaper'
 '''
 http://www.corriere.it/
 '''
-
+import time
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class ilCorriere(BasicNewsRecipe):
-    __author__     = 'Lorenzo Vigentini, based on Darko Miletic'
+    __author__     = 'Lorenzo Vigentini, based on Darko Miletic, Gabriele Marini'
     description    = 'Italian daily newspaper'
 
-    cover_url      = 'http://images.corriereobjects.it/images/static/common/logo_home.gif?v=200709121520'
+#    cover_url      = 'http://images.corriereobjects.it/images/static/common/logo_home.gif?v=200709121520
-    title          = u'Il Corriere della sera '
+
+
+    title          = u'Il Corriere della sera'
     publisher      = 'RCS Digital'
     category       = 'News, politics, culture, economy, general interest'
 
+    encoding       = 'cp1252'
     language       = 'it'
     timefmt        = '[%a, %d %b, %Y]'
 
-    oldest_article = 1
+    oldest_article = 10
     max_articles_per_feed = 100
     use_embedded_content  = False
     recursion             = 10
@@ -51,17 +54,35 @@ class ilCorriere(BasicNewsRecipe):
 
     remove_tags_after = dict(name='p', attrs={'class':'footnotes'})
 
+    def get_cover_url(self):
+        cover = None
+        st = time.localtime()
+        year = str(st.tm_year)
+        month = "%.2d" % st.tm_mon
+        day = "%.2d" % st.tm_mday
+		#http://images.corriere.it/primapagina/storico/2010_05_17/images/prima_pagina_grande.png
+        cover='http://images.corriere.it/primapagina/storico/'+ year + '_' +  month +'_' + day +'/images/prima_pagina_grande.png'
+        br = BasicNewsRecipe.get_browser()
+        try:
+            br.open(cover)
+        except:
+            self.log("\nCover unavailable")
+            cover ='http://images.corriereobjects.it/images/static/common/logo_home.gif?v=200709121520'
+        return cover
+
     feeds = [
-             (u'Ultimora'  , u'http://www.corriere.it/rss/ultimora.xml'  ),
+             (u'Ultimora'   ,  u'http://www.corriere.it/rss/ultimora.xml'  ),
-             (u'Editoriali', u'http://www.corriere.it/rss/editoriali.xml'),
+             (u'Editoriali' ,  u'http://www.corriere.it/rss/editoriali.xml'),
-             (u'Cronache'  , u'http://www.corriere.it/rss/cronache.xml'  ),
+             (u'Cronache'   ,  u'http://www.corriere.it/rss/cronache.xml'  ),
-             (u'Politica'  , u'http://www.corriere.it/rss/politica.xml'  ),
+             (u'Politica'   ,  u'http://www.corriere.it/rss/politica.xml'  ),
-             (u'Esteri'    , u'http://www.corriere.it/rss/esteri.xml'    ),
+             (u'Esteri'     ,  u'http://www.corriere.it/rss/esteri.xml'    ),
-             (u'Economia'  , u'http://www.corriere.it/rss/economia.xml'  ),
+             (u'Economia'   ,  u'http://www.corriere.it/rss/economia.xml'  ),
-             (u'Cultura'    , u'http://www.corriere.it/rss/cultura.xml'  ),
+             (u'Cultura'    ,  u'http://www.corriere.it/rss/cultura.xml'   ),
-             (u'Scienze'   , u'http://www.corriere.it/rss/scienze.xml'   ),
+             (u'Scienze'    ,  u'http://www.corriere.it/rss/scienze.xml'   ),
-             (u'Salute'    , u'http://www.corriere.it/rss/salute.xml'    ),
+             (u'Salute'     ,  u'http://www.corriere.it/rss/salute.xml'    ),
-             (u'Spettacolo', u'http://www.corriere.it/rss/spettacoli.xml'),
+             (u'Spettacolo' ,  u'http://www.corriere.it/rss/spettacoli.xml'),
-             (u'Cinema e TV', u'http://www.corriere.it/rss/cinema.xml'   ),
+             (u'Cinema e TV',  u'http://www.corriere.it/rss/cinema.xml'    ),
-             (u'Sport'     , u'http://www.corriere.it/rss/sport.xml'     )
+             (u'Sport'      ,  u'http://www.corriere.it/rss/sport.xml'     ),
+             (u'Roma'      ,   u'http://www.corriere.it/rss/homepage_roma.xml'),
+             (u'Milano'      , u'http://www.corriere.it/rss/homepage_milano.xml')
             ]

resources/recipes/leggo_it.recipe

@@ -57,9 +57,13 @@ class LeggoIT(BasicNewsRecipe):
         try:
             br.open(cover)
         except:
-            self.log("\nCover unavailable")
+            cover='http://www.leggo.it/'+ year +  month + day + '/jpeg/LEGGO_ROMA_3.jpg'
-            cover = 'http://www.leggo.it/img/logo-leggo2.gif'
+            br = BasicNewsRecipe.get_browser()
-
+            try:
+                br.open(cover)
+            except:
+                self.log("\nCover unavailable")
+                cover = 'http://www.leggo.it/img/logo-leggo2.gif'
         return cover
 
 

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

@@ -5,10 +5,15 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import textwrap
+import textwrap, cStringIO
 from urllib import unquote
 
 from lxml import etree
+try:
+    from PIL import Image as PILImage
+    PILImage
+except ImportError:
+    import Image as PILImage
 
 from calibre import __appname__, __version__, guess_type
 
@@ -28,9 +33,9 @@ class CoverManager(object):
             <body>
                 <svg version="1.1" xmlns="http://www.w3.org/2000/svg"
                     xmlns:xlink="http://www.w3.org/1999/xlink"
-                    width="100%%" height="100%%" viewBox="0 0 600 800"
+                    width="100%%" height="100%%" viewBox="__viewbox__"
                     preserveAspectRatio="__ar__">
-                    <image width="600" height="800" xlink:href="%s"/>
+                    <image width="__width__" height="__height__" xlink:href="%s"/>
                 </svg>
             </body>
         </html>
@@ -93,7 +98,6 @@ class CoverManager(object):
         title = unicode(m.title[0])
         authors = [unicode(x) for x in m.creator if x.role == 'aut']
 
-        import cStringIO
         cover_file = cStringIO.StringIO()
         try:
             try:
@@ -142,6 +146,18 @@ class CoverManager(object):
             self.log.exception('Failed to generate default cover')
         return None
 
+    def inspect_cover(self, href):
+        from calibre.ebooks.oeb.base import urlnormalize
+        for x in self.oeb.manifest:
+            if x.href == urlnormalize(href):
+                try:
+                    raw = x.data
+                    f = cStringIO.StringIO(raw)
+                    im = PILImage.open(f)
+                    return im.size
+                except:
+                    self.log.exception('Failed to read image dimensions')
+        return None, None
 
     def insert_cover(self):
         from calibre.ebooks.oeb.base import urldefrag
@@ -152,6 +168,19 @@ class CoverManager(object):
                 href = g['cover'].href
             else:
                 href = self.default_cover()
+            width, height = self.inspect_cover(href)
+            if width is None or height is None:
+                self.log.warning('Failed to read cover dimensions')
+                width, height = 600, 800
+            if self.preserve_aspect_ratio:
+                width, height = 600, 800
+            self.svg_template = self.svg_template.replace('__viewbox__',
+                    '0 0 %d %d'%(width, height))
+            self.svg_template = self.svg_template.replace('__width__',
+                    str(width))
+            self.svg_template = self.svg_template.replace('__height__',
+                    str(height))
+
             if href is not None:
                 templ = self.non_svg_template if self.no_svg_cover \
                         else self.svg_template