README.md

@@ -77,6 +77,7 @@ The arguments are:
 	- `json`: output as JSON
 	- `proxy`: doesn't fill the articles
 	- `clip`: stick the full article content under the original feed content (useful for twitter)
+	- `keep`: by default, morss does drop feed description whenever the full-content is found (so as not to mislead users who use Firefox, since the latter only shows the description in the feed preview, so they might believe morss doens't work), but with this argument, the description is kept
 	- `search=STRING`: does a basic case-sensitive search in the feed
 - Advanced
 	- `csv`: export to csv

morss/crawler.py

@@ -367,7 +367,7 @@ class CacheHandler(BaseHandler):
 
         elif  self.force_min is None and ('no-cache' in cc_list
                                         or 'no-store' in cc_list
-                                        or ('private' in cc_list and not self.private_cache)):
+                                        or ('private' in cc_list and not self.private)):
             # kindly follow web servers indications, refresh
             return None
 
@@ -402,7 +402,7 @@ class CacheHandler(BaseHandler):
 
             cc_list = [x for x in cache_control if '=' not in x]
 
-            if 'no-cache' in cc_list or 'no-store' in cc_list or ('private' in cc_list and not self.private_cache):
+            if 'no-cache' in cc_list or 'no-store' in cc_list or ('private' in cc_list and not self.private):
                 # kindly follow web servers indications
                 return resp
 

morss/feeds.py

@@ -15,7 +15,6 @@ import dateutil.parser
 from copy import deepcopy
 
 import lxml.html
-from bs4 import BeautifulSoup
 
 json.encoder.c_make_encoder = None
 
@@ -442,7 +441,7 @@ class ParserHTML(ParserXML):
 
     def parse(self, raw):
         parser = etree.HTMLParser(remove_blank_text=True) # remove_blank_text needed for pretty_print
-        return etree.fromstring(BeautifulSoup(raw, 'lxml').prettify(), parser)
+        return etree.fromstring(raw, parser)
 
     def tostring(self, encoding='unicode', **k):
         return lxml.html.tostring(self.root, encoding=encoding, **k)

morss/morss.py

@@ -54,7 +54,7 @@ def filterOptions(options):
 
     # example of filtering code below
 
-    #allowed = ['proxy', 'clip', 'cache', 'force', 'silent', 'pro', 'debug']
+    #allowed = ['proxy', 'clip', 'keep', 'cache', 'force', 'silent', 'pro', 'debug']
     #filtered = dict([(key,value) for (key,value) in options.items() if key in allowed])
 
     #return filtered
@@ -288,6 +288,9 @@ def ItemAfter(item, options):
         item.content = item.desc + "<br/><br/><center>* * *</center><br/><br/>" + item.content
         del item.desc
 
+    if not options.keep and not options.proxy:
+        del item.desc
+
     if options.nolink and item.content:
         content = lxml.html.fromstring(item.content)
         for link in content.xpath('//a'):