pictuga/morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

morss: use final request url

Browse Source 
Code is not very elegant...
This commit is contained in:
pictuga
2020-04-28 22:30:21 +02:00
parent c27c38f7c7
commit 27a42c47aa
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
morss/morss.py
View File

@@ -339,7 +339,7 @@ def FeedFetch(url, options):
log(req['contenttype'])
raise MorssException('Link provided is not a valid feed')
return rss
return req['url'], rss
def FeedGather(rss, url, options):
@@ -438,7 +438,7 @@ def process(url, cache=None, options=None):
if cache:
crawler.default_cache = crawler.SQLiteCache(cache)
rss = FeedFetch(url, options)
url, rss = FeedFetch(url, options)
rss = FeedGather(rss, url, options)
return FeedFormat(rss, options, 'unicode')
@@ -510,7 +510,7 @@ def cgi_app(environ, start_response):
crawler.default_cache = crawler.SQLiteCache(os.path.join(os.getcwd(), 'morss-cache.db'))
# get the work done
rss = FeedFetch(url, options)
url, rss = FeedFetch(url, options)
if headers['content-type'] == 'text/xml':
headers['content-type'] = rss.mimetype[0]
@@ -673,7 +673,7 @@ def cli_app():
crawler.default_cache = crawler.SQLiteCache(os.path.expanduser('~/.cache/morss-cache.db'))
rss = FeedFetch(url, options)
url, rss = FeedFetch(url, options)
rss = FeedGather(rss, url, options)
out = FeedFormat(rss, options, 'unicode')