From 242b4e712e848d5cf8220010596584805b12e652 Mon Sep 17 00:00:00 2001
From: Suleyman Farajli <suleyman@farajli.net>
Date: Thu, 19 Jun 2025 01:11:38 +0400
Subject: fix(sxiv): improve key-handler script with better error handling and
 usability

- Add set -f to disable globbing
- Fix dmenu directory selection prompt to allow root selection
- Add unique suffix when trash filename exists to avoid overwrite
- Use safer command substitutions with output capture for error reporting
- Reorder commands for clarity and reliability
- Restore and improve wallpaper setting with error messages
- Use xclip with full path and relative path copying feedback
- Add comments about deprecated `convert` usage, suggest `magick`
---
 config/sxiv/exec/key-handler | 79 ++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 32 deletions(-)

(limited to 'config/sxiv/exec/key-handler')

diff --git a/config/sxiv/exec/key-handler b/config/sxiv/exec/key-handler
index 50202fc..e90cbb1 100755
--- a/config/sxiv/exec/key-handler
+++ b/config/sxiv/exec/key-handler
@@ -1,76 +1,91 @@
 #!/bin/sh
 
 # For theme to be applied ~/.Xresource file must be present
-picdir="${HOME}/pics"
+set -f
 
 while read -r file; do
 	case "$1" in
 	"m")
+		# FIXME: Providing directory selections to dmenu limits choices;
+		# e.g., if `/home/user/pics` is given, `/` can't be selected.
+
 		if [ -z "${destdir}" ]; then
-			destdir="$(echo "${picdir}" \
-			| dmenu -p "Move directory: " \
+			destdir="$(printf '' \
+			| dmenu -c -bw 2 -p "Copy directory: " \
 			| sed "s|~|${HOME}|g")"
 		fi
 
+		# Skip non-directories to prevent overwriting files during loop processing
 		if [ ! -d "${destdir}" ]; then
-			nsend -s "Not a directory"
+			nsend -s "Failed to move" "Not a directory: ${destdir}"
 			exit 1
 		fi
 
-		if mv "${file}" "${destdir}"; then
-			nsend -s "${file} moved to ${destdir}" &
+		if output=$(mv -- "${file}" "${destdir}" 2>&1); then
+			nsend -s "Moved" "${file} to ${destdir}" &
 		else
-			nsend -s "Failed to move ${file} to ${destdir}"
+			nsend -s "Failed to Move" "$output" &
 		fi
 	;;
 	"c")
-
-		if [ -z "${destdir}" ];then
-			destdir="$(echo "${picdir}" \
-			| dmenu -p "Copy directory: " \
+		if [ -z "${destdir}" ]; then
+			destdir="$(printf '' \
+			| dmenu -c -bw 2 -p "Copy directory: " \
 			| sed "s|~|${HOME}|g")"
 		fi
 
 		if [ ! -d "${destdir}" ]; then
-			nsend -s "Not a directory" &
+			nsend -s "Failed to copy" "Not a directory: ${destdir}"
 			exit 1
 		fi
 
-		if cp "${file}" "${destdir}"; then
-			nsend -s "${file} copied to ${destdir}" &
+		if output=$(cp -- "${file}" "${destdir}" 2>&1); then
+			nsend -s "Copied" "${file} to ${destdir}" &
 		else
-			nsend -s "Failed to copy ${file} to ${destdir}" &
+			nsend -s "Failed to copy" "$output" &
 		fi
 	;;
-	"w")
-		swall -d "$file" && nsend -s "Wallpaper ${file}" \
-		|| nsend -s "Couldn't set wallpaper"
-	;;
 	"d")
-		mkdir -p ~/.trash
+		mkdir -p "${HOME}/.trash"
+		trash_path="$HOME/.trash/$(basename -- "${file}")"
+		if [ -e "${trash_path}" ]; then
+			rand=$(od -An -N2 -tu2 /dev/urandom | tr -d ' ')
+			trash_path="${trash_path}_$(date +%Y%m%d%H%M%S)_${rand}"
+		fi
 
-		if mv "$file" ~/.trash; then
-			nsend -s "$file is moved to ~/.trash" &
+		if output=$(mv -- "${file}" "${trash_path}" 2>&1); then
+			nsend -s "Deleted" "${file} to ${trash_path}" &
 		else
-			nsend -s "Failed to move ${file} to ~/.trash" &
+			nsend -s "Failed to delete" "$output" &
 		fi
+
 	;;
-	"r") convert -rotate 90 "$file" "$file" ;;
-	"R") convert -rotate -90 "$file" "$file" ;;
-	"f") convert -flop "$file" "$file" ;;
 	"y")
 		if printf "%s" "${file}" | xclip -selection clipboard; then
-			nsend -s "Copied to clipboard" &
+			nsend -s "Relative path copied to clipboard." &
 		else
-			nsend -s "Failed to copy to clipboard" &
+			nsend -s "Failed to copy relative path to clipboard." &
 		fi
 	;;
 	"Y")
-		if readlink -f "$file" | tr -d '\n' | xclip -selection clipboard; then
-			nsend -s "Copied to clipboard" &
+		if readlink -f "${file}" | tr -d '\n' | xclip -selection clipboard; then
+			nsend -s "Full path copied to clipboard." &
+		else
+			nsend -s "Failed to copy full path to clipboard." &
+		fi
+	;;
+	"w")
+
+		if output=$(swall -d "${file}" 2>&1); then
+			nsend -s "Set as wallpaper" "${file}" &
 		else
-			nsend -s "Failed to copy to clipboard" &
+			nsend -s "Failed to set as wallpaper" "$output" &
 		fi
 	;;
-		esac
+	# No need for nsend since whether the photo has rotated or not is obvious
+	# FIXME: convert is depricated use magick instead
+	"r") convert -rotate 90 "${file}" "${file}" ;;
+	"R") convert -rotate -90 "${file}" "${file}" ;;
+	"f") convert -flop "${file}" "${file}" ;;
+	esac
 done
-- 
cgit v1.2.3