awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpd: cover_size option added

This commit is contained in:
luke bonham 2013-09-14 00:01:00 +02:00
parent db1fb613b3
commit a8eb652fd6
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/mpdcover
View File

@ -21,9 +21,6 @@ MUSIC_DIR=$1
# Song file # Song file
file=$2 file=$2
# The default cover to use (optional)
DEFAULT_ART=$3
# Regex expression used for image search # Regex expression used for image search
IMG_REG="(front|cover|art|Folder|folder)\.(jpg|jpeg|png|gif)$" 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" TEMP_PATH="/tmp/mpdcover.png"
# Resize cover # Resize cover
COVER_RESIZE="100x100" COVER_RESIZE="$3x$3"
if [ $COVER_RESIZE == "x" ]; then
COVER_RESIZE="100x100"
fi
# Thumbnail background (transparent) # Thumbnail background (transparent)
COVER_BACKGROUND="none" COVER_BACKGROUND="none"
@ -48,9 +49,6 @@ art="$MUSIC_DIR/${file%/*}"
# cover. # cover.
cover="$(find "$art/" -maxdepth 1 -type f | egrep -i -m1 "$IMG_REG")" 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 # check if art is available
if [[ -n $cover ]]; then if [[ -n $cover ]]; then
if [[ -n $COVER_RESIZE ]]; then if [[ -n $COVER_RESIZE ]]; then

18
widgets/mpd.lua
View File

@ -26,13 +26,14 @@ local setmetatable = setmetatable
local mpd = {} local mpd = {}
local function worker(args) local function worker(args)
local args = args or {} local args = args or {}
local timeout = args.timeout or 2 local timeout = args.timeout or 2
local password = args.password or "" local password = args.password or ""
local host = args.host or "127.0.0.1" local host = args.host or "127.0.0.1"
local port = args.port or "6600" local port = args.port or "6600"
local music_dir = args.music_dir or os.getenv("HOME") .. "/Music" local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
local settings = args.settings or function() end local cover_size = args.cover_size or 100
local settings = args.settings or function() end
local mpdcover = helpers.scripts_dir .. "mpdcover" local mpdcover = helpers.scripts_dir .. "mpdcover"
local mpdh = "telnet://" .. host .. ":" .. port local mpdh = "telnet://" .. host .. ":" .. port
@ -84,7 +85,8 @@ local function worker(args)
then then
helpers.set_map("current mpd track", mpd_now.title) 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({ mpd.id = naughty.notify({
preset = mpd_notification_preset, preset = mpd_notification_preset,