sam
/
kunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from BachoSeven/master 

Fixed problematic characters in mpc status output
This commit is contained in:
Siddharth Dushantha 2020-08-02 21:01:37 +02:00 committed by GitHub
parent ad7d7a592d 1265c0145f
commit 1a48c25f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kunst
View File

@ -29,7 +29,7 @@ optional arguments:
--position the position where the album art should be displayed --position the position where the album art should be displayed
--music_dir the music directory which MPD plays from --music_dir the music directory which MPD plays from
--silent dont show the output --silent dont show the output
--force-online force getting cover from the internet --force-online force getting cover from the internet
--version show the version of kunst you are using --version show the version of kunst you are using
" "
} }
@ -40,7 +40,7 @@ options=$(getopt -o h --long position:,size:,music_dir:,version,force-online,sil
eval set -- "$options" eval set -- "$options"
while true; do while true; do
case "$1" in case "$1" in
--size) --size)
shift; shift;
SIZE=$1 SIZE=$1
@ -85,7 +85,7 @@ EOF
is_connected() { is_connected() {
# Check if internet is connected. We are using api.deezer.com to test # Check if internet is connected. We are using api.deezer.com to test
# if the internet is connected because if api.deezer.com is down or # if the internet is connected because if api.deezer.com is down or
# the internet is not connected this script will work as expected # the internet is not connected this script will work as expected
if ping -q -c 1 -W 1 api.deezer.com >/dev/null; then if ping -q -c 1 -W 1 api.deezer.com >/dev/null; then
connected=true connected=true
@ -108,7 +108,7 @@ get_cover_online() {
# If the current playing song ends with .mp3 or something similar, remove # If the current playing song ends with .mp3 or something similar, remove
# it before searching for the album art because including the file extension # it before searching for the album art because including the file extension
# reduces the chance of good results in the search query # reduces the chance of good results in the search query
QUERY=$(mpc current | sed 's/\.[^.]*$//') QUERY=$(mpc current | sed 's/\.[^.]*$//' | iconv -t ascii//TRANSLIT -f utf8)
# Try to get the album cover online from api.deezer.com # Try to get the album cover online from api.deezer.com
API_URL="https://api.deezer.com/search/autocomplete?q=$QUERY" && API_URL=${API_URL//' '/'%20'} API_URL="https://api.deezer.com/search/autocomplete?q=$QUERY" && API_URL=${API_URL//' '/'%20'}
@ -187,7 +187,7 @@ pre_exit() {
# exit kunst, an error will be shown # exit kunst, an error will be shown
# from kill and we dont want that # from kill and we dont want that
kill -9 "$(cat /tmp/kunst.pid)" &>/dev/null kill -9 "$(cat /tmp/kunst.pid)" &>/dev/null
} }
main() { main() {
@ -219,7 +219,7 @@ main() {
# to /tmp/kunst.png # to /tmp/kunst.png
echo "$MUSIC_NOTE" | base64 --decode > "$COVER" echo "$MUSIC_NOTE" | base64 --decode > "$COVER"
fi fi
if [ ! "$SILENT" ];then if [ ! "$SILENT" ];then
echo "kunst: swapped album art to $(mpc current)" echo "kunst: swapped album art to $(mpc current)"
printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' - printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' -
@ -230,7 +230,7 @@ main() {
# Display the album art using sxiv # Display the album art using sxiv
sxiv -g "$SIZE$POSITION" -b "$COVER" -N "Kunst" & sxiv -g "$SIZE$POSITION" -b "$COVER" -N "Kunst" &
# Save the process ID so that we can kill # Save the process ID so that we can kill
# sxiv when the user exits the script # sxiv when the user exits the script
echo $! >/tmp/kunst.pid echo $! >/tmp/kunst.pid