diff options
| -rwxr-xr-x | cmusShow.sh | 15 | ||||
| -rwxr-xr-x | setWindowSize.sh | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cmusShow.sh b/cmusShow.sh index 4382e68..2df27a6 100755 --- a/cmusShow.sh +++ b/cmusShow.sh @@ -3,10 +3,10 @@ # Shows a notification with info about the currently playing song. scriptName="${0##*/}" -[ "$(pgrep "${scriptName}" | wc -l)" -gt "2" ] && exit 0 +[ "$(pgrep "${scriptName}" | wc -l)" -gt "2" ] && pkill "$scriptName" && exit 0 notificationFreq=0.5 -steps=10 +#steps=10 iconSize='128' bluetoothInfo='' @@ -38,7 +38,7 @@ albumIcon="$(getAlbumIcon)" # Bluetooth info -if bluetoothctl info; then +if systemctl is-active bluetooth --quiet && bluetoothctl info; then device="📻 $(bluetoothctl info | grep 'Name: ' | cut -d' ' -f '2-')" @@ -50,17 +50,18 @@ if bluetoothctl info; then fi playingIcon='' -i=0 -while [ "$i" -lt "$steps" ]; do +#i=0 +#while [ "$i" -lt "$steps" ]; do +while true; do currentlyPlayingFile="$(getCmusInfo 'file' '2')" if [ "$currentlyPlayingFile" != "$playingFile" ]; then + playingFile="$currentlyPlayingFile" albumIcon="$(getAlbumIcon)" title="🎶 $(getCmusInfo 'tag title' '3') 🎶" artist="🧑🎤 $(getCmusInfo 'tag artist' '3')" album="$(getCmusInfo 'tag album' '3') 💽" duration="$(getCmusInfo 'duration' '2')" - playingFile="$currentlyPlayingFile" fi [ "$(getCmusInfo 'status' 2)" = 'playing' ] && playingIcon='▶️' @@ -79,5 +80,5 @@ while [ "$i" -lt "$steps" ]; do "${artist} - ${album}\n${playingIcon} $(sToTime "${position}") - $(sToTime "${duration}")${bluetoothInfo}" sleep "$notificationFreq" - i=$((i+1)) + #i=$((i+1)) done diff --git a/setWindowSize.sh b/setWindowSize.sh index 76268dd..8eabd83 100755 --- a/setWindowSize.sh +++ b/setWindowSize.sh @@ -40,7 +40,9 @@ shift $((OPTIND - 1)) resolution="$(\ printf \ -'854 480 +'214 120 +427 240 +854 480 720 480 800 600 1280 720 |