diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2020-03-22 22:14:32 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2020-03-22 22:14:32 +0100 |
commit | 5be46f445ba17a92cdda17c7c51de34befff7631 (patch) | |
tree | a9790a84f52b03f1cedec8da4d57f119cb56f244 | |
parent | 6e6710a07421b6f6d220173709f31b77bd72d140 (diff) | |
download | nixos-5be46f445ba17a92cdda17c7c51de34befff7631.tar nixos-5be46f445ba17a92cdda17c7c51de34befff7631.tar.gz nixos-5be46f445ba17a92cdda17c7c51de34befff7631.tar.bz2 nixos-5be46f445ba17a92cdda17c7c51de34befff7631.tar.xz nixos-5be46f445ba17a92cdda17c7c51de34befff7631.zip |
...
-rw-r--r-- | odin/strm/download_youtube | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/odin/strm/download_youtube b/odin/strm/download_youtube index 72dcd40a..37f493a7 100644 --- a/odin/strm/download_youtube +++ b/odin/strm/download_youtube | |||
@@ -72,7 +72,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
72 | 72 | ||
73 | if [[ 'base64' == $(sed '/^Content-Transfer-Encoding: */!d; s///;q' ${message}) ]]; then | 73 | if [[ 'base64' == $(sed '/^Content-Transfer-Encoding: */!d; s///;q' ${message}) ]]; then |
74 | tmpFile=$(mktemp --tmpdir=/home/gkleen/rss/tmp .writeOut.XXXXXX) | 74 | tmpFile=$(mktemp --tmpdir=/home/gkleen/rss/tmp .writeOut.XXXXXX) |
75 | printf "Decoding base64 message content for ‘%s’" ${message} | 75 | printf "Decoding base64 message content for ‘%s’\n" ${message} |
76 | sed '/^Content-Transfer-Encoding: */d; /^$/q' ${message} >! $tmpFile | 76 | sed '/^Content-Transfer-Encoding: */d; /^$/q' ${message} >! $tmpFile |
77 | sed '1,/^$/d' ${message} | @coreutils@/bin/base64 -d >> $tmpFile | 77 | sed '1,/^$/d' ${message} | @coreutils@/bin/base64 -d >> $tmpFile |
78 | mv -v $tmpFile ${message} | 78 | mv -v $tmpFile ${message} |
@@ -80,7 +80,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
80 | 80 | ||
81 | if [[ 'quoted-printable' == $(sed '/^Content-Transfer-Encoding: */!d; s///;q' ${message}) ]]; then | 81 | if [[ 'quoted-printable' == $(sed '/^Content-Transfer-Encoding: */!d; s///;q' ${message}) ]]; then |
82 | tmpFile=$(mktemp --tmpdir=/home/gkleen/rss/tmp .writeOut.XXXXXX) | 82 | tmpFile=$(mktemp --tmpdir=/home/gkleen/rss/tmp .writeOut.XXXXXX) |
83 | printf "Decoding quoted printable message content for ‘%s’" ${message} | 83 | printf "Decoding quoted printable message content for ‘%s’\n" ${message} |
84 | sed '/^Content-Transfer-Encoding: */d; /^$/q' ${message} >! $tmpFile | 84 | sed '/^Content-Transfer-Encoding: */d; /^$/q' ${message} >! $tmpFile |
85 | sed '1,/^$/d' ${message} | @qprint@/bin/qprint -d >> $tmpFile | 85 | sed '1,/^$/d' ${message} | @qprint@/bin/qprint -d >> $tmpFile |
86 | mv -v $tmpFile ${message} | 86 | mv -v $tmpFile ${message} |
@@ -89,7 +89,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
89 | 89 | ||
90 | from=$(mungefilename $(awk '/^From/ { gsub("^\"", "", $2); print $2; exit; }' "${message}")) | 90 | from=$(mungefilename $(awk '/^From/ { gsub("^\"", "", $2); print $2; exit; }' "${message}")) |
91 | if grep -q "<p>Enclosure: <a" "${message}"; then | 91 | if grep -q "<p>Enclosure: <a" "${message}"; then |
92 | url=$(tr -d '\n' < "${message}" | sed -r 's/^.*<p>Enclosure: <a[^>]+href=[^">]*"([^"]+)".*$/\1/') | 92 | url=$(tr -dC '[:graph:][:blank:]' < "${message}" | sed -r 's/^.*<p>Enclosure: <a[^>]+href=[^">]*"([^"]+)".*$/\1/') |
93 | else | 93 | else |
94 | url=$(awk '/^X-RSS-URL/ { print $2; exit; }' "${message}") | 94 | url=$(awk '/^X-RSS-URL/ { print $2; exit; }' "${message}") |
95 | fi | 95 | fi |
@@ -207,7 +207,7 @@ printf ">>> %s <<<\n %s\n" "${msgId}" "${message}" | |||
207 | || ${extensions[(i)${filename:e}]} -gt ${#extensions} | 207 | || ${extensions[(i)${filename:e}]} -gt ${#extensions} |
208 | || ${transcodeExtractors[(i)${extractor}]} -le ${#transcodeExtractors} | 208 | || ${transcodeExtractors[(i)${extractor}]} -le ${#transcodeExtractors} |
209 | ]]; then | 209 | ]]; then |
210 | printf "Transcoding ‘%s’" ${title} | 210 | printf "Transcoding ‘%s’\n" ${title} |
211 | printf "%d %d %d/%d(%d)…\n" \ | 211 | printf "%d %d %d/%d(%d)…\n" \ |
212 | $([[ $($alwaysTranscode; print $?) -eq 0 ]]; print $?) \ | 212 | $([[ $($alwaysTranscode; print $?) -eq 0 ]]; print $?) \ |
213 | $([[ "${bare_amp}" -ne 0 ]]; print $?) \ | 213 | $([[ "${bare_amp}" -ne 0 ]]; print $?) \ |