From 0a97a2a2b58888243107234a3cd1ec61138b381c Mon Sep 17 00:00:00 2001 From: pictuga Date: Wed, 1 May 2013 17:43:43 +0200 Subject: [PATCH] Support for combined feedsportal and feedburner. --- morss.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/morss.py b/morss.py index 121bcd9..510c1f1 100644 --- a/morss.py +++ b/morss.py @@ -288,15 +288,16 @@ def Fill(rss, cache): log('provided') return + if '{http://rssnamespace.org/feedburner/ext/1.0}origLink' in item: + item.link = item['{http://rssnamespace.org/feedburner/ext/1.0}origLink'] + log(item.link) + match = re.search('/([0-9a-zA-Z]{20,})/story01.htm$', item.link) if match: url = match.groups()[0].split('0') t = {'A':'0', 'B':'.', 'C':'/', 'D':'?', 'E':'-', 'I':'_', 'L':'http://', 'S':'www.', 'N':'.com', 'O':'.co.uk'} item.link = "".join([(t[s[0]] if s[0] in t else "=") + s[1:] for s in url[1:]]) log(item.link) - if '{http://rssnamespace.org/feedburner/ext/1.0}origLink' in item: - item.link = item['{http://rssnamespace.org/feedburner/ext/1.0}origLink'] - log(item.link) # check cache if item.link in cache: