morss: drop 'keep' option
Because the Firefox behaviour it is working around is no longer in usemaster
parent
40c69f17d2
commit
d90756b337
|
@ -77,7 +77,6 @@ The arguments are:
|
||||||
- `json`: output as JSON
|
- `json`: output as JSON
|
||||||
- `proxy`: doesn't fill the articles
|
- `proxy`: doesn't fill the articles
|
||||||
- `clip`: stick the full article content under the original feed content (useful for twitter)
|
- `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
|
- `search=STRING`: does a basic case-sensitive search in the feed
|
||||||
- Advanced
|
- Advanced
|
||||||
- `csv`: export to csv
|
- `csv`: export to csv
|
||||||
|
|
|
@ -54,7 +54,7 @@ def filterOptions(options):
|
||||||
|
|
||||||
# example of filtering code below
|
# example of filtering code below
|
||||||
|
|
||||||
#allowed = ['proxy', 'clip', 'keep', 'cache', 'force', 'silent', 'pro', 'debug']
|
#allowed = ['proxy', 'clip', 'cache', 'force', 'silent', 'pro', 'debug']
|
||||||
#filtered = dict([(key,value) for (key,value) in options.items() if key in allowed])
|
#filtered = dict([(key,value) for (key,value) in options.items() if key in allowed])
|
||||||
|
|
||||||
#return filtered
|
#return filtered
|
||||||
|
@ -288,9 +288,6 @@ def ItemAfter(item, options):
|
||||||
item.content = item.desc + "<br/><br/><center>* * *</center><br/><br/>" + item.content
|
item.content = item.desc + "<br/><br/><center>* * *</center><br/><br/>" + item.content
|
||||||
del item.desc
|
del item.desc
|
||||||
|
|
||||||
if not options.keep and not options.proxy:
|
|
||||||
del item.desc
|
|
||||||
|
|
||||||
if options.nolink and item.content:
|
if options.nolink and item.content:
|
||||||
content = lxml.html.fromstring(item.content)
|
content = lxml.html.fromstring(item.content)
|
||||||
for link in content.xpath('//a'):
|
for link in content.xpath('//a'):
|
||||||
|
|
Loading…
Reference in New Issue