From 091b91811202902dce64666c29fdc2a77bc2c7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Thu, 3 Dec 2020 15:47:31 +0100 Subject: Rename File to Link, move filename generation from pd to pc --- pc | 17 +++++++++++------ pd | 11 ++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pc b/pc index 31c7fe2..e5b28f6 100755 --- a/pc +++ b/pc @@ -6,7 +6,7 @@ sed -e '/^$/d' -e 's/^[ ]*//' | awk -vFS='[<>]' -vOFS=' ' ' // { date = $3 } // { duration = $3 } - /]*>/ { file = $0 } + /]*>/ { link = $0 } /$/ { getline; summary = $0 } /..*/ { summary = $3 } /$/ { getline; summary = $0 } @@ -16,7 +16,15 @@ awk -vFS='[<>]' -vOFS=' ' ' print "Title: " title print "Duration: " duration print "Date: " date - print "File: " file + gsub(/^]* url="/, "", link) + gsub(/".*/, "", link) + print "Link: " link + gsub(/\\\\/, ".", title) + gsub(/[\/:*<>|]/, ".", title) + gsub(/.*\./, ".", link) + print "File: " title link + gsub(//, "", summary) print "Summary: " summary print "" date = "?" @@ -25,7 +33,4 @@ awk -vFS='[<>]' -vOFS=' ' ' summary = "?" title = "?" } -' | -sed -e 's,,,' \ - -e 's,]* url="\([^"]*\)".*,\1,' \ - -e 's,,\1,' +' diff --git a/pd b/pd index 354991b..d5782c2 100755 --- a/pd +++ b/pd @@ -2,13 +2,10 @@ # pd -- download podcast episode(s) -u= -test "$1" = -u && u=1 # unix mode - -eval curl -ZL "$(sed -n 's/^Title: \|File: //p' | +eval curl -ZL "$(sed -n 's/^Link: \|File: //p' | sed 's/ / /g; s/\\/\\\\/g; '"s/'/'\"'\"'/g" | paste - - | -while IFS=' ' read title file; do - test -z "$u" && title=`printf '%s\n' "$title" | sed 's/\\\\/./g; s,[/:*<>|],.,g; s/?//g; '"s/\"/'\"'\"'/g"` # dos/windows (default) - printf "-o '%s' '%s' " "$title.${file##*.}" "$file" +while IFS=' ' read link file; do + file=`printf '%s\n' "$file" | sed "s/\"/'\"'\"'/g"` + printf "-o '%s' '%s' " "$file" "$link" done)" -- cgit v1.2.3