]> git.madduck.net Git - etc/awesome.git/blobdiff - scripts/mpdcover

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

readme typo
[etc/awesome.git] / scripts / mpdcover
index 7ba9439e6184f5488f9838cf5b2c653eaccc9b06..a611666c925725da100676c5cce67a65d95b0e8d 100755 (executable)
@@ -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-------------------------------------------------------
 
@@ -22,7 +22,7 @@ MUSIC_DIR=$1
 file=$2
 
 # Regex expression used for image search
 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"
 
 # Path of temporary resized cover
 TEMP_PATH="/tmp/mpdcover.png"
@@ -34,8 +34,8 @@ if [ $COVER_RESIZE == "x" ]; then
     COVER_RESIZE="100x100"
 fi
 
     COVER_RESIZE="100x100"
 fi
 
-# Thumbnail background (transparent)
-COVER_BACKGROUND="none"
+# The default cover to use (optional)
+DEFAULT_ART=$4
 
 #--------------------------------------------------------------------
 
 
 #--------------------------------------------------------------------
 
@@ -49,10 +49,13 @@ art="$MUSIC_DIR/${file%/*}"
 # cover.
 cover="$(find "$art/" -maxdepth 1 -type f | egrep -i -m1 "$IMG_REG")"
 
 # 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
 # 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 "$TEMP_PATH"
         cover="$TEMP_PATH"
    fi
 else
         cover="$TEMP_PATH"
    fi
 else