diff --git a/src/calibre/gui2/images/news/elmundo.png b/src/calibre/gui2/images/news/elmundo.png new file mode 100644 index 0000000000..754b3d0e15 Binary files /dev/null and b/src/calibre/gui2/images/news/elmundo.png differ diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py index a1a439d579..f9b4513c78 100644 --- a/src/calibre/parallel.py +++ b/src/calibre/parallel.py @@ -161,7 +161,7 @@ class WorkerMother(object): self.executable = self.gui_executable = sys.executable self.prefix = '' if isfrozen: - fd = getattr(sys, 'frameworks_dir') + fd = os.path.realpath(getattr(sys, 'frameworks_dir')) contents = os.path.dirname(fd) self.gui_executable = os.path.join(contents, 'MacOS', os.path.basename(sys.executable)) diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py index 9005e7d252..8fd6badc62 100644 --- a/src/calibre/web/feeds/recipes/__init__.py +++ b/src/calibre/web/feeds/recipes/__init__.py @@ -26,7 +26,7 @@ recipe_modules = ['recipe_' + r for r in ( 'laprensa', 'amspec', 'freakonomics', 'criticadigital', 'elcronista', 'shacknews', 'teleread', 'granma', 'juventudrebelde', 'juventudrebelde_english', 'la_tercera', 'el_mercurio_chile', 'la_cuarta', 'lanacion_chile', 'la_segunda', - 'jb_online', 'estadao', 'o_globo', 'vijesti', + 'jb_online', 'estadao', 'o_globo', 'vijesti', 'elmundo', )] import re, imp, inspect, time, os diff --git a/src/calibre/web/feeds/recipes/recipe_elmundo.py b/src/calibre/web/feeds/recipes/recipe_elmundo.py new file mode 100644 index 0000000000..4d1ec38c83 --- /dev/null +++ b/src/calibre/web/feeds/recipes/recipe_elmundo.py @@ -0,0 +1,45 @@ +#!/usr/bin/env python + +__license__ = 'GPL v3' +__copyright__ = '2009, Darko Miletic ' +''' +elmundo.es +''' + +from calibre.web.feeds.news import BasicNewsRecipe + +class ElMundo(BasicNewsRecipe): + title = 'El Mundo' + __author__ = 'Darko Miletic' + description = 'News from Spain' + oldest_article = 2 + max_articles_per_feed = 100 + no_stylesheets = True + use_embedded_content = False + encoding = 'iso8859_15' + cover_url = 'http://estaticos02.cache.el-mundo.net/papel/imagenes/v2.0/logoverde.gif' + + html2lrf_options = [ + '--comment' , description + , '--category' , 'news, Spain' + , '--publisher' , title + ] + + keep_only_tags = [dict(name='div', attrs={'class':'noticia'})] + + remove_tags = [ + dict(name='div', attrs={'class':['herramientas','publicidad_google','video','herramientasarriba','contenido_noticia_02']}) + ,dict(name='div', attrs={'id':'modulo_multimedia' }) + ,dict(name=['object','script','link', 'a']) + ,dict(name='ul', attrs={'class':'herramientas'}) + ] + + feeds = [ + (u'Portada' , u'http://rss.elmundo.es/rss/descarga.htm?data2=4' ) + ,(u'Television' , u'http://rss.elmundo.es/rss/descarga.htm?data2=76') + ,(u'Espana' , u'http://rss.elmundo.es/rss/descarga.htm?data2=8' ) + ,(u'Internacional' , u'http://rss.elmundo.es/rss/descarga.htm?data2=9' ) + ,(u'Cultura' , u'http://rss.elmundo.es/rss/descarga.htm?data2=6' ) + ,(u'Ciencia/Ecologia', u'http://rss.elmundo.es/rss/descarga.htm?data2=5' ) + ,(u'Comunicacion' , u'http://rss.elmundo.es/rss/descarga.htm?data2=26') + ]