commit 27a7020

merge njetcat function into tosocket, as theyre used simultaneously every time anyway

 1@@ -6,10 +6,9 @@ playlist=$home/usr/ampv-playlist
 2 tmpfile=`{mktemp}
 3 
 4 fn player {mpv '--input-ipc-server='$socket $*}
 5-fn njetcat {nc -UN $socket}
 6-fn tosocket {printf '{ "command": '$*' }\n'}
 7+fn tosocket {printf '{ "command": '$*' }\n' | nc -UN $socket}
 8 fn getfilepath {tosocket '[ "get_property", "path" ]' | \
 9-			njetcat | awk -F '"' '{print $4}'
10+	awk -F '"' '{print $4}'
11 }
12 
13 switch($1) {
14@@ -24,22 +23,22 @@ switch($1) {
15 		songfile=`{getfilepath}
16 		rm -rf $"songfile
17 	case -i
18-		tosocket '[ "get_property", "filtered-metadata" ]' | njetcat | \
19+		tosocket '[ "get_property", "filtered-metadata" ]' | \
20 			sed -e 's/{"data":{//' \
21 				-e 's/"},"request_id":0,"error":"success"}//' \
22 				-e 's/_/ /g' -e 's/":/: /g' -e 's/,"/\n/g' -e 's/"//g'
23 	case -n
24-		tosocket '[ "playlist-next" ]' | njetcat
25+		tosocket '[ "playlist-next" ]'
26 	case -p
27-		tosocket '[ "cycle pause" ]' | njetcat
28+		tosocket '[ "cycle pause" ]'
29 	case -P
30-		tosocket '[ "playlist-prev" ]' | njetcat
31+		tosocket '[ "playlist-prev" ]'
32 	case -s
33-		tosocket '[ "playlist-shuffle" ]' | njetcat
34+		tosocket '[ "playlist-shuffle" ]'
35 	case -S
36 		player --idle &
37 	case -g
38-		tosocket '[ "quit" ]' | njetcat
39+		tosocket '[ "quit" ]'
40 		shift
41 		if (~ $#* 0) {
42 			find $musicdir -type f -name *.opus > /tmp/.music
43@@ -48,7 +47,7 @@ switch($1) {
44 		if not music=$*
45 		player --no-audio-display $music
46 	case -u
47-		tosocket '[ "playlist-unshuffle" ]' | njetcat
48+		tosocket '[ "playlist-unshuffle" ]'
49 	case *
50 		printf 'Usage: ampv -a|-d|-D|-i|-n|-p|-P|-s|-S|-g|-u\n'
51 		exit 1