From 2f80ab93e984985ac8cc92bcfe1b51697d026c7c Mon Sep 17 00:00:00 2001 From: luke bonham Date: Wed, 18 Sep 2013 00:27:46 +0200 Subject: [PATCH] mpd: default art added --- scripts/mpdcover | 10 ++++++++-- widgets/mpd.lua | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/scripts/mpdcover b/scripts/mpdcover index 7ba9439..f9f6577 100755 --- a/scripts/mpdcover +++ b/scripts/mpdcover @@ -11,7 +11,7 @@ # # Dependencies: imagemagick. # -# Usage: mpdcover +# Usage: mpdcover # 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,6 +52,9 @@ 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 3ebc761..41233cd 100644 --- a/widgets/mpd.lua +++ b/widgets/mpd.lua @@ -26,14 +26,15 @@ 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 cover_size = args.cover_size or 100 - 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 default_art = args.default_art or "" + local settings = args.settings or function() end local mpdcover = helpers.scripts_dir .. "mpdcover" local mpdh = "telnet://" .. host .. ":" .. port @@ -85,8 +86,8 @@ local function worker(args) then helpers.set_map("current mpd track", mpd_now.title) - os.execute(string.format("%s %q %q %d", mpdcover, music_dir, - mpd_now.file, cover_size)) + os.execute(string.format("%s %q %q %d %q", mpdcover, music_dir, + mpd_now.file, cover_size, default_art)) mpd.id = naughty.notify({ preset = mpd_notification_preset, -- 2.39.5