From e8e4dbc35b0a3070c446b5562e4508b18ad346c8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 Jun 2013 09:56:07 +0530
Subject: [PATCH] Update Miradasalsur.

Fixes #1193922 [Updated recipe for Miradas al Sur](https://bugs.launchpad.net/calibre/+bug/1193922)
---
 recipes/icons/miradasalsur.png | Bin 0 -> 1120 bytes
 recipes/miradasalsur.recipe    |  97 ++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 recipes/icons/miradasalsur.png

diff --git a/recipes/icons/miradasalsur.png b/recipes/icons/miradasalsur.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cb7d033addb5d783f10eda8764433907d27df0c
GIT binary patch
literal 1120
zcmdr~?OT&o7{8xAV<PZulcnYm*a&paNG6t0YQBI13ZkH3YAU59L8-7XF^LyN6!9e$
zF%l6}97d^#mf8pVpjKRTq1Xnb0u2Wn;9#(4&)ey6^<Q+~*STMR_qonFzf&9^w~X>o
zdH?_w9Tl+}d->RMC$ZH8%Mt)ch+mNyIf8hsh{cLr*l;w9c#g->D8h~xkbpZp5)k4L
zgCQ;)U<jT;$VuaxAaFF|Fd88SHyI3du@2m2c%0A(;T>IgKydMh8$qmqt1K>$B6f%o
zForc(*VvM>?df^WN53N%H(XF|&N(_#S=*m?jA{J!Rmthzk}|<gBY}6+UN=HetNW~G
z@aqVTvHx<<1ZtCL=5Ib>4@9a#{UMWlc9UlaZMF)CeHN3}Ez;U*F54p4{z<AWnFVd&
z-xHfMl(DZ#9B9cdHY(?sJawqoF0e!Rey+c*wrh3IHf41{K*!W21C<R=An-*}>Of{u
zE2-(tE;XvcOyh%*xt~Lh;f8w;<=Peq=}gUX_H?|u)BKpwyo^g3)R%OFrfqMjQ8}+&
zG1p#y)8wstu`=BpzwJ4wn3Gkugsokm?c1@xiS&J$oc25ipUSUq&%wu2bnTOLbY-;>
zeEylAG*of1S*&iAg+2vUrzWcZyx}Q1tutzabyq>FTTov{ZujJ{C!lVTg}1o{b;WG4
zR9~_t>Mi<wx}|xf%VI4obJRBu-hX5*JY~KAu&2Cgpy-U#aQCmBxsC^aaQuI?FqkvM
zavY|Z;dm^VZ4TjF;P_E~6w!iXj8;q;?L=sJj5uDv3F7fD`hSQlZTm(5!Y4XnQR40j
zLQV_{a7!f@-Tvw4I|}LDy1;O)5(vo+FG{Ys(x6n_Y?OG5KvDk#B_Rwy8m{?zhz!>a
zKm`z&Yl$m{<U0SW-y5b=AU#ul_S=f@&Q+eTx=>wn@e&*?K6JR`Na@jI$4`87^3>@v
z*!|_6oV{P|%l$epzo2mcfg<>1d)lYz8J~T=W9P2SEd3YRu<nEP8#aEpY4etpk3QbI
zEmaB8G0RuP#;uHBwK^ej&Dx}7c=x?|^B26oaM9u=5s^!mMG-Lb&EU6Yh3IC7&UyQt
zxnbcXc)g(t3{rUdPMfaK%%Hrqprk0DslI+vf0bG+CIcpboS5LPAYPj|i6SPyE|pHf
muOTAEZjy2C<2^jRD5-3LB(|raJ(eCLJUTKiqJHt_{C@#Cu=t_?

literal 0
HcmV?d00001

diff --git a/recipes/miradasalsur.recipe b/recipes/miradasalsur.recipe
index fd306adc86..4794503384 100644
--- a/recipes/miradasalsur.recipe
+++ b/recipes/miradasalsur.recipe
@@ -1,18 +1,17 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2013, Darko Miletic <darko.miletic at gmail.com>'
 '''
-elargentino.com
+sur.infonews.com
 '''
 
+import datetime
+from calibre import strftime
 from calibre.web.feeds.news import BasicNewsRecipe
 from calibre.ebooks.BeautifulSoup import Tag
 
 class MiradasAlSur(BasicNewsRecipe):
     title                 = 'Miradas al Sur'
     __author__            = 'Darko Miletic'
-    description           = 'Revista Argentina'
+    description           = 'Semanario Argentino'
     publisher             = 'ElArgentino.com'
     category              = 'news, politics, Argentina'
     oldest_article        = 7
@@ -20,53 +19,51 @@ class MiradasAlSur(BasicNewsRecipe):
     no_stylesheets        = True
     use_embedded_content  = False
     encoding              = 'utf-8'
-    language = 'es_AR'
+    language              = 'es_AR'
+    remove_empty_feeds    = True
+    masthead_url          = 'http://sur.infonews.com/sites/default/files/www_miradas_al_sur_com_logo.gif'
+    extra_css             = """
+                             body{font-family: Arial,Helvetica,sans-serif}
+                             h1{font-family: Georgia,Times,serif}
+                             .field-field-story-author{color: gray; font-size: small}                             
+                            """
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        , 'series'    : title
+                        }
+                            
+    keep_only_tags = [dict(name='div', attrs={'id':['content-header', 'content-area']})]
+    remove_tags    = [ 
+                      dict(name=['link','meta','iframe','embed','object']), 
+                      dict(name='form', attrs={'class':'fivestar-widget'}),
+                      dict(attrs={'class':lambda x: x and 'terms-inline' in x.split()})
+                     ]
 
-    lang                  = 'es-AR'
-    direction             = 'ltr'
-    INDEX                 = 'http://www.elargentino.com/medios/123/Miradas-al-Sur.html'
-    extra_css             = ' .titulo{font-size: x-large; font-weight: bold} .volantaImp{font-size: small; font-weight: bold} '
-
-    html2lrf_options = [
-                          '--comment'  , description
-                        , '--category' , category
-                        , '--publisher', publisher
-                        ]
-
-    html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0cm; margin-top: 0em; margin-bottom: 0.5em} "'
-
-    keep_only_tags = [dict(name='div', attrs={'class':'ContainerPop'})]
-
-    remove_tags = [dict(name='link')]
-
-    feeds = [(u'Articulos', u'http://www.elargentino.com/Highlights.aspx?ParentType=Section&ParentId=123&Content-Type=text/xml&ChannelDesc=Miradas%20al%20Sur')]
-
-    def print_version(self, url):
-        main, sep, article_part = url.partition('/nota-')
-        article_id, rsep, rrest = article_part.partition('-')
-        return u'http://www.elargentino.com/Impresion.aspx?Id=' + article_id
-
-    def preprocess_html(self, soup):
-        for item in soup.findAll(style=True):
-            del item['style']
-        soup.html['lang'] = self.lang
-        soup.html['dir' ] = self.direction
-        mlang = Tag(soup,'meta',[("http-equiv","Content-Language"),("content",self.lang)])
-        mcharset = Tag(soup,'meta',[("http-equiv","Content-Type"),("content","text/html; charset=utf-8")])
-        soup.head.insert(0,mlang)
-        soup.head.insert(1,mcharset)
-        return soup
+    feeds = [
+             (u'Politica'           , u'http://sur.infonews.com/taxonomy/term/1/0/feed' ),
+             (u'Internacional'      , u'http://sur.infonews.com/taxonomy/term/2/0/feed' ),
+             (u'Informe Especial'   , u'http://sur.infonews.com/taxonomy/term/14/0/feed'),
+             (u'Delitos y pesquisas', u'http://sur.infonews.com/taxonomy/term/6/0/feed' ),
+             (u'Lesa Humanidad'     , u'http://sur.infonews.com/taxonomy/term/7/0/feed' ),
+             (u'Cultura'            , u'http://sur.infonews.com/taxonomy/term/8/0/feed' ),
+             (u'Deportes'           , u'http://sur.infonews.com/taxonomy/term/9/0/feed' ),
+             (u'Contratapa'         , u'http://sur.infonews.com/taxonomy/term/10/0/feed'),
+            ]
 
     def get_cover_url(self):
+        # determine the series number, unfortunately not gonna happen now
+        #self.conversion_options.update({'series_index':seriesnr})
         cover_url = None
-        soup = self.index_to_soup(self.INDEX)
-        cover_item = soup.find('div',attrs={'class':'colder'})
+        cdate = datetime.date.today()
+        todayweekday = cdate.isoweekday()
+        if (todayweekday != 7):
+            cdate -= datetime.timedelta(days=todayweekday)        
+        cover_page_url = cdate.strftime('http://sur.infonews.com/ediciones/%Y-%m-%d/tapa');
+        soup = self.index_to_soup(cover_page_url)
+        cover_item = soup.find('img', attrs={'class':lambda x: x and 'imagecache-tapa_edicion_full' in x.split()})
         if cover_item:
-           clean_url = self.image_url_processor(None,cover_item.div.img['src'])
-           cover_url = 'http://www.elargentino.com' + clean_url + '&height=600'
+           cover_url = cover_item['src']
         return cover_url
-
-    def image_url_processor(self, baseurl, url):
-        base, sep, rest = url.rpartition('?Id=')
-        img, sep2, rrest = rest.partition('&')
-        return base + sep + img