diff --git a/resources/recipes/elperiodico_catalan.recipe b/resources/recipes/elperiodico_catalan.recipe index e2bcb738b7..6b78f923cb 100644 --- a/resources/recipes/elperiodico_catalan.recipe +++ b/resources/recipes/elperiodico_catalan.recipe @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- __license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' +__copyright__ = '30 October 2010, Jordi Balcells based on an earlier recipe by Darko Miletic ' ''' elperiodico.cat ''' @@ -12,8 +12,8 @@ from calibre.ebooks.BeautifulSoup import Tag class ElPeriodico_cat(BasicNewsRecipe): title = 'El Periodico de Catalunya' - __author__ = 'Darko Miletic' - description = 'Noticias desde Catalunya' + __author__ = 'Jordi Balcells/Darko Miletic' + description = 'Noticies des de Catalunya' publisher = 'elperiodico.cat' category = 'news, politics, Spain, Catalunya' oldest_article = 2 @@ -33,15 +33,25 @@ class ElPeriodico_cat(BasicNewsRecipe): html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' - feeds = [(u"Tota l'edició", u'http://www.elperiodico.cat/rss.asp?id=46')] + feeds = [(u'Portada', u'http://www.elperiodico.cat/ca/rss/rss_portada.xml'), + (u'Internacional', u'http://www.elperiodico.cat/ca/rss/internacional/rss.xml'), + (u'Societat', u'http://www.elperiodico.cat/ca/rss/societat/rss.xml'), + (u'Ci\xe8ncia i tecnologia', u'http://www.elperiodico.cat/ca/rss/ciencia-i-tecnologia/rss.xml'), + (u'Esports', u'http://www.elperiodico.cat/ca/rss/esports/rss.xml'), + (u'Gent', u'http://www.elperiodico.cat/ca/rss/gent/rss.xml'), + (u'Opini\xf3', u'http://www.elperiodico.cat/ca/rss/opinio/rss.xml'), + (u'Pol\xedtica', u'http://www.elperiodico.cat/ca/rss/politica/rss.xml'), + (u'Barcelona', u'http://www.elperiodico.cat/ca/rss/barcelona/rss.xml'), + (u'Economia', u'http://www.elperiodico.cat/ca/rss/economia/rss.xml'), + (u'Cultura i espectacles', u'http://www.elperiodico.cat/ca/rss/cultura-i-espectacles/rss.xml'), + (u'Tele', u'http://www.elperiodico.cat/ca/rss/tele/rss.xml')] - keep_only_tags = [dict(name='div', attrs={'id':'noticia'})] + keep_only_tags = [dict(name='div', attrs={'class':'titularnoticia'}), + dict(name='div', attrs={'class':'noticia_completa'})] - remove_tags = [ - dict(name=['object','link','script']) - ,dict(name='ul',attrs={'class':'herramientasDeNoticia'}) - ,dict(name='div', attrs={'id':'inferiores'}) + remove_tags = [dict(name='div', attrs={'class':['opcionb','opcionb last','columna_noticia']}), + dict(name='span', attrs={'class':'opcionesnoticia'}) ] def print_version(self, url): diff --git a/resources/recipes/elperiodico_spanish.recipe b/resources/recipes/elperiodico_spanish.recipe index 073863fa15..d19adc5e58 100644 --- a/resources/recipes/elperiodico_spanish.recipe +++ b/resources/recipes/elperiodico_spanish.recipe @@ -2,17 +2,17 @@ # -*- coding: utf-8 -*- __license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' +__copyright__ = '30 October 2010, Jordi Balcells based on an earlier recipe by Darko Miletic ' ''' -elperiodico.com +elperiodico.cat ''' from calibre.web.feeds.news import BasicNewsRecipe from calibre.ebooks.BeautifulSoup import Tag -class ElPeriodico_esp(BasicNewsRecipe): +class ElPeriodico_cat(BasicNewsRecipe): title = 'El Periodico de Catalunya' - __author__ = 'Darko Miletic' + __author__ = 'Jordi Balcells/Darko Miletic' description = 'Noticias desde Catalunya' publisher = 'elperiodico.com' category = 'news, politics, Spain, Catalunya' @@ -33,15 +33,25 @@ class ElPeriodico_esp(BasicNewsRecipe): html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"' - feeds = [(u"Toda la edición", u'http://www.elperiodico.com/rss.asp?id=46')] + feeds = [(u'Portada', u'http://www.elperiodico.com/es/rss/rss_portada.xml'), + (u'Internacional', u'http://elperiodico.com/es/rss/internacional/rss.xml'), + (u'Sociedad', u'http://elperiodico.com/es/rss/sociedad/rss.xml'), + (u'Ciencia y Tecnolog\xeda', u'http://elperiodico.com/es/rss/ciencia-y-tecnologia/rss.xml'), + (u'Deportes', u'http://elperiodico.com/es/rss/deportes/rss.xml'), + (u'Gente', u'http://elperiodico.com/es/rss/gente/rss.xml'), + (u'Opini\xf3n', u'http://elperiodico.com/es/rss/opinion/rss.xml'), + (u'Pol\xedtica', u'http://elperiodico.com/es/rss/politica/rss.xml'), + (u'Barcelona', u'http://elperiodico.com/es/rss/barcelona/rss.xml'), + (u'Econom\xeda', u'http://elperiodico.com/es/rss/economia/rss.xml'), + (u'Cultura y espect\xe1culos', u'http://elperiodico.com/es/rss/cultura-y-espectaculos/rss.xml'), + (u'Tele', u'http://elperiodico.com/es/rss/cultura-y-espectaculos/rss.xml')] - keep_only_tags = [dict(name='div', attrs={'id':'noticia'})] + keep_only_tags = [dict(name='div', attrs={'class':'titularnoticia'}), + dict(name='div', attrs={'class':'noticia_completa'})] - remove_tags = [ - dict(name=['object','link','script']) - ,dict(name='ul',attrs={'class':'herramientasDeNoticia'}) - ,dict(name='div', attrs={'id':'inferiores'}) + remove_tags = [dict(name='div', attrs={'class':['opcionb','opcionb last','columna_noticia']}), + dict(name='span', attrs={'class':'opcionesnoticia'}) ] def print_version(self, url):