Add play next

src/play-next.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+source "${BASH_SOURCE%/*}/play-shared-functions.sh"
+source "${BASH_SOURCE%/*}/play-shared-functionality.sh"
+source "${BASH_SOURCE%/*}/play-shared-functionality-mutexed.sh"
+
+killExternalPlayerIfRunning

src/play-shared-functionality.sh

@@ -26,3 +26,6 @@ sharedDaemonPidFile="$sharedDefaultDaemonPidFile"
 
 readonly sharedDefaultPlayerPidFile="${sharedConfigFolder}/.playerpidfile~"
 sharedPlayerPidFile="$sharedDefaultPlayerPidFile"
+
+readonly sharedDefaultExternalPlayerPidFile="${sharedConfigFolder}/.externalplayerpidfile~"
+sharedExternalPlayerPidFile="$sharedDefaultExternalPlayerPidFile"

src/play-shared-functions.sh

@@ -81,8 +81,36 @@ playOrder() {
 	fi
 }
 
+cleanupExternalPlayer() {
+	if [[ -e "$sharedExternalPlayerPidFile" ]];
+	then
+		rm "$sharedExternalPlayerPidFile"
+	fi
+}
+
+killExternalPlayer() {
+	if [[ -s "$sharedExternalPlayerPidFile" ]];
+	then
+		killPidFromFile "$sharedExternalPlayerPidFile"
+	fi
+}
+
+killExternalPlayerIfRunning() {
+	isValidPidFile "$sharedExternalPlayerPidFile" && isPidRunningFromFile "$sharedExternalPlayerPidFile" && killExternalPlayer
+	cleanupExternalPlayer
+}
+
 playSound() {
-	afplay "$@"
+	# TODO: use dynamic index?
+	local index=999
+	exitIfAlreadyRunning "$sharedExternalPlayerPidFile" "externalplayer"
+	afplay "$@" &
+	local externalplayerPid="$!"
+	savePidAtIndexButDeleteOnExit "$index" "externalplayer" "$externalplayerPid" "$sharedExternalPlayerPidFile"
+	wait "$externalplayerPid" &>/dev/null
+	killExternalPlayerIfRunning
+	cleanupExternalPlayer
+	clearPidAtIndex "$index"
 }
 
 highlight() {
@@ -127,19 +155,19 @@ exitIfAlreadyRunning() {
 # 	return 0
 # }
 
-savePidButDeleteOnExit() {
-	local name="$1"
-	local pid="$2"
-	local pidFile="$3"
+savePidAtIndexButDeleteOnExit() {
+	local index="$1"
+	local name="$2"
+	local pid="$3"
+	local pidFile="$4"
 	[[ -e "$pidFile" ]] && die "${pid} tried to save ${pidFile} but it already exists and contains $(cat "${pidFile}")"
 	debug "creating ${name} ${pid} ${pidFile}"
 	echo -n "$pid" >"$pidFile"
 	debug "created ${name} ${pid} ${pidFile} ($(cat "${pidFile}"))"
 
-	local index="${#pidFilesCreatedByThisInstance[@]}"
 	pidFilesCreatedByThisInstance[index]="$pidFile"
 	pidsCreatedByThisInstance[index]="$pid"
-	pidMessagesCreatedByThisInstance+=("(${name} $pid $pidFile)")
+	pidMessagesCreatedByThisInstance[index]="(${name} $pid $pidFile)"
 	debug "${#pidFilesCreatedByThisInstance[@]} pidFilesCreatedByThisInstance: ${pidFilesCreatedByThisInstance[@]}"
 	debug "${#pidsCreatedByThisInstance[@]} pidsCreatedByThisInstance: ${pidsCreatedByThisInstance[@]}"
 	debug "${#pidMessagesCreatedByThisInstance[@]} pidMessagesCreatedByThisInstance: ${pidMessagesCreatedByThisInstance[@]}"
@@ -148,6 +176,25 @@ savePidButDeleteOnExit() {
 	return 0
 }
 
+clearPidAtIndex() {
+	local index="$1"
+
+	unset pidFilesCreatedByThisInstance[index]
+	unset pidsCreatedByThisInstance[index]
+	unset pidMessagesCreatedByThisInstance[index]
+	debug "${#pidFilesCreatedByThisInstance[@]} pidFilesCreatedByThisInstance: ${pidFilesCreatedByThisInstance[@]}"
+	debug "${#pidsCreatedByThisInstance[@]} pidsCreatedByThisInstance: ${pidsCreatedByThisInstance[@]}"
+	debug "${#pidMessagesCreatedByThisInstance[@]} pidMessagesCreatedByThisInstance: ${pidMessagesCreatedByThisInstance[@]}"
+
+	# echo "$index"
+	return 0
+}
+
+savePidButDeleteOnExit() {
+	local index="${#pidFilesCreatedByThisInstance[@]}"
+	savePidAtIndexButDeleteOnExit "$index" "$1" "$2" "$3"
+}
+
 killPid() {
 	local pid="$1"
 
@@ -171,6 +218,18 @@ killPidChildren() {
 	debug "killed '${pid}' children '${children[@]}'"
 }
 
+isPidRunning() {
+	local pid="$1"
+	local psInfo=$(ps -o pid= -p "${pid}" | awk '{ print $1 }')
+
+	if (( psInfo == pid ));
+	then
+		return 0
+	else
+		return 1
+	fi
+}
+
 pidFromFile() {
 	local pidFile="$1"
 
@@ -183,6 +242,33 @@ pidFromFile() {
 	fi
 }
 
+isValidPidFile() {
+	local pidFile="$1"
+
+	if [[ -s "$pidFile" ]];
+	then
+		local pid=$(pidFromFile "$pidFile")
+
+		if (( pid > 0 ));
+		then
+			return 0
+		else
+			return 1
+		fi
+	else
+		return 2
+	fi
+}
+
+isPidRunningFromFile() {
+	local pidFile="$1"
+	local pid=$(pidFromFile "$pidFile")
+
+	[[ -z "${pid}" ]] && die "could not get the pid to check if it's running."
+
+	isPidRunning "$pid"
+}
+
 killPidFromFile() {
 	local pidFile="$1"
 	local pid=$(pidFromFile "$pidFile")

src/play-start.sh

@@ -4,12 +4,8 @@ set -e
 source "${BASH_SOURCE%/*}/play-shared-functions.sh"
 source "${BASH_SOURCE%/*}/play-shared-functionality.sh"
 
-if [[ "$1" == "--wait" ]];
-then
-	shift
-	thisInstanceIsAChild="${thisInstanceIsAChild:-0}"
-	thisInstanceIsAChild="$(( thisInstanceIsAChild + 1 ))"
-fi
+thisInstanceIsAChild="${thisInstanceIsAChild:-0}"
+thisInstanceIsAChild="$(( thisInstanceIsAChild + 1 ))"
 
 exitIfAlreadyRunning "$sharedPlayerPidFile" "player"
 savePidButDeleteOnExit "player" "$$" "$sharedPlayerPidFile"