modified bin/mpvplay

1 files changed, 10 insertions, 5 deletions

diff --git a/ar/.local/bin/mpvplay b/ar/.local/bin/mpvplay
index 967f47f..b375f62 100755
--- a/ar/.local/bin/mpvplay
+++ b/ar/.local/bin/mpvplay
@@ -36,8 +36,9 @@ tmp_playlist() {
   [ -d "$playlistdir" ] || mkdir -p "$playlistdir"
   tmplist="$playlistdir/tmplist.m3u"
   [ -f "$tmplist" ] && rm -rf "$tmplist"
-  find "$1" -maxdepth 1 -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) \
-    -exec echo {} \; >>"$tmplist"
+  find "$1" -maxdepth 1 \
+    -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) |
+    sort >>"$tmplist"
   play_playlist "$tmplist"
   rm -rf "$tmplist"
 }
@@ -50,7 +51,9 @@ list_and_play() {
     search_term=$(echo | dmenu -i -p "File names:")
     [ -z "$search_term" ] && echo "Invalid search term \"$search_term\"" && exit
     notify-send "🔎 Finding videos named with '$search_term'.."
-    files=$(find "$dir" -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) -iname "*$search_term*" | sort)
+    files=$(find "$dir" \
+      -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) \
+      -iname "*$search_term*" | sort)
     [ -z "$files" ] && echo "No files named with \"$search_term\"." && exit
     tmpplaylist=$(mktemp /tmp/mpv_playlist_XXXXXX.m3u)
     echo "$files" | while read -r file; do
@@ -60,8 +63,10 @@ list_and_play() {
     rm -rf "$tmpplaylist"
     ;;
   "List files")
-    files_with_paths=$(find "$dir" -mindepth 1 -maxdepth 1 -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) | sort)
-    SELECTED_FILE=$(printf "All files\n%s" "$files_with_paths" | sed 's!.*/!!' | dmenu -i -l 21 -p "Select a file:")
+    files_with_paths=$(find "$dir" -mindepth 1 -maxdepth 1 \
+      -type f \( -iname "*.mp4" -o -iname "*.mkv" -o -iname "*.mov" -o -iname "*.flv" -o -iname "*.wmv" -o -iname "*.webm" -o -iname "*.mpeg" -o -iname "*.mpg" -o -iname "*.avi" -o -iname "*.ts" -o -iname "*.3gp" -o -iname "*.rmvb" \) |
+      sort)
+    SELECTED_FILE=$(printf "All files\n%s" "$files_with_paths" | sed 's|.*/||' | dmenu -i -l 21 -p "Select a file:")
     [ -z "$SELECTED_FILE" ] && echo "No file selected." && exit
     [ "$SELECTED_FILE" = "All files" ] && tmp_playlist "$dir" && return
     FULL_PATH="$(echo "$files_with_paths" | grep -F "$SELECTED_FILE")"