aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/vid6
-rwxr-xr-xscripts/videq4
-rwxr-xr-xscripts/vidrm4
-rwxr-xr-xxmonad/scripts/dmenu-vid.sh6
4 files changed, 8 insertions, 12 deletions
diff --git a/scripts/vid b/scripts/vid
index 12f6ffc8..2d9f08cc 100755
--- a/scripts/vid
+++ b/scripts/vid
@@ -2,7 +2,5 @@
set -eu
mkdir -p ~/archive/vid/
-for v in $@; do
- echo "$v" >> ~/archive/vid/history.txt
- mpv "$v" 1>/dev/null 2>/dev/null & disown
-done
+echo "$1" >> ~/archive/vid/history.txt
+nohup mpv "$1" 1>/dev/null 2>/dev/null &
diff --git a/scripts/videq b/scripts/videq
index d3ca4ae4..067875b4 100755
--- a/scripts/videq
+++ b/scripts/videq
@@ -2,6 +2,4 @@
set -eu
mkdir -p ~/archive/vid/
-for v in $@; do
- echo "$v" >> ~/archive/vid/queue.txt
-done
+echo "$1" >> ~/archive/vid/queue.txt
diff --git a/scripts/vidrm b/scripts/vidrm
index a9c1cc7c..dbdc6d49 100755
--- a/scripts/vidrm
+++ b/scripts/vidrm
@@ -6,10 +6,10 @@ DB="$HOME/archive/vid/metadata-database.txt"
LIST="$(mktemp)"
touch "$DB"
-for url in $(cat "$QUEUE"); do
+while IFS='' read -r url; do
MATCH="$(grep -F "$url" "$DB" || echo "$url")"
echo "$MATCH" >> "$LIST"
-done
+done < "$QUEUE"
file_and_stuff="$(fzf < "$LIST")"
diff --git a/xmonad/scripts/dmenu-vid.sh b/xmonad/scripts/dmenu-vid.sh
index d54cff8d..8b5ec40f 100755
--- a/xmonad/scripts/dmenu-vid.sh
+++ b/xmonad/scripts/dmenu-vid.sh
@@ -7,7 +7,7 @@ DB="$HOME/archive/vid/metadata-database.txt"
LIST="$(mktemp)"
touch "$DB"
-for url in $(cat "$QUEUE"); do
+while IFS='' read -r url; do
MATCH="$(grep -F "$url" "$DB" ||:)"
if [ -n "$MATCH" ]; then
echo "$MATCH" >> "$LIST"
@@ -15,11 +15,11 @@ for url in $(cat "$QUEUE"); do
printf '%s - %s\n' "$(youtube-dl "$url" -o '%(title)s - %(uploader)s' --get-filename)" "$url" >> "$DB" &
echo "$url" >> "$LIST"
fi
-done
+done < "$QUEUE"
file_and_stuff="$(dmenu -l 20 -p 'Media: ' < "$LIST")"
if [ -n "$file_and_stuff" ]; then
file="$(echo "$file_and_stuff" | awk -F' - ' '{print $NF}')"
- $HOME/dev/libre/dotfiles/scripts/vid "$file"
+ "$HOME/dev/libre/dotfiles/scripts/vid" "$file"
fi