diff --git a/recipes/sueddeutschezeitung.recipe b/recipes/sueddeutschezeitung.recipe index 6aa2347b04..3185fc0f8e 100644 --- a/recipes/sueddeutschezeitung.recipe +++ b/recipes/sueddeutschezeitung.recipe @@ -1,3 +1,4 @@ +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai __license__ = 'GPL v3' __copyright__ = '2010, Darko Miletic ' ''' @@ -8,17 +9,18 @@ from calibre.web.feeds.news import BasicNewsRecipe from calibre import strftime class SueddeutcheZeitung(BasicNewsRecipe): - title = 'Sueddeutche Zeitung' + title = 'Süddeutsche Zeitung' __author__ = 'Darko Miletic' description = 'News from Germany. Access to paid content.' - publisher = 'Sueddeutche Zeitung' + publisher = 'Süddeutsche Zeitung' category = 'news, politics, Germany' no_stylesheets = True oldest_article = 2 - encoding = 'cp1252' + encoding = 'iso-8859-1' needs_subscription = True remove_empty_feeds = True delay = 1 + cover_source = 'http://www.sueddeutsche.de/verlag' PREFIX = 'http://www.sueddeutsche.de' INDEX = PREFIX + '/app/epaper/textversion/' use_embedded_content = False @@ -58,6 +60,7 @@ class SueddeutcheZeitung(BasicNewsRecipe): feeds = [ (u'Politik' , INDEX + 'Politik/' ) ,(u'Seite drei' , INDEX + 'Seite+drei/' ) + ,(u'Thema des Tages' , INDEX + 'Thema+des+Tages/' ) ,(u'Meinungsseite' , INDEX + 'Meinungsseite/') ,(u'Wissen' , INDEX + 'Wissen/' ) ,(u'Panorama' , INDEX + 'Panorama/' ) @@ -82,6 +85,11 @@ class SueddeutcheZeitung(BasicNewsRecipe): ,(u'Beilage' , INDEX + 'Beilage/' ) ] + def get_cover_url(self): + cover_source_soup = self.index_to_soup(self.cover_source) + preview_image_div = cover_source_soup.find(attrs={'class':'preview-image'}) + return preview_image_div.div.img['src'] + def parse_index(self): src = self.index_to_soup(self.INDEX) id = '' @@ -92,7 +100,7 @@ class SueddeutcheZeitung(BasicNewsRecipe): lfeeds = self.get_feeds() for feedobj in lfeeds: feedtitle, feedurl = feedobj - self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl)) + self.report_progress(0, ('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl)) articles = [] soup = self.index_to_soup(feedurl + id) tbl = soup.find(attrs={'class':'szprintd'}) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 81324d31f8..51dd7baaff 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -347,7 +347,8 @@ def main(args=sys.argv): except socket.error: if iswindows: cant_start() - os.remove(ADDRESS) + if os.path.exists(ADDRESS): + os.remove(ADDRESS) try: listener = Listener(address=ADDRESS) except socket.error: