diff options
| -rwxr-xr-x | enqueue_download.sh | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/enqueue_download.sh b/enqueue_download.sh index 32efedd..e9be4a5 100755 --- a/enqueue_download.sh +++ b/enqueue_download.sh @@ -3,12 +3,7 @@ DBG="" # DBG=1 UAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36' [ -z "$1" ] && printf "Pass at least one URL\n" && read g && exit 1 OUT_F=/tmp/dl.sh -#OUTD="/media/storage/tmp" OUTD="/dev/shm" -[ -s "$OUT_F" ] || { - printf "#!/bin/sh\ncd %s\n" $OUTD > $OUT_F - chmod +x $OUT_F -} enqueue_vid_choose_fmt() { export PICKER=fzy f1=$(yt-dlp -Fq $1 | @@ -34,24 +29,14 @@ enqueue_vid_choose_fmt() { } enqueue_direct_link() { printf "Adding direct URL with curl: %s\n" "$1" - curlopts="-L -C - --retry 5 -O" printf "Use Tor (y/[n])? " read tor && printf "\n" [ "$tor" = "y" ] && { printf "Using Tor proxy\n" - curlopts="-x socks5h://192.168.2.1:9100 $curlopts" + proxy="socks5h://192.168.2.1:9100" } - case $1 in - *.opus*|*.mp3*|*.ogg*) - #printf "cd /media/storage/sound\n" >> $OUT_F - printf "cd /tmp\n" >> $OUT_F - ;; - *.epub) - printf "cd /tmp\n" >> $OUT_F - ;; - esac - printf "curl -A '%s' %s '%s'\n" "$UAGENT" "$curlopts" "$1" >> $OUT_F - printf "cd /media/storage/tmp\n" >> $OUT_F + printf "curl -L -C - --retry 5 -x \"%s\" --output-dir %s -A '%s' -O '%s'\n" \ + "$proxy" $OUTD "$UAGENT" "$1" >> $OUT_F } enqueue_direct_link_wav() { author=${SFEED_FEED_PATH##*/} @@ -61,8 +46,7 @@ enqueue_direct_link_wav() { } open_img() { imgurl="$1" - cd $OUTD - curl -s -C - -O $imgurl + curl --output-dir $OUTD -s -C - -O $imgurl img2sixel $OUTD/${imgurl##*/} rm $OUTD/${imgurl##*/} read _ @@ -117,9 +101,6 @@ for url in $@; do [ -n "$DBG" ] && printf "Adding youtube link: '%s'\n" "$url" enqueue_vid_choose_fmt "$url" ;; - #https://rutube.ru/video/*|https://vk.com/video*) - #printf "yt-dlp '%s'\n" "$url" >> $OUT_F - #;; https://xkcd.com/*) imgurlx=$(curl -s ${url}info.0.json|jq -r '.img') alttext=$(curl -s ${url}info.0.json|jq -r '.alt') @@ -133,9 +114,6 @@ for url in $@; do dir=${repo##*/}-$tag git clone --branch $tag --depth 1 $repo.git /tmp/${dir} rm -rf /tmp/$dir/.git* - #printf "%s\n" $tag - #printf "%s\n" $repo - #printf "%s\n" $name ;; https://oper.ru/*) mp3link=$(scrape_mp3_links_from_URL.lua "$url") |