diff options
| author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2021-02-28 13:33:21 +0100 |
|---|---|---|
| committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2021-03-01 18:41:27 +0100 |
| commit | 58555779d123be68c0acf9ea898931d656ec6d63 (patch) | |
| tree | 3862e7ad3b71b66d0fbb90c904a08f05beb9d463 /sfeed_update | |
| parent | f305b032bc19b4e81c0dd6c0398370028ea910ca (diff) | |
sfeed_update: simplify, use feedurl directly
This also make it possible to use non-authoritive URLs as a baseurl, like
"magnet:" URLs.
Diffstat (limited to 'sfeed_update')
| -rwxr-xr-x | sfeed_update | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sfeed_update b/sfeed_update index 7d11f18..94b598c 100755 --- a/sfeed_update +++ b/sfeed_update @@ -108,13 +108,8 @@ _feed() { fi rm -f "${tmpfeedfile}.fetch" - # if baseurl is empty then use the path from the feed by default. - if [ "${basesiteurl}" = "" ]; then - host="${feedurl##*://}" - basesiteurl="${feedurl%%://*}://${host%/*}/" - fi - - if ! parse "${name}" "${feedurl}" "${basesiteurl}" < "${tmpfeedfile}.utf8" > "${tmpfeedfile}.tsv"; then + # if baseurl is empty then use feedurl. + if ! parse "${name}" "${feedurl}" "${basesiteurl:-feedurl}" < "${tmpfeedfile}.utf8" > "${tmpfeedfile}.tsv"; then log "${name}" "FAIL (PARSE)" return fi |