diff --git a/src/libprs500/ebooks/lrf/web/convert_from.py b/src/libprs500/ebooks/lrf/web/convert_from.py index c94ed937f0..0c4c79088b 100644 --- a/src/libprs500/ebooks/lrf/web/convert_from.py +++ b/src/libprs500/ebooks/lrf/web/convert_from.py @@ -31,9 +31,10 @@ from libprs500.ebooks.lrf.web.profiles.economist import Economist from libprs500.ebooks.lrf.web.profiles.newyorkreview import NewYorkReviewOfBooks from libprs500.ebooks.lrf.web.profiles.spiegelde import SpiegelOnline from libprs500.ebooks.lrf.web.profiles.zeitde import ZeitNachrichten +from libprs500.ebooks.lrf.web.profiles.faznet import FazNet builtin_profiles = [NYTimes, BBC, Newsweek, Economist, NewYorkReviewOfBooks, \ - SpiegelOnline, ZeitNachrichten] + SpiegelOnline, ZeitNachrichten, FazNet] available_profiles = [i.__module__.rpartition('.')[2] for i in builtin_profiles] def option_parser(): diff --git a/src/libprs500/ebooks/lrf/web/profiles/faznet.py b/src/libprs500/ebooks/lrf/web/profiles/faznet.py new file mode 100644 index 0000000000..d1db24be92 --- /dev/null +++ b/src/libprs500/ebooks/lrf/web/profiles/faznet.py @@ -0,0 +1,43 @@ +## Copyright (C) 2007 Kovid Goyal kovid@kovidgoyal.net +## Costomized to FAZ.NET by S. Dorscht stdoonline@googlemail.com +## Version 0.10 +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License along +## with this program; if not, write to the Free Software Foundation, Inc., +## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +''' +Profile to download FAZ.net +''' +import re + +from libprs500.ebooks.lrf.web.profiles import DefaultProfile + +class FazNet(DefaultProfile): + + title = 'FAZ NET' + max_recursions = 2 + html_description = True + max_articles_per_feed = 30 + + preprocess_regexps = [ + (re.compile(r'Zum Thema.*?
\n" -#~ "For help visit libprs500.kovidgoyal.net"
-#~ "span>
libprs500: %"
-#~ "1 by Kovid Goyal
%2
', re.IGNORECASE | re.DOTALL), + lambda match : ''), + ] + + + def get_feeds(self): + return [ ('FAZ.NET', 'http://www.faz.net/s/Rub/Tpl~Epartner~SRss_.xml') ] + + def print_version(self, url): + return url.replace('.html?rss_aktuell', '~Afor~Eprint.html') + diff --git a/src/libprs500/gui2/images/news/diezeit.png b/src/libprs500/gui2/images/news/diezeit.png index 09cfeab9b2..36e5d6cac8 100644 Binary files a/src/libprs500/gui2/images/news/diezeit.png and b/src/libprs500/gui2/images/news/diezeit.png differ diff --git a/src/libprs500/gui2/images/news/faznet.png b/src/libprs500/gui2/images/news/faznet.png index e6423ecac8..234c8d03f2 100644 Binary files a/src/libprs500/gui2/images/news/faznet.png and b/src/libprs500/gui2/images/news/faznet.png differ diff --git a/src/libprs500/gui2/images/news/spiegelonline.png b/src/libprs500/gui2/images/news/spiegelonline.png index 393dfed102..a44371b88b 100644 Binary files a/src/libprs500/gui2/images/news/spiegelonline.png and b/src/libprs500/gui2/images/news/spiegelonline.png differ diff --git a/src/libprs500/gui2/news.py b/src/libprs500/gui2/news.py index f207cf90c2..0c4c9b86bd 100644 --- a/src/libprs500/gui2/news.py +++ b/src/libprs500/gui2/news.py @@ -28,6 +28,7 @@ class NewsMenu(QMenu): QMenu.__init__(self) self.add_menu_item('BBC', self.fetch_news_bbc, ':/images/news/bbc.png') self.add_menu_item('Economist', self.fetch_news_economist, ':/images/news/economist.png') + self.add_menu_item('Faz.net', self.fetch_news_faznet, ':/images/news/faznet.png') self.add_menu_item('Newsweek', self.fetch_news_newsweek, ':/images/news/newsweek.png') self.add_menu_item('New York Review of Books', self.fetch_news_nyreview, ':/images/book.svg') self.add_menu_item('New York Times', self.fetch_news_nytimes, ':/images/news/nytimes.png') @@ -43,6 +44,9 @@ class NewsMenu(QMenu): def fetch_news_zeitde(self, checked): self.fetch_news('zeitde', 'Zeit Nachrichten') + + def fetch_news_faznet(self, checked): + self.fetch_news('faznet', 'Faz.net') def fetch_news_bbc(self, checked): self.fetch_news('bbc', 'BBC') diff --git a/src/libprs500/translations/ca.po b/src/libprs500/translations/ca.po index 4876406924..497c7c7df5 100644 --- a/src/libprs500/translations/ca.po +++ b/src/libprs500/translations/ca.po @@ -1116,29 +1116,4 @@ msgstr "" "La targeta\n" "%s està disponible" -#~ msgid "" -#~ "