commit 16a6611cab6de98d5128ae5c89704f156b6dd855
parent b145174ad9eac818d0621c8ab2548c3f26565352
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Wed, 15 May 2019 20:55:38 +0200
README and sfeed_update: use names (order vs sort) and in the execution order
Diffstat:
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README b/README
@@ -6,7 +6,7 @@ RSS and Atom parser (and some format programs).
It converts RSS or Atom feeds from XML to a TAB-separated file. There are
formatting programs included to convert this TAB-separated format to various
other formats. There are also some programs and scripts included to import and
-export OPML and to update, sort, filter and merge feed items.
+export OPML and to fetch, filter, merge and order feed items.
Build and install
@@ -147,8 +147,8 @@ sfeedrc - Config file. This file is evaluated as a shellscript in
Atleast the following functions can be overridden per feed:
- fetch: to use wget(1), OpenBSD ftp(1) or an other download program.
-- merge: to change the merge logic.
- filter: to filter on fields.
+- merge: to change the merge logic.
- order: to change the sort order.
See also the sfeedrc(5) man page documentation for more details.
diff --git a/sfeed_update b/sfeed_update
@@ -61,18 +61,18 @@ filter() {
cat
}
-# order by timestamp (descending).
-# order(name)
-order() {
- sort -t ' ' -k1rn,1
-}
-
# merge raw files: unique sort by id, title, link.
# merge(name, oldfile, newfile)
merge() {
sort -t ' ' -u -k6,6 -k2,2 -k3,3 "$2" "$3" 2>/dev/null
}
+# order by timestamp (descending).
+# order(name)
+order() {
+ sort -t ' ' -k1rn,1
+}
+
# fetch and parse feed.
# feed(name, feedurl, [basesiteurl], [encoding])
feed() {
