repo: music
action: commit
revision: 
path_from: 
revision_from: 143a1d35b98ba7aba00953f42c1f044021811779:
path_to: 
revision_to: 
git.thebackupbox.net
music
git clone git://git.thebackupbox.net/music
commit 143a1d35b98ba7aba00953f42c1f044021811779
Author: epoch 
Date:   Mon Nov 7 15:04:13 2022 -0600

    music-init now transfers playlist in background, uses music-find, and gives a bit more helpful messages

diff --git a/music-init b/music-init
index 8c779f9dddc02b61509aaed557877f73a8c2c492..
index ..1cf53659208f6f01e464a84e3c1cb79021c4491b 100755
--- a/music-init
+++ b/music-init
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+dir="${1:-"/home/epoch/Music"}"
 set -o pipefail
 export SHOW_VIDEO=--no-video
 music_init_pid="${PREFIX}/run/music/init.pid"
@@ -6,19 +7,19 @@ mkdir -p ${PREFIX}/run/music
 music-stop
 touch $music_init_pid
 mkdir -p ${PREFIX}/cache/music
-while [ -f $music_init_pid ];do
+while [ -f "${music_init_pid}" ];do
   if [ -f "${music_init_pid}" ];then
     #pid file exists...
     if [ "$(ps -h -o cmd -p $(cat ${PREFIX}/run/music/init.pid ))" = "qargs music-player" ];then
-      printf "already running.\n"
+      printf "already running. not going to try to run.\n"
       echo pid: "$(cat ${PREFIX}/run/music/init.pid)"
       echo cmd: "$(ps -h -o cmd -p $(cat ${PREFIX}/var/run/music/init.pid))"
       exit 1
     fi
-    printf "stale pid file: %s\n" "${music_init_pid}"
+    printf "stale pid file: %s deleting and running anyway.\n" "${music_init_pid}"
     rm "${music_init_pid}"
   fi
-  find -H ~/Music/ | grep -v '\.unwanted' | egrep -i '\.m4a$|\.mp3$|\.flac|\.ogg$' | shuf > "${PREFIX}/cache/music/playlist"
-  scp ${PREFIX}/cache/music/playlist logserver:~/public_html/incoming/playlist
+  music-find "${dir}" | shuf > "${PREFIX}/cache/music/playlist"
+  scp "${PREFIX}/cache/music/playlist" logserver:~/public_html/incoming/playlist & #this can happen in background safely.
   music-playlist < ${PREFIX}/cache/music/playlist
 done

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