shell/sonos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaning code

Browse Source
This commit is contained in:
Bruno21
2023-03-19 08:12:27 +01:00
parent 4b6a4de17a
commit d2be4d95f3
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
soco-cli-gui.sh
View File

@@ -1275,6 +1275,9 @@ make_playlist() {
search_artist_from_library() { search_artist_from_library() {
playing="Search artist from library and play..."
echo -e "\n${bold} $playing ${reset}\n"
echo echo
#fzf_bin=0 #fzf_bin=0
if [ $fzf_bin -eq 1 ]; then if [ $fzf_bin -eq 1 ]; then
@@ -1331,8 +1334,6 @@ search_artist_from_library() {
) )
l_alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | grep -i "$artiste" | fzf "${fzf_music_folder_args[@]}") l_alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | grep -i "$artiste" | fzf "${fzf_music_folder_args[@]}")
echo "$l_alb" # 788: Album: The Suburbs | Artist: Arcade Fire
#fi
elif [ -z "$l_alb" ]; then elif [ -z "$l_alb" ]; then
l_alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | grep -i "$artiste") l_alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | grep -i "$artiste")
@@ -1363,7 +1364,7 @@ search_artist_from_library() {
echo -e "\nAdding ${bold}$album${reset} from ${bold}$artiste${reset} to queue and playing..." echo -e "\nAdding ${bold}$album${reset} from ${bold}$artiste${reset} to queue and playing..."
w=$(sonos $loc $device queue_album "$album" first : $device play_from_queue) # ajoute en pos 1 et joue sonos $loc $device queue_album "$album" first : $device play_from_queue > /dev/null # ajoute en pos 1 et joue
_tia "$album" _tia "$album"
fi fi
@@ -1372,19 +1373,20 @@ search_artist_from_library() {
search_album_from_library() { search_album_from_library() {
playing="Search album from library and play..."
echo -e "\n${bold} $playing ${reset}\n"
if [ $fzf_bin -eq 1 ]; then if [ $fzf_bin -eq 1 ]; then
fzf_music_folder_args=( fzf_music_folder_args=(
--border --border
--exact --exact
--header="ENTER for select album; ESC for a new search" --header="ENTER for select album; ESC to quit"
) )
alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | fzf "${fzf_music_folder_args[@]}") alb=$(sonos "$loc" "$device" list_albums | tail -n+4 | fzf "${fzf_music_folder_args[@]}")
fi
elif [ -z "$alb" ]; then
if [ -z "$alb" ]; then
alb=$(sonos "$loc" "$device" list_albums | tail -n+4) alb=$(sonos "$loc" "$device" list_albums | tail -n+4)
while : while :
@@ -1418,8 +1420,6 @@ search_album_from_library() {
done done
fi fi
#sonos "$loc" "$device" queue_search_result_number $track first : $device play_from_queue > /dev/null
if [ -n "$alb" ]; then if [ -n "$alb" ]; then
artiste=$(echo "$alb" | awk -F":" '{print $4}' | awk -F"|" '{print $1}' | sed 's/^[[:blank:]]*//;s/[[:blank:]]*$//') artiste=$(echo "$alb" | awk -F":" '{print $4}' | awk -F"|" '{print $1}' | sed 's/^[[:blank:]]*//;s/[[:blank:]]*$//')
album=$(echo "$alb" | awk -F":" '{print $3}' | awk -F"|" '{print $1}' | sed 's/^[[:blank:]]*//;s/[[:blank:]]*$//') # xargs: unterminated quote album=$(echo "$alb" | awk -F":" '{print $3}' | awk -F"|" '{print $1}' | sed 's/^[[:blank:]]*//;s/[[:blank:]]*$//') # xargs: unterminated quote
@@ -1427,9 +1427,6 @@ search_album_from_library() {
echo -e "\nAdding ${bold}$album${reset} from ${bold}$artiste${reset} to queue and playing..." echo -e "\nAdding ${bold}$album${reset} from ${bold}$artiste${reset} to queue and playing..."
#list_queue
#w=$(sonos $loc $device queue_album "$album" first : $device play_from_queue) # ajoute en pos 1 et joue
sonos $loc $device queue_album "$album" first : $device play_from_queue > /dev/null # ajoute en pos 1 et joue sonos $loc $device queue_album "$album" first : $device play_from_queue > /dev/null # ajoute en pos 1 et joue
_tia "$album" _tia "$album"
fi fi
@@ -1446,10 +1443,11 @@ in_progress() {
} }
search_tracks_from_youtube() { search_tracks_from_youtube() {
playing="Search tracks from YouTube and play..."
echo -e "\n${bold} $playing ${reset}\n"
# https://stackoverflow.com/questions/49804874/download-the-best-quality-audio-file-with-youtube-dl # https://stackoverflow.com/questions/49804874/download-the-best-quality-audio-file-with-youtube-dl
# yt-dlp -f 'ba' -ciw --extract-audio --audio-quality 0 --audio-format aac -o "%(title)s.%(ext)s" -v --downloader aria2c 'https://www.youtube.com/watch?v=l0Q8z1w0KGY' # yt-dlp -f 'ba' -ciw --extract-audio --audio-quality 0 --audio-format aac -o "%(title)s.%(ext)s" -v --downloader aria2c 'https://www.youtube.com/watch?v=l0Q8z1w0KGY'
@@ -1513,7 +1511,6 @@ search_tracks_from_youtube() {
details=$(curl --silent "$APIVIDEOS?part=contentDetails&fields=items/contentDetails/duration,items/contentDetails/regionRestriction/blocked&key=$APIKEY&id=$idx" | jq -r '.items[]') details=$(curl --silent "$APIVIDEOS?part=contentDetails&fields=items/contentDetails/duration,items/contentDetails/regionRestriction/blocked&key=$APIKEY&id=$idx" | jq -r '.items[]')
duration=$(echo "$details" | jq -r '.contentDetails.duration') duration=$(echo "$details" | jq -r '.contentDetails.duration')
#duration=$(curl --silent "https://www.googleapis.com/youtube/v3/videos?part=contentDetails&fields=items/contentDetails/duration&key=$APIKEY&id=$idx" | jq -r '.items[] | .contentDetails.duration')
duration=${duration:2} duration=${duration:2}
duration=${duration//[HMS]/:} duration=${duration//[HMS]/:}
duration=${duration:0:-1} duration=${duration:0:-1}
@@ -1590,6 +1587,9 @@ search_tracks_from_youtube() {
# Search track in library -> add to queue -> play it # Search track in library -> add to queue -> play it
search_tracks_from_library() { search_tracks_from_library() {
playing="Search track from library and play..."
echo -e "\n${bold} $playing ${reset}\n"
while : while :
do do
echo echo