From f18a128ee6626a4cc25c4abce01bdc6777c5d663 Mon Sep 17 00:00:00 2001 From: pictuga Date: Mon, 6 Jul 2020 19:25:17 +0200 Subject: [PATCH] Change :first for :newest i.e. toggle default for the more-obvious option --- README.md | 2 +- morss/morss.py | 12 ++++++------ www/sheet.xsl | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6fcddaa..156875b 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ The arguments are: - `debug`: to have some feedback from the script execution. Useful for debugging - `force`: force refetch the rss feed and articles - `silent`: don't output the final RSS (useless on its own, but can be nice when debugging) - - `first`: return the feed items in the order they initially appear in the feed (morss ohterwise shows the newest items first) + - `newest`: return the feed items in chronological order (morss ohterwise shows the items by appearing order) - http server only - `callback=NAME`: for JSONP calls - `cors`: allow Cross-origin resource sharing (allows XHR calls from other servers) diff --git a/morss/morss.py b/morss/morss.py index b045d13..c64f87c 100644 --- a/morss/morss.py +++ b/morss/morss.py @@ -343,15 +343,15 @@ def FeedGather(rss, url, options): if options.cache: max_time = 0 - if options.first: - # :first to just take the first items in the feed (in sequence) - sorted_items = rss.items - - else: - # otherwise, take the _newest_, i.e. sort by time + if options.newest: + # :newest take the newest items now = datetime.now(tz.tzutc()) sorted_items = sorted(rss.items, key=lambda x:x.updated or x.time or now, reverse=True) + else: + # default behavior, take the first items (in appearing order) + sorted_items = rss.items + for i, item in enumerate(sorted_items): if time.time() - start_time > lim_time >= 0 or i + 1 > lim_item >= 0: log('dropped') diff --git a/www/sheet.xsl b/www/sheet.xsl index b4204d1..ff79aaa 100644 --- a/www/sheet.xsl +++ b/www/sheet.xsl @@ -192,8 +192,8 @@ link of the items and