From 304773ead13e952de27ca8c27446f7d86aeb7edd Mon Sep 17 00:00:00 2001 From: luke bonham Date: Sat, 14 Sep 2013 00:01:00 +0200 Subject: [PATCH] mpd: cover_size option added --- scripts/mpdcover | 12 +++++------- widgets/mpd.lua | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/mpdcover b/scripts/mpdcover index 38b43e9..7ba9439 100755 --- a/scripts/mpdcover +++ b/scripts/mpdcover @@ -21,9 +21,6 @@ MUSIC_DIR=$1 # 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)$" @@ -31,7 +28,11 @@ IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$" 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" @@ -48,9 +49,6 @@ 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 diff --git a/widgets/mpd.lua b/widgets/mpd.lua index cd97b37..82db92c 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -26,13 +26,14 @@ local setmetatable = setmetatable 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 @@ -84,7 +85,8 @@ local function worker(args) 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, -- 2.39.5