#126 calendar: local scrp fix

[etc/awesome.git] / scripts / mpdcover

diff --git a/scripts/mpdcover b/scripts/mpdcover
index 7ba9439e6184f5488f9838cf5b2c653eaccc9b06..6f9062c697cfc72275053e13e74006a345ec8e64 100755 (executable)
--- a/scripts/mpdcover
+++ b/scripts/mpdcover
@@ -2,7 +2,7 @@
 #
 # A simple cover fetcher script for current playing song on mpd.
 #
-# Author : Wolfgang Mueller
+# Original author: Wolfgang Mueller
 #
 # Adapted for Lain internal use.
 # https://github.com/copycat-killer/lain
@@ -11,7 +11,7 @@
 #
 # Dependencies: imagemagick.
 #
-# Usage: mpdcover <music_directory> <song_file> <default_art>
+# Usage: mpdcover <music_directory> <song_file> <cover_resize> <default_art>
 
 # Configuration-------------------------------------------------------
 
@@ -22,7 +22,7 @@ MUSIC_DIR=$1
 file=$2
 
 # Regex expression used for image search
-IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$"
+IMG_REG="(Front|front|Cover|cover|Art|art|Folder|folder)\.(jpg|jpeg|png|gif)$"
 
 # Path of temporary resized cover
 TEMP_PATH="/tmp/mpdcover.png"
@@ -34,6 +34,9 @@ if [ $COVER_RESIZE == "x" ]; then
     COVER_RESIZE="100x100"
 fi
 
+# The default cover to use (optional)
+DEFAULT_ART=$4
+
 # Thumbnail background (transparent)
 COVER_BACKGROUND="none"
 
@@ -49,10 +52,13 @@ art="$MUSIC_DIR/${file%/*}"
 # cover.
 cover="$(find "$art/" -maxdepth 1 -type f | egrep -i -m1 "$IMG_REG")"
 
+# when no cover is found, use DEFAULT_ART as cover
+cover="${cover:=$DEFAULT_ART}"
+
 # check if art is available
 if [[ -n $cover ]]; then
    if [[ -n $COVER_RESIZE ]]; then
-        convert "$cover" -thumbnail $COVER_RESIZE -gravity center -background "$COVER_BACKGROUND" -extent $COVER_RESIZE "$TEMP_PATH"
+        convert "$cover" -scale $COVER_RESIZE -gravity "center" -background "$COVER_BACKGROUND" "$TEMP_PATH"
         cover="$TEMP_PATH"
    fi
 else