]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

mpd: default art added
authorluke bonham <dadasignificanulla@gmail.com>
Tue, 17 Sep 2013 22:27:46 +0000 (00:27 +0200)
committerluke bonham <dadasignificanulla@gmail.com>
Tue, 17 Sep 2013 22:27:46 +0000 (00:27 +0200)
scripts/mpdcover
widgets/mpd.lua

index 7ba9439e6184f5488f9838cf5b2c653eaccc9b06..f9f6577e712e7741234732409f3ef156d9da2daf 100755 (executable)
@@ -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,6 +34,9 @@ if [ $COVER_RESIZE == "x" ]; then
     COVER_RESIZE="100x100"
 fi
 
     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"
 
@@ -49,6 +52,9 @@ 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
index 3ebc76152affd338e0041cec415ce1a7b9af2b33..41233cd39256e17125d4f67595f1f38972a2ce8a 100644 (file)
@@ -26,14 +26,15 @@ 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 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
 
     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)
 
             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,
 
                 mpd.id = naughty.notify({
                     preset = mpd_notification_preset,