push macos silicon compatible impd

Author: 825i

impd

@@ -110,13 +110,14 @@ filter_tracks() {
 }
 
 preferred_languages() {
-	local pref_langs=${langs,,}
+	local pref_langs=$(echo "${langs}" | tr '[:upper:]' '[:lower:]')
 	echo "${pref_langs//,/$'\n'}"
 }
 
 guess_track_priority() {
 	# Sets some numeric weight for track. Used when sorting tracks.
-	local -r track_lang=${1,,} track_title=${2,,}
+	local -r track_lang=$(echo "${1}" | tr '[:upper:]' '[:lower:]')
+	local -r track_title=$(echo "${2}" | tr '[:upper:]' '[:lower:]')
 	local weight=0
 
 	# impd wants to use full subtitle tracks and avoid other tracks if possible.
@@ -161,7 +162,7 @@ best_track() {
 	if [[ -n $tracks ]]; then
 		while IFS=$'\t' read -r track_num track_lang track_title; do
 			printf -- '%d\t%d\n' "$track_num" "$(guess_track_priority "$track_lang" "$track_title")"
-		done <<<"$tracks" | sort --stable -g -k 2 -t $'\t' | cut -f1 | head -1
+		done <<<"$tracks" | sort -g -k 2 -t $'\t' | cut -f1 | head -1
 	fi
 }
 
@@ -241,14 +242,13 @@ fetch_episode_number() {
 	local -r file=${1:?}
 	{
 		echo 01
-		grep -Pio '\[\K\d+(?=\])' <<<"${file%.*}"
 		sed \
 			-Ee 's/(\[|\()[^])]*(\]|\))//g' \
 			-Ee 's/[0-9]{3,4}[pP]//g' \
 			-Ee 's/(19|20)[0-9]{2}//g' \
 			-Ee 's/v[.0-9-]{1,4}//g' \
 			-e 's/_/ /g' <<<"${file%.*}" |
-			grep -Pio '(?<=[＃#. pe-])[[:digit:]]{1,3}\b'
+			grep -Eio '[＃#. pe-][[:digit:]]{1,3}\b' | grep -Eo '[[:digit:]]{1,3}'
 	} | tail -1
 }
 
@@ -371,7 +371,7 @@ make_output_basename() {
 make_uncondensed() {
 	local -r input=${1:?}
 	local -r base=$(  make_output_basename "$input"  )
-	local -r job_dir=$(mktemp -d --tmpdir="$tmp_dir" -t "make_uncondensed.job-XXXX")
+	local -r job_dir=$(mktemp -d "$tmp_dir/make_uncondensed.job-XXXX")
 	local -r temp_audio=$job_dir/$base.ogg
 	local -r output=$immersionpod_dir/$current/$base.ogg
 
@@ -627,12 +627,12 @@ make_condensed() {
 	local -r video=$(  canonicalize "${1:?Video path not set.}"  ) # convert to full path
 	local -r base=$(  make_output_basename "$video"  )
 
-	local -r job_dir=$(mktemp -d --tmpdir="$tmp_dir" -t "$base.job-XXXX")
+	local -r job_dir=$(mktemp -d "$tmp_dir/$base.job-XXXX")
 
 	local -r temp_audio=$job_dir/$base.ogg
 	local -r output=$(  canonicalize "${2:-$immersionpod_dir/$current/$base.ogg}"  )
 
-	local -r chunks_dir=$(mktemp -d --tmpdir="$job_dir" -t "chunks-XXXX")
+	local -r chunks_dir=$(mktemp -d "$job_dir/chunks-XXXX")
 	local -r chunks_file=$job_dir/chunks.list
 
 	local -r subs_out=$job_dir/$base.srt
@@ -752,7 +752,7 @@ add_file() {
 
 add_remote() {
 	local -r source_url=${1:?}
-	local -r job_dir=$(mktemp -d --tmpdir="$tmp_dir" -t "download.job-XXXX")
+	local -r job_dir=$(mktemp -d "$tmp_dir/download.job-XXXX")
 	(
 		cd -- "$job_dir" && curl -L -O "$source_url"
 		for file in "$job_dir"/*; do
@@ -835,7 +835,7 @@ add() {
 
 file_can_be_added() {
 	local -r file=$1
-	grep -Pqv "$filename_skip_pattern" <<<"$file" && is_media "$file"
+	grep -Eqv "$filename_skip_pattern" <<<"$file" && is_media "$file"
 }
 
 add_stdin() {
@@ -888,7 +888,7 @@ download_yt() {
 
 add_yt() {
 	local -r source_url=${1:?}
-	local -r job_dir=$(mktemp -d --tmpdir="$tmp_dir" -t "youtube-dl.job-XXXX")
+	local -r job_dir=$(mktemp -d "$tmp_dir/youtube-dl.job-XXXX")
 
 	download_yt -o "$job_dir/%(uploader)s - %(title).60s.%(ext)s" "$source_url"
 
@@ -948,16 +948,19 @@ mkplaylist() {
 
 	find "$immersionpod_dir/$current" \
 		-type f \
-		-printf '%P\n' \
-		-regextype posix-extended \
-		-iregex '.*\.(mp3|opus|ogg|m4a|wav|wma)$' |
+		-iname '*.mp3' -o -iname '*.opus' -o -iname '*.ogg' -o -iname '*.m4a' -o -iname '*.wav' -o -iname '*.wma' |
 		shuf > "$m3u_path"
 	echo "created file '$m3u_path'"
 }
 
 grep_mpd_dir() {
 	# https://wiki.archlinux.org/index.php/Music_Player_Daemon#Configuration
-	grep -Pos 'music_directory\s*"?\K[^"]*(?="?)' -- ~/.config/mpd/mpd.conf
+	if command -v ggrep >/dev/null; then
+		ggrep -Pos 'music_directory\s*"?\K[^"]*(?="?)' -- ~/.config/mpd/mpd.conf 2>/dev/null
+	else
+		# Fallback for macOS - extract music directory path from mpd.conf
+		grep 'music_directory' ~/.config/mpd/mpd.conf 2>/dev/null | sed -E 's/.*music_directory[[:space:]]*"?([^"]*).*/\1/'
+	fi
 }
 
 choose_mpd_dir() {
@@ -966,7 +969,14 @@ choose_mpd_dir() {
 	# Otherwise, the directory is set to the value from mpd's config.
 	# Different fallbacks are tried in other cases.
 	local dir
-	for dir in "$music_dir" "$(grep_mpd_dir)" "$(xdg-user-dir MUSIC)" ~/Music ~/music; do
+	# macOS doesn't have xdg-user-dir, so we'll use ~/Music as the default
+	local music_fallback
+	if [[ "$(uname)" == "Darwin" ]]; then
+		music_fallback="$HOME/Music"
+	else
+		music_fallback="$(xdg-user-dir MUSIC 2>/dev/null || echo "$HOME/Music")"
+	fi
+	for dir in "$music_dir" "$(grep_mpd_dir)" "$music_fallback" ~/Music ~/music; do
 		dir=${dir/\~/$HOME}
 		dir=${dir//\/\//\/}
 		dir=${dir%%/}
@@ -1052,7 +1062,7 @@ version() {
 read_config_file() {
 	if [[ -f $config_filepath ]]; then
 		# shellcheck source=/dev/null
-		source -- <(grep -xP '^[a-z_]+=.+$' -- "$config_filepath")
+		source -- <(grep -x '^[a-z_]*=.*$' -- "$config_filepath")
 	fi
 }