From 84c5553f56480acbdd14ec190596cc775a7b9057 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:06:18 +0100 Subject: [PATCH 01/15] extras: Update extras/mpvc-tui --- extras/mpvc-tui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/mpvc-tui b/extras/mpvc-tui index d17c1bc5..cfae72eb 100755 --- a/extras/mpvc-tui +++ b/extras/mpvc-tui @@ -280,7 +280,7 @@ mpvctui_notify() mpvctui_notify_loop_cli() { - scrobler_cli='echo $(date +"T%H:%M") $(mpvc -f "[%status%] #%position%/%playlistlength% %length% %artist% - %title%")' + scrobler_cli='echo $(date +"T%H:%M") $(mpvc -f "[%status%] #%position%/%playlistlength% %time% %artist% - %title%")' mpvctui_notify_loop "${1:-$scrobler_cli}" | grep -v event } From 6cdd1cc63fabf4aaad0526a3a60019af2177b80d Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:49:11 +0100 Subject: [PATCH 02/15] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 449f0419..0b2092a1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # A tmp Makefile that just calls mpvc-installer for compat with mpvc-git Arch PKGBUILD (@gmt4) PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin -DOCDIR ?= $(PREFIX)/docs +DOCDIR ?= $(PREFIX)/doc INSTALLER=extras/mpvc-installer all: install: From 20925f7416cb89fadf2f9237aba7c22d36daf4b1 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Sat, 30 Dec 2023 17:21:59 +0100 Subject: [PATCH 03/15] extras: Update extras/mpvc-tui --- extras/mpvc-tui | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/mpvc-tui b/extras/mpvc-tui index cfae72eb..46798f1c 100755 --- a/extras/mpvc-tui +++ b/extras/mpvc-tui @@ -128,7 +128,7 @@ mpvctui_tips() mpvctui_watcher() { - mpvctui_header0 "${PROGNAME%%.sh}$(mpvctui_tips)" + mpvctui_header0 "${PROGNAME}$(mpvctui_tips)" mpvctui_header1 "Status" mpvc status mpvctui_header1 "Playlist" @@ -327,7 +327,7 @@ mpvctui_usage() exit; } -optflags="d:hHtTm:nN:sS:P:x" +optflags="d:hHkKtTm:nN:sS:P:x" mpvctui_main() { mpvctui_config @@ -348,6 +348,8 @@ mpvctui_main() ;; m) shift; mpvctui_mouse "$OPTARG" ;; n) shift; mpvctui_notify_loop ;; + k) shift; pkill -f "$PROGNAME -n" ;; + K) shift; pkill "$PROGNAME" ;; N) shift; mpvctui_notify_loop "$OPTARG" ;; s) shift; mpvctui_suggest ;; S) shift; mpvctui_notify_loop_cli "$OPTARG" ;; From bbf3eb57d617464d7e8a3d55838e29cb5f806632 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Tue, 23 Jan 2024 23:14:09 +0100 Subject: [PATCH 04/15] extras: Update extras/mpvc-fzf --- extras/mpvc-fzf | 124 ++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/extras/mpvc-fzf b/extras/mpvc-fzf index b37efb87..f1304bde 100755 --- a/extras/mpvc-fzf +++ b/extras/mpvc-fzf @@ -15,11 +15,11 @@ PROGURL="https://github.com/gmt4/mpvc" set -euf quiet() { "$@" > /dev/null 2>&1; } -mpvctui_warn() { echo "$@" >&2; } +mpvcfzf_warn() { echo "$@" >&2; } mpvc() { $PROGDIR/mpvc "$@"; } # Set defaults -mpvctui_defaults() +mpvcfzf_defaults() { XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-"$HOME/.config"} MPVC_CONFIG="${MPVC_CONFIG:-$XDG_CONFIG_HOME/mpvc/mpvc.conf}" @@ -28,22 +28,22 @@ mpvctui_defaults() MPVC_TERM=${MPVC_TERM:-xterm} } -mpvctui_config() +mpvcfzf_config() { - mpvctui_defaults + mpvcfzf_defaults # if present load user config if [ -r "$MPVC_CONFIG" ]; then . "$MPVC_CONFIG" fi if ! quiet command -v fzf; then - mpvctui_warn "$PROGNAME: Warning: No fzf, Install to get fuzzy media search & play support!" + mpvcfzf_warn "$PROGNAME: Warning: No fzf, Install to get fuzzy media search & play support!" sleep 1 fi } -mpvctui_fzf_help="C-x:list C-v:yt-add C-\\:add C-o:play C-t:del C-r:reload C-s:seek C-spc:toggle" -mpvctui_fzf_preview() +mpvcfzf_help="C-x:list C-v:yt-add C-\\:add C-o:play C-t:del C-r:reload C-s:seek C-spc:toggle" +mpvcfzf_preview() { # fzf keys: ctrl + [dorstxv\] fzf \ @@ -61,12 +61,12 @@ mpvctui_fzf_preview() \ --preview-window='up:5' \ --preview="mpvc" \ - --header="$PROGNAME help: $mpvctui_fzf_help" \ + --header="$PROGNAME help: $mpvcfzf_help" \ "$@" #--bind='ctrl-d:execute-silent(mpvc seek -20 &)' \ } -mpvctui_fzf_isearch() +mpvcfzf_isearch() { url_host="${url_host:-yewtu.be}" url_sort="sort=relevance" # relevance views date @@ -101,7 +101,7 @@ mpvctui_fzf_isearch() ' } -mpvctui_fzf_nextvideo() +mpvcfzf_nextvideo() { id="${1##https://yewtu.be/}" output=$(curl -fsSL -A '' "https://yewtu.be/watch?v=$id") @@ -110,12 +110,12 @@ mpvctui_fzf_nextvideo() echo "$next_url" } -mpvctui_fzf_icache_ytdlro() { mpvc getr ytdl-raw-options; } -mpvctui_fzf_icache_output() { mpvctui_fzf_icache_ytdlro | jq -r ".data.output"; } -mpvctui_fzf_icache_output_dir() { eval echo $( dirname $(mpvctui_fzf_icache_output) ); } -mpvctui_fzf_icache_archive() { mpvctui_fzf_icache_ytdlro | jq -r ".data.download-archive"; } +mpvcfzf_icache_ytdlro() { mpvc getr ytdl-raw-options; } +mpvcfzf_icache_output() { mpvcfzf_icache_ytdlro | jq -r ".data.output"; } +mpvcfzf_icache_output_dir() { eval echo $( dirname $(mpvcfzf_icache_output) ); } +mpvcfzf_icache_archive() { mpvcfzf_icache_ytdlro | jq -r ".data.download-archive"; } -mpvctui_fzf_icache() +mpvcfzf_icache() { # check for media present in local cache if [ -n "$MPVC_YTDL_ARCHIVE" -a -n "$MPVC_YTDL_OUTPUT" ]; then @@ -132,7 +132,7 @@ mpvctui_fzf_icache() ytdl_dir=$(eval echo $ytdl_dir) fi if [ ! -n "$ytdl_output" -o ! -r "$ytdl_archive" -o ! -n "$ytdl_output" ]; then - mpvctui_warn "$PROGNAME: Error cache not enabled: undefined ytdl-raw-options" + mpvcfzf_warn "$PROGNAME: Error cache not enabled: undefined ytdl-raw-options" if cat; then return; fi fi @@ -149,21 +149,21 @@ mpvctui_fzf_icache() done } -mpvctui_fzf_fetch() +mpvcfzf_fetch() { - if [ $# -lt 1 ]; then mpvctui_usage; fi + if [ $# -lt 1 ]; then mpvcfzf_usage; fi ytdl_opts="" ytdlp=$(command -v youtube-dl || command -v yt-dlp) if [ ! -x "$ytdlp" ]; then - mpvctui_warn "$PROGNAME: Warning: No yt-dlp, Install to get ytdl support!" + mpvcfzf_warn "$PROGNAME: Warning: No yt-dlp, Install to get ytdl support!" fi mpvc -q --mpv ytdl_json=$(mpvc getr ytdl-raw-options) if [ -z "$ytdl_json" ]; then - mpvctui_warn "$PROGNAME: Error ytdl-raw-options not set. Check docs/mpv.conf" + mpvcfzf_warn "$PROGNAME: Error ytdl-raw-options not set. Check docs/mpv.conf" return fi for option in $(echo "$ytdl_json" | jq -r ".data | keys | .[]") @@ -179,10 +179,10 @@ mpvctui_fzf_fetch() "$ytdlp" $ytdl_opts ${YTDL_OPTS:-} "$@" } -mpvctui_fzf_fetch_remove() +mpvcfzf_fetch_remove() { if [ -z "$1" ]; then - mpvctui_warn "$PROGNAME: Error missing ytdl-video-id to remove" + mpvcfzf_warn "$PROGNAME: Error missing ytdl-video-id to remove" return fi ytdl_id="$1" @@ -195,7 +195,7 @@ mpvctui_fzf_fetch_remove() ytdl_dir=$(eval echo $ytdl_dir) if [ -z "$ytdl_json" -o ! -r "$ytdl_archive" -o ! -n "$ytdl_output" ]; then - mpvctui_warn "$PROGNAME: Error cache not enabled: undefined ytdl-raw-options" + mpvcfzf_warn "$PROGNAME: Error cache not enabled: undefined ytdl-raw-options" return fi @@ -203,36 +203,36 @@ mpvctui_fzf_fetch_remove() sed -i "/$ytdl_id/ s|^|#|" "$ytdl_archive" } -mpvctui_fzf_iplay() +mpvcfzf_iplay() { - mpvctui_fzf_isearch "$1" | - mpvctui_fzf_preview --prompt="(youtube) " | + mpvcfzf_isearch "$1" | + mpvcfzf_preview --prompt="(youtube) " | awk '{print $1}' } -mpvctui_fzf_local() +mpvcfzf_local() { find . -type f,d | sort | - mpvctui_fzf_preview --prompt="(local) " | + mpvcfzf_preview --prompt="(local) " | mpvc load } -mpvctui_fzf_playlist() +mpvcfzf_playlist() { len=$(mpvc gets playlist-count) ( if [ -z "$len" ]; then echo; else mpvc fullplaylist; fi) | - mpvctui_fzf_preview --prompt="(playlist) " + mpvcfzf_preview --prompt="(playlist) " } -mpvctui_fzf_chapterlist() +mpvcfzf_chapterlist() { len=$(mpvc gets chapter-list/count) ( if [ -z "$len" ]; then echo; else mpvc chapter-list-full; fi) | - mpvctui_fzf_preview --prompt="(chapter) " \ + mpvcfzf_preview --prompt="(chapter) " \ --bind='ctrl-o:execute-silent(mpvc set chapter {n} &)' } -mpvctui_fzf_ddg() +mpvcfzf_ddg() { curl -fsSL -A 'Mozilla/5.0' "https://duckduckgo.com/html?q=$*&iax=videos&ia=videos" | awk ' @@ -261,30 +261,30 @@ mpvctui_fzf_ddg() }' } -mpvctui_fzf_urlbrowse() +mpvcfzf_urlbrowse() { url=${1:-https://localhost:8443/ytdl-archive/} curl -k -fsSL "$url" | awk '/.*<\/a>/ { h=$0;sub("^.*href=\"","",h);sub("\".*$","",h);print h }' | - mpvctui_fzf_preview | + mpvcfzf_preview | awk -v url="$url" '{ print url$0 }' } -mpvctui_ddg_play() +mpvcfzf_ddg_play() { - mpvctui_fzf_ddg "$@" | - mpvctui_fzf_preview | + mpvcfzf_ddg "$@" | + mpvcfzf_preview | awk '{print $1}' | mpvc load } -mpvctui_version() +mpvcfzf_version() { echo "usage: $PROGNAME -[$optflags] args # @version $PROGVERSION (c) $PROGAUTHOR $PROGURL" } optflags="01b:cCd:DfFg:G:hn:s:p:P:o:Or:lxv" -mpvctui_usage() +mpvcfzf_usage() { echo "usage: $PROGNAME -[$optflags] args # @version $PROGVERSION (c) $PROGAUTHOR $PROGURL" echo " -b : Browse the provided ytdl-archive URL with fzf (fzf*)" @@ -304,36 +304,36 @@ mpvctui_usage() main() { - mpvctui_config - if [ $# -lt 1 ]; then mpvctui_usage; fi + mpvcfzf_config + if [ $# -lt 1 ]; then mpvcfzf_usage; fi while getopts "$optflags" flag; do case "$flag" in 0) shift; awk '{print $NF}';; 1) shift; awk '{print $1}';; - b) mpvctui_fzf_urlbrowse "$OPTARG" ;; - c) mpvctui_fzf_chapterlist ;; - C) shift; mpvctui_fzf_icache;; + b) mpvcfzf_urlbrowse "$OPTARG" ;; + c) mpvcfzf_chapterlist ;; + C) shift; mpvcfzf_icache;; d) MPVC_DIR="$OPTARG"; cd "$MPVC_DIR" || return;; - D) shift; mpvctui_ddg_play "$@";; - #D) shift; mpvctui_fzf_ddg "$@";; - f) mpvctui_fzf_playlist ;; - F) shift; mpvctui_fzf_preview "$@" ;; - g) mpvctui_fzf_fetch "$OPTARG";; - G) mpvctui_fzf_fetch $(mpvctui_fzf_iplay "$OPTARG");; - h) mpvctui_usage ;; - l) mpvctui_fzf_local;; - n) mpvctui_fzf_nextvideo "$OPTARG" ;; - o) mpvctui_fzf_isearch "$OPTARG" | awk 'NR==2 {print}' ;; - O) mpvctui_fzf_icache_output ;; - r) mpvctui_fzf_fetch_remove "$OPTARG" ;; - p) mpvctui_fzf_iplay "$OPTARG" | mpvc load ;; - P) mpvctui_fzf_iplay "$OPTARG" | mpvc loadc ;; - s) mpvctui_fzf_isearch "$OPTARG";; + D) shift; mpvcfzf_ddg_play "$@";; + #D) shift; mpvcfzf_ddg "$@";; + f) mpvcfzf_playlist ;; + F) shift; mpvcfzf_preview "$@" ;; + g) mpvcfzf_fetch "$OPTARG";; + G) mpvcfzf_fetch $(mpvcfzf_iplay "$OPTARG");; + h) mpvcfzf_usage ;; + l) mpvcfzf_local;; + n) mpvcfzf_nextvideo "$OPTARG" ;; + o) mpvcfzf_isearch "$OPTARG" | awk 'NR==2 {print}' ;; + O) mpvcfzf_icache_output ;; + r) mpvcfzf_fetch_remove "$OPTARG" ;; + p) mpvcfzf_iplay "$OPTARG" | mpvc load ;; + P) mpvcfzf_iplay "$OPTARG" | mpvc loadc ;; + s) mpvcfzf_isearch "$OPTARG";; x) shift; if quiet command -v $MPVC_TERM; then $MPVC_TERM -e "$0" "$@"; fi; exit;; - v) mpvctui_version;; - *) mpvctui_usage;; + v) mpvcfzf_version;; + *) mpvcfzf_usage;; esac done } From f0cd2c4209d7cb00be6729eeeb3de35a8089bf48 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:52:55 +0100 Subject: [PATCH 05/15] docs: Update docs/now/index.html --- docs/now/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/now/index.html b/docs/now/index.html index 7e2f278c..6d15d24c 100644 --- a/docs/now/index.html +++ b/docs/now/index.html @@ -12,11 +12,11 @@ - + - + - + From 2b0c900e7514c86a0fae5863f7cc0b629bfc36a6 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:27:28 +0100 Subject: [PATCH 06/15] docs: Update docs/now/index.html --- docs/now/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/now/index.html b/docs/now/index.html index 6d15d24c..fef83647 100644 --- a/docs/now/index.html +++ b/docs/now/index.html @@ -7,7 +7,7 @@ - gmt4.github.io/mpvc + gmt4.github.io/mpvc/now listening 🚀 From e00956c4fb295a4fa320183b6c85a19fc6f44acb Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:02:49 +0100 Subject: [PATCH 07/15] mpvc: Update mpvc --- mpvc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mpvc b/mpvc index fdf1abf4..45a83231 100755 --- a/mpvc +++ b/mpvc @@ -890,7 +890,8 @@ mpvc_handle_socket() { mpvc_validate_socket() { # validate deps quiet command -v "$MPVC_MPV" || die 4 "$PROGNAME: Error: No mpv found. Install to continue." - quiet command -v "$MPVC_SOCAT" || quiet command -v nc || die 4 "$PROGNAME: Error: No socat/nc found. Install one" + quiet command -v "$MPVC_SOCAT" || quiet command -v nc || die 4 "$PROGNAME: Error: No socat found. Install to continue." + mpvc_sockcmd '{ "command": [ "get_property_string ", "idle-active" ] }' || die 4 "$PROGNAME: Error: $MPVC_SOCAT not working. Install socat to continue." # test if socket exists if [ ! -S "$MPVC_SOCKET" ]; then die 2 "$PROGNAME: Error: Socket ${MPVC_SOCKET##$HOME/} does not exist. Use mpvc --mpv to start one."; fi # test if socket is open From 02658d9f3a16191ce1860ed17ad8d5e6d7edd1d4 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Fri, 26 Jan 2024 18:11:09 +0100 Subject: [PATCH 08/15] mpvc: Update mpvc --- mpvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpvc b/mpvc index 45a83231..7650b5ca 100755 --- a/mpvc +++ b/mpvc @@ -891,7 +891,7 @@ mpvc_validate_socket() { # validate deps quiet command -v "$MPVC_MPV" || die 4 "$PROGNAME: Error: No mpv found. Install to continue." quiet command -v "$MPVC_SOCAT" || quiet command -v nc || die 4 "$PROGNAME: Error: No socat found. Install to continue." - mpvc_sockcmd '{ "command": [ "get_property_string ", "idle-active" ] }' || die 4 "$PROGNAME: Error: $MPVC_SOCAT not working. Install socat to continue." + mpvc_sockcmd '{ "command": [ "get_property_string", "idle-active" ] }' || die 4 "$PROGNAME: Error: $MPVC_SOCAT not working. Install socat to continue." # test if socket exists if [ ! -S "$MPVC_SOCKET" ]; then die 2 "$PROGNAME: Error: Socket ${MPVC_SOCKET##$HOME/} does not exist. Use mpvc --mpv to start one."; fi # test if socket is open From e5976c7ddd11dc2091f1878221d80cfc7136f9ca Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Sat, 27 Jan 2024 07:28:15 +0100 Subject: [PATCH 09/15] mpvc: Update mpvc --- mpvc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/mpvc b/mpvc index 7650b5ca..d808baf3 100755 --- a/mpvc +++ b/mpvc @@ -889,13 +889,25 @@ mpvc_handle_socket() { mpvc_validate_socket() { # validate deps - quiet command -v "$MPVC_MPV" || die 4 "$PROGNAME: Error: No mpv found. Install to continue." - quiet command -v "$MPVC_SOCAT" || quiet command -v nc || die 4 "$PROGNAME: Error: No socat found. Install to continue." - mpvc_sockcmd '{ "command": [ "get_property_string", "idle-active" ] }' || die 4 "$PROGNAME: Error: $MPVC_SOCAT not working. Install socat to continue." + if ! quiet command -v "$MPVC_MPV"; then + die 4 "$PROGNAME: Error: No mpv found. Install to continue." + fi + if ! quiet command -v "$MPVC_SOCAT" && ! quiet command -v nc; then + die 4 "$PROGNAME: Error: No socat found. Install to continue." + fi + # test if socket exists - if [ ! -S "$MPVC_SOCKET" ]; then die 2 "$PROGNAME: Error: Socket ${MPVC_SOCKET##$HOME/} does not exist. Use mpvc --mpv to start one."; fi + if [ ! -S "$MPVC_SOCKET" ]; then + die 2 "$PROGNAME: Error: Socket ${MPVC_SOCKET##$HOME/} does not exist. Use mpvc --mpv to start one." + fi # test if socket is open - if [ "$(mpvc_get pause)" = "" ]; then die 3 "$PROGNAME: Error: No files added to ${MPVC_SOCKET##$HOME/}."; fi + if [ "$(mpvc_get pause)" = "" ]; then + die 3 "$PROGNAME: Error: No files added to ${MPVC_SOCKET##$HOME/}."; + fi + # test if socat works on socket + if ! mpvc_sockcmd '{ "command": [ "get_property_string", "idle-active" ] }'; then + die 4 "$PROGNAME: Error: $MPVC_SOCAT failed. Install socat to continue." + fi } mpvc_get_version() { From 8e2774345f39678107da7fa0e67cf68e7ed97ba4 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Tue, 30 Jan 2024 22:01:47 +0100 Subject: [PATCH 10/15] mpvc: Update mpvc --- mpvc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mpvc b/mpvc index d808baf3..33da6908 100755 --- a/mpvc +++ b/mpvc @@ -234,7 +234,7 @@ mpvc_curl_cache_metadata_json() { result="$(mpvc_curl_cache_json "$filename")" ;; *) # otherwise, assume its a local file - result="{ \"title\":${filename##*/}, }"; + result="{ \"title\":${filename##*/}, }" ;; esac printf "$result\n" @@ -256,16 +256,16 @@ mpvc_socklist() { for f in $(find "$MPVC_CONFIG_DIR" -type s); do idle=$(MPVC_SOCKET=$f mpvc_get idle-active) if [ -z "$idle" ]; then - echo "$f: active=no"; + echo "$f: active=no" else - echo "$f: active=yes idle=$idle"; + echo "$f: active=yes idle=$idle" fi - done; + done } mpvc_cmdr_() { - command=$(for i in "$@"; do printf "$q$i$q, "; done); - echo "{ \"command\": [ $command ] }"; + command=$(for i in "$@"; do printf "$q$i$q, "; done) + echo "{ \"command\": [ $command ] }" } mpvc_cmdr() { equiet mpvc_sockcmd_ "$(q='"' mpvc_cmdr_ "$@")"; } mpvc_ecmdr() { @@ -668,7 +668,7 @@ mpvc_nocolor() mpvc_search() { if [ $# -lt 2 ]; then return; fi mode=$1; shift; - mpvc_nocolor mpvc_get_playlist "$mode" | awk '/'"$*"'/ { print $0 }'; + mpvc_nocolor mpvc_get_playlist "$mode" | awk '/'"$*"'/ { print $0 }' } mpvc_search_play() { @@ -902,7 +902,7 @@ mpvc_validate_socket() { fi # test if socket is open if [ "$(mpvc_get pause)" = "" ]; then - die 3 "$PROGNAME: Error: No files added to ${MPVC_SOCKET##$HOME/}."; + die 3 "$PROGNAME: Error: No files added to ${MPVC_SOCKET##$HOME/}." fi # test if socat works on socket if ! mpvc_sockcmd '{ "command": [ "get_property_string", "idle-active" ] }'; then @@ -1095,4 +1095,4 @@ main() { quietcheck mpvc_print_status_final } -quietcheck main "$@"; +quietcheck main "$@" From bf2d1c88cd99222c0b890cac689f703b9d7eb904 Mon Sep 17 00:00:00 2001 From: gmt4 <791491+gmt4@users.noreply.github.com> Date: Wed, 31 Jan 2024 08:57:39 +0100 Subject: [PATCH 11/15] docs: Update docs/now/index.html --- docs/now/index.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/now/index.html b/docs/now/index.html index fef83647..6798c079 100644 --- a/docs/now/index.html +++ b/docs/now/index.html @@ -77,20 +77,22 @@

Scrobbling Code