From fac708b267f1c3cfd0f2f88c35daad0e04a5b684 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 13 Oct 2013 07:50:48 +0530 Subject: [PATCH] Update Diagonales Fixes #1239235 [Updated recipe for Diagonales](https://bugs.launchpad.net/calibre/+bug/1239235) --- recipes/diagonales.recipe | 74 ++++++++++++----------------------- recipes/icons/diagonales.png | Bin 0 -> 4876 bytes 2 files changed, 26 insertions(+), 48 deletions(-) create mode 100644 recipes/icons/diagonales.png diff --git a/recipes/diagonales.recipe b/recipes/diagonales.recipe index eff06efc1d..65542697b5 100644 --- a/recipes/diagonales.recipe +++ b/recipes/diagonales.recipe @@ -1,72 +1,50 @@ -#!/usr/bin/env python - __license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' +__copyright__ = '2009-2013, Darko Miletic ' ''' -elargentino.com +diagonales.infonews.com ''' from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import Tag class Diagonales(BasicNewsRecipe): title = 'Diagonales' __author__ = 'Darko Miletic' - description = 'El nuevo diario de La Plata' - publisher = 'ElArgentino.com' + description = 'Para estar bien informado sobre los temas de actualidad. Conoce sobre pais, economia, deportes, mundo, espectaculos, sociedad, entrevistas y tecnologia.' + publisher = 'INFOFIN S.A.' category = 'news, politics, Argentina, La Plata' oldest_article = 2 max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False encoding = 'utf-8' - language = 'es_AR' - - lang = 'es-AR' - direction = 'ltr' - INDEX = 'http://www.elargentino.com/medios/122/Diagonales.html' + language = 'es_AR' + publication_type = 'newspaper' + delay = 1 + remove_empty_feeds = True 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} "' + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } keep_only_tags = [dict(name='div', attrs={'class':'ContainerPop'})] + remove_tags = [dict(name='link')] - remove_tags = [dict(name='link')] - - feeds = [(u'Articulos', u'http://www.elargentino.com/Highlights.aspx?ParentType=Section&ParentId=122&Content-Type=text/xml&ChannelDesc=Diagonales')] + feeds = [ + (u'Pais' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=112&Content-Type=text/xml&ChannelDesc=Pa%C3%ADs') + ,(u'Deportes' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=106&Content-Type=text/xml&ChannelDesc=Deportes') + ,(u'Economia' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=107&Content-Type=text/xml&ChannelDesc=Econom%C3%ADa') + ,(u'Sociedad' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=109&Content-Type=text/xml&ChannelDesc=Sociedad') + ,(u'Mundo' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=113&Content-Type=text/xml&ChannelDesc=Mundo') + ,(u'Espectaculos', u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=114&Content-Type=text/xml&ChannelDesc=Espect%C3%A1culos') + ,(u'Entrevistas' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=115&Content-Type=text/xml&ChannelDesc=Entrevistas') + ,(u'Tecnologia' , u'http://diagonales.infonews.com/Highlights.aspx?ParentType=Section&ParentId=118&Content-Type=text/xml&ChannelDesc=Tecnolog%C3%ADa') + ] 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 - - def get_cover_url(self): - cover_url = None - soup = self.index_to_soup(self.INDEX) - cover_item = soup.find('div',attrs={'class':'colder'}) - 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' - 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 + return u'http://diagonales.infonews.com/Impresion.aspx?Id=' + article_id diff --git a/recipes/icons/diagonales.png b/recipes/icons/diagonales.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe7c850376bc2ebdb1ede28e6911a704497367f GIT binary patch literal 4876 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 z