No parsing and explicit bad return code if download failed

[feeder.git] / urls2feeds.zsh

diff --git a/urls2feeds.zsh b/urls2feeds.zsh
index e878ece04d71ffacd30453e99debd51c4e3207fb..486ba8217e06f48b83f8aea2781b230c1d20b33f 100755 (executable)
--- a/urls2feeds.zsh
+++ b/urls2feeds.zsh
@@ -1,17 +1,16 @@
 #!/usr/bin/env zsh
 set -e
-autoload regexp-replace
+fpath=($0:h:a/cmd/functions.zsh $fpath)
+autoload url-to-filename
 typeset -A seen
 while read url ; do
     url="$url " # to be sure that next line will work
     url=${${=url}[1]}
-    dir=${url:gs#/#_#}
-    regexp-replace dir "^.*__" ""
-    regexp-replace dir "_$" "" || :
-    dir=feeds/$dir
+    dir=feeds/$(url-to-filename $url)
     seen[$dir]=1
     [[ -e $dir ]] && continue || :
     mkdir -p $dir/{cur,new,tmp} # make it maildir
     echo "$url" > $dir/url
+    print $dir
 done
 for dir (feeds/*) [[ $seen[$dir] -eq 1 ]] || print disappeared: $dir