improve scripts

etc/ssh/sshrc

@@ -1 +0,0 @@
-/home/default/syncthing/default/scripts/login-notify

home/default/.config/sway/config

@@ -43,10 +43,8 @@ exec_always {
 
 # timeout
 exec swayidle -w \
-    timeout 300 'playerctl -a pause' \
+    timeout 300 'playerctl -a pause && swaylock' \
-    timeout 300 'swaylock' \
     timeout 600 'swaymsg "output * dpms off"' \
-    timeout 15 'if pgrep -x swaylock; then swaymsg "output * dpms off"; fi' \
     before-sleep 'playerctl -a pause' \
     lock 'swaylock' \
     resume 'swaymsg "output * dpms on"'

home/default/scripts/generate-playlists

@@ -1,8 +1,64 @@
 #!/usr/bin/env sh
 set -ou pipefail
 
-for dir in */; do
+# Generates playlists for all mp3 and flac files in a directory, ignoring itself in the "parent" folder
-	name=`echo "$dir" | sed 's/\/$//g'`
+
-	(cd $dir && ls | grep -v -E '\.txt|\.m3u' > "$name.m3u")
+PLAYLIST_FOLDER="/home/default/Music/playlists/mpd"     # Playlist folder for mpd
+PREFIX="music/playlists"                                # relative links to add to playlists, based on mpd virtual file structure
+EXTENSIONS=("mp3" "opus" "flac" "m4a" "mkv" "webm")
+
+# Disable nullglob and set pattern matching to fix spaces
+shopt -s nullglob
+SAVEIFS=$IFS
+IFS=$(echo -en "\n\b")
+
+cd $PLAYLIST_FOLDER || { echo "Could not cd into PLAYLIST_FOLDER"; exit 1; }
+parent=`basename $PWD`
+
+# Delete old generated playlists
+if [[ -f "*.gen.m3u" ]]; then
+    rm *.gen.m3u
+fi
+if [[ -f ".trackNames" ]]; then
+    rm .trackNames
+fi
+
+# For all playlist directories to generate
+for playlistDir in ../*; do
+    if [[ -d "$playlistDir" ]] && [[ "$playlistDir" != "../$parent" ]]; then
+	# playlist filename needed for mpd
+    playlist=`echo "$playlistDir" | sed "s/^\.\.\///g"`
+	# escaped version of filename needed for bash
+    escaped=`printf '%q\n' "$playlist"`
+
+    # echo "playlist=$playlist"
+    # echo "escaped=$escaped"  
+
+	# touch file
+    > "$playlist.gen.m3u"
+        
+	# write all files with newlines
+    > .track-names
+
+    for EXT in ${EXTENSIONS[@]}; do
+        # echo `find "../$playlist" -mindepth 1 -type f -name "*.$EXT" -printf x | wc -c`
+        if [[ `find "../$playlist" -mindepth 1 -type f -name "*.$EXT" -printf x | wc -c` != 0 ]]; then
+            ls -1 ../$escaped/*.$EXT >> .track-names 2> /dev/null
+            # echo `ls -1 ../$playlist/*.$EXT >> 2> /dev/null`
+        fi
     done
    
+    # echo `cat .track-names` 
+    cat .track-names | while IFS="" read -r song || [ -n "$song" ] ; do
+        unprefixed=`echo "$song" | sed "s/^\.\.\///g"`
+        # echo "$PREFIX/$unprefixed"
+        echo "$PREFIX/$unprefixed" >> "$playlist.gen.m3u"
+    done < .track-names
+    
+    if [[ -f ".track-names" ]]; then
+        rm .track-names
+    fi
+fi
+done
+
+IFS=$SAVEIFS

home/default/scripts/prune-free-space

@@ -1,8 +1,6 @@
 #!/usr/bin/env sh
 set -eoux pipefail
 
-rm -rf ~/.cache
-sudo rm -rf /var/cache/pacman/pkg/*
 yay -Sc --noconfirm
 sudo pacman -Sc --noconfirm
 sudo journalctl --vacuum-size=1G

home/default/scripts/standardize-music

@@ -1,15 +1,17 @@
 #!/usr/bin/env sh
 set -oux pipefail
 
-count=`ls -1 *.OGG 2>/dev/null | wc -l`
+# removes more modern codecs to just files that can fit on my mp3 player
+
+count=`ls -1 *.M4A 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
-  rename OGG ogg *.OGG
+  rename M4A m4a *.M4A
 fi
   
-count=`ls -1 *.ogg 2>/dev/null | wc -l`
+count=`ls -1 *.m4a 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
-    for i in *.ogg; do
+    for i in *.m4a; do
-        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
     done
 fi
 
@@ -21,7 +23,7 @@ fi
 count=`ls -1 *.webm 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
     for i in *.webm; do
-        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
     done
 fi
 
@@ -33,7 +35,7 @@ fi
 count=`ls -1 *.opus 2>/dev/null | wc -l`
 if [ $count != 0 ]; then
     for i in *.opus; do
-        ffmpeg -y -i "$i" "${i%.*}.m4a" -map_metadata 0:s:a:0 && rm "$i"
+        ffmpeg -y -i "$i" "${i%.*}.ogg" && rm "$i"
     done
 fi
 

home/default/scripts/sync-car

@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-set -eou pipefail
-
-sudo mkdir -p /run/media/default/
-if [[ ! -d /run/media/default/MUSIC ]]; then
-	echo "mounting /run/media/default/MUSIC"
-	sudo mkdir /run/media/default/MUSIC
-	sudo mount -U E6F8-C183 /run/media/default/MUSIC 
-fi
-
-echo "syncing music..."
-sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/MUSIC/
-
-cd /run/media/default/MUSIC
-sudo generate-playlists
-cd /home/default
-
-echo "unmounting /run/media/default/MUSIC"
-sudo umount /run/media/default/MUSIC
-sudo rmdir /run/media/default/MUSIC

home/default/scripts/sync-mp3-player

@@ -1,18 +1,14 @@
 #!/usr/bin/env sh
 set -eou pipefail
 
-if [[ ! -d /run/media/default/MUSIC ]]; then
+if [[ ! -d /run/media/default/Music ]]; then
 	echo "mounting /run/media/default/MUSIC"
 	sudo mkdir /run/media/default/MUSIC
 	sudo mount -U DB09-89C3 /run/media/default/MUSIC 
 fi
 
 echo "syncing music..."
-sudo rsync --info=progress2 -W -r --delete ~/Music/* /run/media/default/MUSIC/
+sudo rsync --info=progress2 -W -r --delete ~/Music/albums ~/Music/mixes ~/Music/playlists/* /run/media/default/MUSIC/
-
-cd /run/media/default/MUSIC
-sudo generate-playlists
-cd /home/default
 
 echo "unmounting /run/media/default/MUSIC"
 sudo umount /run/media/default/MUSIC

home/default/scripts/system-download

@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-set -eou pipefail
-
-system-update-mirrors
-pacman -Syuw --noconfirm

home/default/scripts/system-update

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -eoux pipefail
-
-system-prune-space
-yay --noconfirm -Syu --overwrite \*
-system-prune-space