From 4a1dcdb2105746764f813f1f2d341fa83b7efc8c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 4 Jun 2010 07:11:20 -0600 Subject: [PATCH] Fix #5685 (Updated recipe and icon for Clarin) --- resources/images/news/clarin.png | Bin 330 -> 820 bytes resources/recipes/clarin.recipe | 51 +++++++++++++++++-------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/resources/images/news/clarin.png b/resources/images/news/clarin.png index f08bc3e5acdf925a067d44b639ce4f43fcaaad5b..2ef634678e4cb964fc1e4b1d8a571f617adfc90b 100644 GIT binary patch literal 820 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87?@%`T^vI!PM1!;?Hv**a;!dkzVX?kx2N1> zHC^64v81s>W7mb~0Fj%lid|K{8jBYEYhKa8)U2_qN#E8*|DyAS;x9t2E-I-DrzN~v zVr;dn_}snK?S*GbVm92|5b-+t{;wa?S`u%t>ZHsQNWNh3r1~_c+x@-Ezhzo`m%lv_ z#cj~D)hv7M)k*%`A3wk1{TmRxT-NmKt&Nqt({@*1UAYP<*|6YAMzX)avx1jb zW}9*_oqhf}b8_Y9X>Z#31RQ$~N;n%>xRk%Htc%^<*y-N+{oA8k^MyXv3UNequM+Dh zlea&*ow@zz#WHqQx46B_R_|;*v-x>Nr$y7jC6|3xJxVgX6OwFL^Rd<@;m18@HTzn% z?~hc|lA1OYnyQ?NxNx~Ssy!#lf6F4K@PPmGLpmDXE6>!KnW7pxT`yrazmWayQ%xHU z15`y;+}hc^;)Kc9Og4vwC%#A2d=b#zo}2vSboj6HbCln_*Uz{#VNucfcZ)u$GOTe8 zzaqS~ud$k6a!>XAf((vMS5Eii9dg-eA3vqKe*Tlcr7zSs^NOyL5M$^Y4>sX$#fcm} z{gZF+YTf#_e}$hK=i!2HT>EPSL>xacE~t3=l=aCUmB*!9b@tb_zDf~#9+SDBvGuNt z1CQ0xlS`Z)eR2)*eSKkNnxH1D!PGfFeg7PMcl-1z<+BUCCT{6S=$Uy~q3J-$RIQ&C zO{&ZNgPv6u_ZV}lJYr^k(bLSu6!TbWm08}5_lE=pZO$`G{NoO4x4FLbdAI~H)v1=a zMwFx^mZVxG7o`Fz1|tJQ16>0%T?3O419K}w11ke_AlJ&kVCNs_9uy6^`6-!cl_(l4 ctqcvVOe`Q8*0(=e3)H~i>FVdQ&MBb@04I=SZvX%Q literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Q!3HFy+4N(86kC$Fy9>iV5PU6hr3om)S>O>_ z45U54*zIJt9Z0aOz%d<2gY`2A^6{Jia*91&978Nlubt@4bwGiK^||N!`lltqQQFVg z_w@=rGU(jU**NjYfq8b!5`oD~KU^g}7QFl?w8bDMAZ2N<3&*X4Pxg2_o}Te;b|7PD zQO=fRH^q!?7sF@wEeqW8q{RK6e`Trbgua)dH@%r(F`d%MefI7YLjm)yXf4jUuTE?Q zTCZB-8c~v5l$uzQs+$5N7>o=IEOZTxbd3!|49u-ejjc=!bqy@63=9}2EVv2Nkei>9 YnN~?aL!9EZw?GXHp00i_>zopr001Xx4*&oF diff --git a/resources/recipes/clarin.recipe b/resources/recipes/clarin.recipe index 3a96bca162..7bbb663d1d 100644 --- a/resources/recipes/clarin.recipe +++ b/resources/recipes/clarin.recipe @@ -5,7 +5,6 @@ __copyright__ = '2008-2010, Darko Miletic ' clarin.com ''' -from calibre import strftime from calibre.web.feeds.news import BasicNewsRecipe class Clarin(BasicNewsRecipe): @@ -18,11 +17,12 @@ class Clarin(BasicNewsRecipe): max_articles_per_feed = 100 use_embedded_content = False no_stylesheets = True - cover_url = strftime('http://www.clarin.com/diario/%Y/%m/%d/portada.jpg') - encoding = 'cp1252' - language = 'es' - masthead_url = 'http://www.clarin.com/shared/v10/img/Hd/lg_Clarin.gif' - extra_css = ' body{font-family: Arial,Helvetica,sans-serif} h2{font-family: Georgia,"Times New Roman",Times,serif; font-size: xx-large} .Volan,.Pie,.Autor{ font-size: x-small} .Copete,.Hora{font-size: large} ' + encoding = 'utf8' + 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} ' conversion_options = { 'comment' : description @@ -31,27 +31,32 @@ class Clarin(BasicNewsRecipe): , 'language' : language } - remove_tags = [ - dict(name='a' , attrs={'class':'Imp' }) - ,dict(name='div' , attrs={'class':'Perma' }) - ,dict(name='h1' , text='Imprimir' ) - ] + keep_only_tags = [dict(attrs={'class':['hd','mt']})] feeds = [ - (u'Ultimo Momento', u'http://www.clarin.com/diario/hoy/um/sumariorss.xml') - ,(u'El Pais' , u'http://www.clarin.com/diario/hoy/elpais.xml' ) - ,(u'Opinion' , u'http://www.clarin.com/diario/hoy/opinion.xml' ) - ,(u'El Mundo' , u'http://www.clarin.com/diario/hoy/elmundo.xml' ) - ,(u'Sociedad' , u'http://www.clarin.com/diario/hoy/sociedad.xml' ) - ,(u'La Ciudad' , u'http://www.clarin.com/diario/hoy/laciudad.xml' ) - ,(u'Policiales' , u'http://www.clarin.com/diario/hoy/policiales.xml' ) - ,(u'Deportes' , u'http://www.clarin.com/diario/hoy/deportes.xml' ) + (u'Pagina principal', u'http://www.clarin.com/rss/' ) + ,(u'Politica' , u'http://www.clarin.com/rss/politica/' ) + ,(u'Deportes' , u'http://www.clarin.com/rss/deportes/' ) + ,(u'Economia' , u'http://www.clarin.com/economia/' ) + ,(u'Mundo' , u'http://www.clarin.com/rss/mundo/' ) + ,(u'Espectaculos' , u'http://www.clarin.com/rss/espectaculos/') + ,(u'Sociedad' , u'http://www.clarin.com/rss/sociedad/' ) + ,(u'Ciudades' , u'http://www.clarin.com/rss/ciudades/' ) + ,(u'Policiales' , u'http://www.clarin.com/rss/policiales/' ) + ,(u'Internet' , u'http://www.clarin.com/rss/internet/' ) + ,(u'Ciudades' , u'http://www.clarin.com/rss/ciudades/' ) ] def print_version(self, url): - rest = url.partition('-0')[-1] - lmain = rest.partition('.')[0] - lurl = u'http://www.servicios.clarin.com/notas/jsp/clarin/v9/notas/imprimir.jsp?pagid=' + lmain - return lurl + return url + '?print=1' + def get_cover_url(self): + cover_url = None + soup = self.index_to_soup(self.INDEX) + cover_item = soup.find('div',attrs={'class':'bb-md bb-md-edicion_papel'}) + if cover_item: + ap = cover_item.find('a',attrs={'href':'/edicion-impresa/'}) + if ap: + cover_url = self.INDEX + ap.img['src'] + return cover_url