Nettoyage configuration vim

.i3blocks/mpd

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Fonction de réinitialisation en cas de perte de la connexion
 self-reset() {
@@ -14,7 +14,7 @@ coproc nc -U /home/breizh/.mpd/socket
 IN=${COPROC[1]}
 OUT=${COPROC[0]}
 #echo "password xxx" >&${IN}
-#sed '/^OK$/q' <&$OUT &>/dev/null 
+sed '/^OK/q' <&$OUT &>/dev/null 
 
 # Initialisation des valeurs par défaut et des fonctions
 declare -i SCROLL=50 I=0
@@ -58,12 +58,14 @@ do
 	case $BLOCK_BUTTON in
 		1|3) [[ "${o["state"]}" == stop ]] \
 			&& echo "play" >&${IN} \
-			&& sed '/^OK$/q' <&$OUT &>/dev/null ;;&
+			&& sed '/^OK$/q' <&$OUT &>/dev/null \
+			|| self-reset ;;&
 		2) [[ "${o["state"]}" == stop ]] \
 			&& echo "play" >&${IN} \
-			|| echo "pause" >&${IN} ;;&
-		1) echo "previous" >&${IN} ;;&
-		3) echo "next" >&${IN} ;;&
+			|| echo "pause" >&${IN} \
+			|| self-reset ;;&
+		1) echo "previous" >&${IN} || self-reset ;;&
+		3) echo "next" >&${IN} || self-reset ;;&
 		1|2|3) sed '/^OK$/q' <&$OUT &>/dev/null ;;
 	esac
 	
@@ -72,7 +74,7 @@ do
 	declare -A o
 	
 	# Récupération de l’état
-	echo "status" >&$IN
+	echo "status" >&$IN || self-reset
 	while read -t 1 -u $OUT output
 	do
 		[[ "$output" == "OK" ]] && break
@@ -80,7 +82,7 @@ do
 	done
 	
 	# Récupération des informations du morceau en cours
-	echo "currentsong" >&$IN
+	echo "currentsong" >&$IN || self-reset
 	while read -t 1 -u $OUT output
 	do
 		[[ "$output" == "OK" ]] && break
@@ -102,7 +104,7 @@ do
 		unset bloc1 bloc2 bloc3 bloc4
 		artist="${o["Artist"]:-${o["Name"]}}"
 		song="${o["Title"]}"
-		[[ -z "$artist$song" ]] && song="${o["file"]}"
+		[[ -z "$artist$song" ]] && song="$(basename "${o["file"]}")"
 
 		if [[ "$(( ${#song} + ${#artist} + 1 ))" -gt "$SCROLL" ]]
 		then
@@ -159,4 +161,4 @@ do
 	# DEBUG
 	printf '<b>%s</b>%s<b>%s</b>%s%s\n' "$bloc1" "$bloc2" "$bloc3" "$bloc4" " $status$time</span>"
 done
-
+done