From a948d7b6c869088552fc0e51b897077228cae4e3 Mon Sep 17 00:00:00 2001 From: 825i <58630825+825i@users.noreply.github.com> Date: Sat, 21 Jun 2025 19:25:00 +1000 Subject: [PATCH 1/3] push macos silicon compatible impd --- impd | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/impd b/impd index bf14e95..27ee35c 100755 --- a/impd +++ b/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 } @@ -243,14 +244,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 } @@ -373,7 +373,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 @@ -629,12 +629,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 @@ -754,7 +754,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 @@ -837,7 +837,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() { @@ -890,7 +890,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" @@ -950,16 +950,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 } find_xdg_music_dir() { @@ -1063,7 +1066,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 } From f024d958cf89f37f5c1da4ff3045d54d7d28b4b6 Mon Sep 17 00:00:00 2001 From: Ren Tatsumoto Date: Sun, 22 Jun 2025 15:24:25 +0300 Subject: [PATCH 2/3] use ggrep on macos handle missing xdg-user-dir --- impd | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/impd b/impd index 27ee35c..f04ee39 100755 --- a/impd +++ b/impd @@ -240,6 +240,14 @@ fetch_title() { echo "$title" } +_grep() { + if command -v ggrep >/dev/null 2>&1; then + ggrep "$@" + else + grep "$@" + fi +} + fetch_episode_number() { local -r file=${1:?} { @@ -421,7 +429,7 @@ find_external_subtitles() { if [[ -z $dir ]] || [[ ! -d $dir ]]; then echo "Error: video directory '$dir' is invalid." >&2 - exit 1 + return 1 fi find "$dir" \ @@ -957,11 +965,15 @@ mkplaylist() { grep_mpd_dir() { # https://wiki.archlinux.org/index.php/Music_Player_Daemon#Configuration - if command -v ggrep >/dev/null; then - ggrep -Pos 'music_directory\s*"?\K[^"]*(?="?)' -- ~/.config/mpd/mpd.conf 2>/dev/null + _grep -Pos 'music_directory\s*"?\K[^"]*(?="?)' -- ~/.config/mpd/mpd.conf 2>/dev/null +} + +find_xdg_music_dir() { + # macOS doesn't have xdg-user-dir, so we'll use ~/Music as the default + if command -v xdg-user-dir >/dev/null 2>&1; then + xdg-user-dir MUSIC 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/' + echo "$HOME/Music" fi } @@ -1090,7 +1102,16 @@ ensure_dirs() { "$tmp_dir" } +check_macos_grep() { + # if running macOS, ggrep must be installed to support Perl-compatible regular expressions. + if [[ "$(uname)" == "Darwin" ]] && ! command -v ggrep >/dev/null 2>&1; then + echo "ggrep is not installed. install it with brew." >&2 + exit 1 + fi +} + main() { + check_macos_grep # Load configuration file, then apply settings omitted in the config file. read_config_file From ebae1aa2036ccdd1e6d687a481e1abba32ba5256 Mon Sep 17 00:00:00 2001 From: Ren Tatsumoto Date: Sun, 17 Aug 2025 16:10:32 +0300 Subject: [PATCH 3/3] replace grep calls --- impd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/impd b/impd index f04ee39..5eadcaa 100755 --- a/impd +++ b/impd @@ -258,7 +258,7 @@ fetch_episode_number() { -Ee 's/(19|20)[0-9]{2}//g' \ -Ee 's/v[.0-9-]{1,4}//g' \ -e 's/_/ /g' <<<"${file%.*}" | - grep -Eio '[＃#. pe-][[:digit:]]{1,3}\b' | grep -Eo '[[:digit:]]{1,3}' + _grep -Eio '[＃#. pe-][[:digit:]]{1,3}\b' | _grep -Eo '[[:digit:]]{1,3}' } | tail -1 } @@ -438,7 +438,7 @@ find_external_subtitles() { -regextype posix-extended \ -iregex '.*\.(ass|srt)$' \ -print0 | - grep -Fiz --max-count=1 "$video" | + _grep -Fiz --max-count=1 "$video" | tr '\0' '\n' # fix no newline at the end } @@ -845,7 +845,7 @@ add() { file_can_be_added() { local -r file=$1 - grep -Eqv "$filename_skip_pattern" <<<"$file" && is_media "$file" + _grep -Eqv "$filename_skip_pattern" <<<"$file" && is_media "$file" } add_stdin() { @@ -1078,7 +1078,7 @@ version() { read_config_file() { if [[ -f $config_filepath ]]; then # shellcheck source=/dev/null - source -- <(grep -x '^[a-z_]*=.*$' -- "$config_filepath") + source -- <(_grep -xP '^[a-z_]*=.*$' -- "$config_filepath") fi }