i.ortega
/
wlvfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dash -> sh; corrected some warnings

This commit is contained in:
i.ortega 2020-05-08 16:59:57 +02:00
parent e4a433886a
commit a273e9220c
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/channel-videos-after.sh
View File

@ -6,7 +6,7 @@ scripts_folder=$(dirname "$(readlink -f "$0")")
[ -n "$3" ] && dateafter="--dateafter $3"
dash "$scripts_folder/no-response-timeout.sh" -f 128 -r 10 \
sh "$scripts_folder/no-response-timeout.sh" -f 128 -r 10 \
youtube-dl --get-id "$channel" $dateafter 2>/dev/null |
while read -r line && [ "$line" != "$last_watched_video" ]; do
echo "$line"

4
scripts/play-videos-from-file.sh
View File

@ -1,13 +1,13 @@
#!/usr/bin/env sh
[ -z "$1" -o ! -f "$1" ] && exit 1
[ -z "$1" ] || [ ! -f "$1" ] && exit 1
length="$(wc -l "$1" | awk '{print $1}')"
current_video=0
while [ "$length" -ne $current_video ]
do
current_video="$(( $current_video + 1 ))"
current_video=$(( current_video + 1 ))
video="$(sed "$current_video q;d" "$1")"

36
wlvfs
View File

@ -57,7 +57,7 @@ fi
# Preprocessing
grep -vE '^#' "$subs_file" | while read line; do
grep -vE '^#' "$subs_file" | while read -r line; do
channel=$(echo "$line" | awk '{print $1}')
last_video=$(echo "$line" | awk '{print $2}')
update_date=$(echo "$line" | awk '{print $3}')
@ -89,10 +89,10 @@ fi
new_last_video="-"
new_update_date="-"
else
new_update_date=$(dash "$scripts_folder/video-upload-date.sh" \
new_update_date=$(sh "$scripts_folder/video-upload-date.sh" \
"$new_last_video")
while [ -z "$new_update_date" ]; do
new_update_date=$(dash \
new_update_date=$(sh \
"$scripts_folder/video-upload-date.sh" \
"$new_last_video")
done
@ -107,10 +107,10 @@ fi
"https://invidio.us/channel/$channel" 2>/dev/null \
| head -n 1)
[ -z "$new_last_video" ] && new_last_video="-"
new_update_date=$(dash "$scripts_folder/video-upload-date.sh" \
new_update_date=$(sh "$scripts_folder/video-upload-date.sh" \
"$new_last_video")
while [ -z "$new_update_date" ]; do
new_update_date=$(dash \
new_update_date=$(sh \
"$scripts_folder/video-upload-date.sh" \
"$new_last_video")
done
@ -118,10 +118,10 @@ fi
new_prev_upload_frequency=0
new_manual_preference=0
else
new_update_date=$(dash "$scripts_folder/video-upload-date.sh" \
new_update_date=$(sh "$scripts_folder/video-upload-date.sh" \
"$new_last_video")
while [ -z "$new_update_date" ]; do
new_update_date=$(dash \
new_update_date=$(sh \
"$scripts_folder/video-upload-date.sh" \
"$new_last_video")
done
@ -162,11 +162,11 @@ fi
if [ -z "$preserve_oldvideos" ]; then
rm "$videos_file" 2> /dev/null
else
(dash "$scripts_folder/play-videos-from-file.sh" "$videos_file" &&
(sh "$scripts_folder/play-videos-from-file.sh" "$videos_file" &&
rm "$videos_file") &
fi
grep -vE '^#' "$subs_file" | sort -rg -k 6 -k 5 -k 4 | while read line; do
grep -vE '^#' "$subs_file" | sort -rg -k 6 -k 5 -k 4 | while read -r line; do
channel=$(echo "$line" | awk '{print $1}')
last_video=$(echo "$line" | awk '{print $2}')
update_date=$(echo "$line" | awk '{print $3}')
@ -181,23 +181,23 @@ fi
dateafter="$update_date"
[ "$update_date" = "-" ] && dateafter=""
dash "$scripts_folder/channel-videos-after.sh" \
sh "$scripts_folder/channel-videos-after.sh" \
"https://youtube.com/channel/$channel" "$last_video" "$dateafter" |
tee "$temp" |
while read video; do
while read -r video; do
printf "\tFound video: %s\n" "$video"
if [ ! -f "$videos_file" ]; then
echo "ytdl://$video" >> $videos_file
echo "ytdl://$video" >> "$videos_file"
if [ -z "$play_at_the_end" ]; then
(dash "$scripts_folder/play-videos-from-file.sh" "$videos_file"&&
(sh "$scripts_folder/play-videos-from-file.sh" "$videos_file"&&
rm "$videos_file") &
fi
else
echo "ytdl://$video" >> $videos_file
echo "ytdl://$video" >> "$videos_file"
{
sleep 5
[ ! -f "$videos_file" ] && echo "ytdl://$video" >> \
$videos_file
"$videos_file"
} &
fi
done
@ -207,12 +207,12 @@ fi
new_upload_frequency="$upload_frequency"
new_update_date="$update_date"
else
new_update_date=$(dash "$scripts_folder/video-upload-date.sh" "$new_last_video")
new_update_date=$(sh "$scripts_folder/video-upload-date.sh" "$new_last_video")
while [ -z "$new_update_date" ]; do
new_update_date=$(dash "$scripts_folder/video-upload-date.sh" "$new_last_video")
new_update_date=$(sh "$scripts_folder/video-upload-date.sh" "$new_last_video")
done
new_upload_frequency=$(( $(wc -l "$temp" | \
awk '{print $1}') + $upload_frequency ))
awk '{print $1}') + upload_frequency ))
fi
if [ -z "$already_updated" ] &&