mpd: cover_size option added

diff --git a/scripts/mpdcover b/scripts/mpdcover
index 38b43e9da54bd754493f0c6d7ec59fc251ccf822..7ba9439e6184f5488f9838cf5b2c653eaccc9b06 100755 (executable)
--- a/scripts/mpdcover
+++ b/scripts/mpdcover
@@ -21,9 +21,6 @@ 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
 IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$"
 
 # Regex expression used for image search
 IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$"
 


@@ -31,7 +28,11 @@ IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$"
 TEMP_PATH="/tmp/mpdcover.png"
 
 # Resize cover
 TEMP_PATH="/tmp/mpdcover.png"
 
 # Resize cover

-COVER_RESIZE="100x100"
+COVER_RESIZE="$3x$3"
+
+if [ $COVER_RESIZE == "x" ]; then
+    COVER_RESIZE="100x100"
+fi

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


@@ -48,9 +49,6 @@ 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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index cd97b37cb5fee86377b85d2bca9e218ecbddbdc2..82db92c60a5074b9b1fccd8e59aaa9f718cd40f5 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -26,13 +26,14 @@ local setmetatable = setmetatable
 local mpd = {}
 
 local function worker(args)
 local mpd = {}
 
 local function worker(args)

-    local args      = args or {}
-    local timeout   = args.timeout or 2
-    local password  = args.password or ""
-    local host      = args.host or "127.0.0.1"
-    local port      = args.port or "6600"
-    local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
-    local settings  = args.settings or function() end
+    local args       = args or {}
+    local timeout    = args.timeout or 2
+    local password   = args.password or ""
+    local host       = args.host or "127.0.0.1"
+    local port       = args.port or "6600"
+    local music_dir  = args.music_dir or os.getenv("HOME") .. "/Music"
+    local cover_size = args.cover_size or 100
+    local settings   = args.settings or function() end

 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port


@@ -84,7 +85,8 @@ local function worker(args)
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 
             then
                 helpers.set_map("current mpd track", mpd_now.title)
 

-                os.execute(string.format("%s %q %q", mpdcover, music_dir, mpd_now.file))
+                os.execute(string.format("%s %q %q %d", mpdcover, music_dir,
+                           mpd_now.file, cover_size))

 
                 mpd.id = naughty.notify({
                     preset = mpd_notification_preset,
 
                 mpd.id = naughty.notify({
                     preset = mpd_notification_preset,