repo: music
action: commit
revision: 
path_from: 
revision_from: 2076eee386ecdcb3418489bf815dcf3e60f19dbc:
path_to: 
revision_to: 
git.thebackupbox.net
music
git clone git://git.thebackupbox.net/music
commit 2076eee386ecdcb3418489bf815dcf3e60f19dbc
Author: epoch 
Date:   Mon Oct 25 23:08:04 2021 +0000

    changed the -D youtube to -d '*youtube' in a couple scripts since -D doesn't work anymore

diff --git a/music-player b/music-player
index 627a38d434d7d2a2f81c2404eef68cf0e5c1c645..
index ..741db628e038ec8f46013ccffc9f59fdcdf0a10d 100755
--- a/music-player
+++ b/music-player
@@ -4,7 +4,7 @@ if [ ! -e "${PREFIX}/run/music/player.pid" ];then
   delete_it=1
 fi
 set -o pipefail
-if printf "%s\n" "$1" | urimatch -D youtube.com -D youtu.be >/dev/null;then #urimatch is "or" matching by default.
+if printf "%s\n" "$1" | urimatch -d '*youtube.com' -d '*youtu.be' >/dev/null;then #urimatch is "or" matching by default.
   music-setnowplaying "$(urititle "$1")" & #toss this in background so it won't hold up the song playing.
   exec youtube "$1"
 fi
@@ -13,4 +13,4 @@ if printf '%s\n' "$1" | urimatch -s http -s https >/dev/null;then
 fi
 music-setnowplaying "$(music-fileinfo "$1")" &
 #printf "now playing: %s\n" "$(music-nowplaying | head -n1)" | festival --tts -b
-exec mpv $SHOW_VIDEO --no-terminal "$1" #what was the point of $SHOW_VIDEO? exec youtube up there should show videos...
+exec mpv $SHOW_VIDEO --no-cache --no-terminal "$1" #what was the point of $SHOW_VIDEO? exec youtube up there should show videos...
diff --git a/music-updateplaying b/music-updateplaying
index 7b4dace9d573d1e4f72db5f296eccf3e30578077..
index ..8d7b775462a40c89566bc911f9dd452c0624041b 100755
--- a/music-updateplaying
+++ b/music-updateplaying
@@ -1,7 +1,9 @@
 #!/bin/sh
 FILE="$(music-getplaying)"
-if printf "%s\n" "$FILE" | urimatch -D youtube.com >/dev/null;then
+if printf "%s\n" "$FILE" | urimatch -d '*youtube.com' >/dev/null;then
   music-setnowplaying "$(urititle "$FILE")" &
+elif printf "%s\n" "$FILE" | urimatch -s 'http*' >/dev/null;then
+  music-setnowplaying "restream of $FILE"
 else
   music-setnowplaying "$(music-fileinfo "$FILE")"
 fi

-----END OF PAGE-----