Merge pull request #221 from sudo-nice/master

[etc/awesome.git] / scripts / mpdcover

diff --git a/scripts/mpdcover b/scripts/mpdcover
index 38b43e9da54bd754493f0c6d7ec59fc251ccf822..6f9062c697cfc72275053e13e74006a345ec8e64 100755 (executable)
--- a/scripts/mpdcover
+++ b/scripts/mpdcover
@@ -2,7 +2,7 @@
 #
 # A simple cover fetcher script for current playing song on mpd.
 #
 #
 # 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
 #
 # Adapted for Lain internal use.
 # https://github.com/copycat-killer/lain


@@ -11,7 +11,7 @@
 #
 # Dependencies: imagemagick.
 #
 #
 # Dependencies: imagemagick.
 #

-# Usage: mpdcover <music_directory> <song_file> <default_art>
+# Usage: mpdcover <music_directory> <song_file> <cover_resize> <default_art>

 
 # Configuration-------------------------------------------------------
 
 
 # Configuration-------------------------------------------------------
 


@@ -21,17 +21,21 @@ MUSIC_DIR=$1
 # Song file
 file=$2
 
 # Song file
 file=$2
 

-# The default cover to use (optional)
-DEFAULT_ART=$3
-

 # Regex expression used for image search
 # 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"
 
 # Resize cover
 
 # Path of temporary resized cover
 TEMP_PATH="/tmp/mpdcover.png"
 
 # Resize cover

-COVER_RESIZE="100x100"
+COVER_RESIZE="$3x$3"
+
+if [ $COVER_RESIZE == "x" ]; then
+    COVER_RESIZE="100x100"
+fi
+
+# The default cover to use (optional)
+DEFAULT_ART=$4

 
 # Thumbnail background (transparent)
 COVER_BACKGROUND="none"
 
 # Thumbnail background (transparent)
 COVER_BACKGROUND="none"


@@ -54,7 +58,7 @@ cover="${cover:=$DEFAULT_ART}"
 # check if art is available
 if [[ -n $cover ]]; then
    if [[ -n $COVER_RESIZE ]]; then
 # 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
         cover="$TEMP_PATH"
    fi
 else