From 03501edccd85f54b188f4e5454dd58f5fd2c9a84 Mon Sep 17 00:00:00 2001
From: pictuga <contact@pictuga.com>
Date: Sun, 5 May 2013 15:30:06 +0200
Subject: [PATCH] Add/fix extra modes

'progress' mode now works on Chrome. 'cache' mode only relies on cache to load faster.
---
 morss.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/morss.py b/morss.py
index 5a957ea..72139b6 100644
--- a/morss.py
+++ b/morss.py
@@ -24,6 +24,8 @@ MAX = 70
 DELAY=10
 TIMEOUT = 2
 
+OPTIONS = ['progress', 'cache']
+
 UA_RSS = 'Liferea/1.8.12 (Linux; fr_FR.utf8; http://liferea.sf.net/)'
 UA_HML = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11'
 
@@ -307,7 +309,7 @@ def EncDownload(url):
 
 	return (data, enc, con.geturl())
 
-def Fill(rss, cache):
+def Fill(rss, cache, mode='feed'):
 	item = XMLMap(rss, ITEM_MAP, True)
 	log(item.link)
 
@@ -348,6 +350,10 @@ def Fill(rss, cache):
 			item.content = cache.get(item.link)
 			return
 
+	# super-fast mode
+	if mode == 'cache':
+		return
+
 	# download
 	ddl = EncDownload(item.link)
 
@@ -393,22 +399,26 @@ def Gather(url, cachePath, mode='feed'):
 		if mode == 'progress':
 			print "%s/%s" % (i+1, len(root.item))
 			sys.stdout.flush()
-		Fill(item, cache)
+		Fill(item, cache, mode)
 
 	return root.tostring(xml_declaration=True, encoding='UTF-8')
 
 if __name__ == "__main__":
 	if 'REQUEST_URI' in os.environ:
-		url, options = parseOptions(['progress'])
+		url, options = parseOptions(OPTIONS)
 
 		print 'Status: 200'
-		print 'Content-Type: text/html\n'
+
+		if options == 'progress':
+			print 'Content-Type: application/octet-stream\n'
+		else:
+			print 'Content-Type: text/html\n'
 
 		cache = os.getcwd() + '/cache'
 		log(url)
 		RSS = Gather(url, cache, options)
 	else:
-		url, options = parseOptions(['progress'])
+		url, options = parseOptions(OPTIONS)
 
 		if url is None:
 			print "Please provide url."