morss: use final request url

Code is not very elegant...

README.md

@@ -251,7 +251,7 @@ options = morss.Options(csv=True) # arguments
 morss.crawler.sqlite_default = '/tmp/morss-cache.db' # sqlite cache location
 
 url = morss.UrlFix(url) # make sure the url is properly formatted
-rss = morss.FeedFetch(url, options) # this only grabs the RSS feed
+url, rss = morss.FeedFetch(url, options) # this only grabs the RSS feed
 rss = morss.FeedGather(rss, url, options) # this fills the feed and cleans it up
 
 output = morss.FeedFormat(rss, options, 'unicode') # formats final feed

morss/crawler.py

@@ -627,7 +627,7 @@ class MySQLCacheHandler(BaseCache):
 
 
 if __name__ == '__main__':
-    data, con, contenttype, encoding = adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it')
+    req = adv_get(sys.argv[1] if len(sys.argv) > 1 else 'https://morss.it')
 
     if not sys.flags.interactive:
         print(req['data'].decode(req['encoding']))

morss/morss.py

@@ -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')