From 62e3d3f5e5ac653ddb9f31ef5264f6beedebfb8c Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Mon, 14 Mar 2022 22:38:19 +0100
Subject: [PATCH] Scripts: Update play queue to use the --input-ipc-server
 option

---
 .local/bin/play | 38 ++++++++++++++++++--------------------
 packages        |  1 +
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.local/bin/play b/.local/bin/play
index df86cfa..7d839d1 100755
--- a/.local/bin/play
+++ b/.local/bin/play
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-PIPE="$XDG_CACHE_HOME/mpv/umpv_fifo"
+# Depends: socat
+
+SOCK="/tmp/umpv-fifo"
 
 help() {
 	B=$(tput bold)
@@ -35,10 +37,10 @@ ${B}OPTIONS${N}
 EOF
 }
 
-CLIP="$(xclip -se c -o)"
+CLIP="$(xclip -selection clipboard -out)"
 
 play() {
-	MPV="mpv --ytdl-raw-options=external-downloader=aria2c"
+	MPV="mpv --ytdl-raw-options=add-metadata=,external-downloader=aria2c"
 	if [ -z "$1" ]; then
 		MPV="$MPV $CLIP"
 		# Cut off everything after space
@@ -59,22 +61,21 @@ play() {
 shuffle() {
 	# Skip first argument
 	shift 1
-	mpv --no-video --shuffle \
-		--ytdl-format='bestaudio[ext=m4a]' \
-		--ytdl-raw-options='external-downloader=aria2c' \
-		"${@:-$CLIP}"
+	setsid -f mpv --no-video --shuffle \
+		   --ytdl-format='bestaudio[ext=m4a]' \
+		   "${@:-$CLIP}"
 }
 
 queue() {
-	OPTIONS="--no-terminal --force-window --input-file=$PIPE --ytdl-raw-options=external-downloader=aria2c"
+	OPTIONS="--no-terminal --force-window --input-ipc-server=$SOCK --"
 
 	# Create mpv cache directory
-	DIR="$(dirname "$PIPE")"
+	DIR="$(dirname "$SOCK")"
 	[ ! -d "$DIR" ] && mkdir -p "$DIR"
 
-	# Delete named pipe if no umpv is running
+	# Delete socket if no umpv is running
 	if ! pgrep -f "mpv $OPTIONS" > /dev/null; then
-		rm -f "$PIPE"
+		rm -f "$SOCK"
 	fi
 
 	# Skip first argument
@@ -82,19 +83,16 @@ queue() {
 	# Set url to argument if provided, clipboard otherwise
 	URLS="${*:-$CLIP}"
 
-	if [ -p "$PIPE" ]; then
+	if [ -S "$SOCK" ]; then
 		notify-send -t 2500 "Added video to queue.."
 		# Add video to named pipe
-		echo "$URLS" \
-			| awk -v RS=' ' '{ print "raw loadfile "$1" append" }' > "$PIPE"
+		echo "$URLS" | awk -v RS=' ' '{ print "raw loadfile "$1" append" }' \
+			| socat UNIX-CONNECT:"$SOCK" -
 	else
-		# Create named pipe
-		mkfifo "$PIPE"
-
 		# Play video
-		play "$OPTIONS" "$URLS"
-
-		rm -f "$PIPE"
+		notify-send -t 2500 "Loading video: $URLS"
+		# shellcheck disable=2086
+		setsid -f mpv $OPTIONS $URLS
 	fi
 }
 
diff --git a/packages b/packages
index 9ba5961..aca8506 100644
--- a/packages
+++ b/packages
@@ -158,6 +158,7 @@ rtmpdump
 rxvt-unicode
 signal-desktop
 smartmontools
+socat
 sqlitebrowser
 sshfs
 stalonetray