diff options
| -rw-r--r-- | mpris-widget/init.lua | 211 |
1 files changed, 111 insertions, 100 deletions
diff --git a/mpris-widget/init.lua b/mpris-widget/init.lua index e18edf5..370957d 100644 --- a/mpris-widget/init.lua +++ b/mpris-widget/init.lua @@ -3,7 +3,7 @@ -- Modelled after Pavel Makhov's work -- @author Mohammed Gaber -- requires - playerctl --- @copyright 2020 +-- @copyright 2020 ------------------------------------------------- local awful = require("awful") local beautiful = require("beautiful") @@ -19,7 +19,7 @@ local TOGGLE_MPD_CMD = "playerctl play-pause" local PAUSE_MPD_CMD = "playerctl pause" local STOP_MPD_CMD = "playerctl stop" local NEXT_MPD_CMD = "playerctl next" -local PREV_MPD_CMD = "playerctl prev" +local PREV_MPD_CMD = "playerctl previous" local PATH_TO_ICONS = "/usr/share/icons/Arc" local PAUSE_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_pause.png" @@ -27,110 +27,121 @@ local PLAY_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_play.png" local STOP_ICON_NAME = PATH_TO_ICONS .. "/actions/24/player_stop.png" local LIBRARY_ICON_NAME = PATH_TO_ICONS .. "/actions/24/music-library.png" --- retriving song info -current_song, artist = nil, nil - -local icon = wibox.widget { - id = "icon", - widget = wibox.widget.imagebox, - image = PLAY_ICON_NAME -} -local mirrored_icon = wibox.container.mirror(icon, {horizontal = true}) - -local mpdarc = wibox.widget { - mirrored_icon, - -- max_value = 1, - -- value = 0, - thickness = 2, - start_angle = 4.71238898, -- 2pi*3/4 - forced_height = 24, - forced_width = 24, - rounded_edge = true, - bg = "#ffffff11", - paddings = 0, - widget = wibox.container.arcchart -} - -local mpdarc_icon_widget = wibox.container.mirror(mpdarc, {horizontal = true}) -local mpdarc_current_song_widget = wibox.widget { - id = 'current_song', - widget = wibox.widget.textbox, - font = 'Play 10' -} - -local update_graphic = function(widget, stdout, _, _, _) - mpdstatus, artist, current_song = stdout:match("(%w+)%;+(.-)%;(.*)") - if current_song ~= nil then - if current_song.len == 18 then - current_song = string.sub(current_song, 0, 9) .. ".." + +local mpdarc_widget = {} + +local function worker(args) + + -- retriving song info + local current_song, artist, mpdstatus + + local icon = wibox.widget { + id = "icon", + widget = wibox.widget.imagebox, + image = PLAY_ICON_NAME + } + local mirrored_icon = wibox.container.mirror(icon, {horizontal = true}) + + local mpdarc = wibox.widget { + mirrored_icon, + -- max_value = 1, + -- value = 0, + thickness = 2, + start_angle = 4.71238898, -- 2pi*3/4 + forced_height = 24, + forced_width = 24, + rounded_edge = true, + bg = "#ffffff11", + paddings = 0, + widget = wibox.container.arcchart + } + + local mpdarc_icon_widget = wibox.container.mirror(mpdarc, {horizontal = true}) + local mpdarc_current_song_widget = wibox.widget { + id = 'current_song', + widget = wibox.widget.textbox, + font = 'Play 10' + } + + local update_graphic = function(widget, stdout, _, _, _) + mpdstatus, artist, current_song = stdout:match("(%w+)%;+(.-)%;(.*)") + if current_song ~= nil then + if current_song.len == 18 then + current_song = string.sub(current_song, 0, 9) .. ".." + end end - end - if mpdstatus == "Playing" then - mpdarc_icon_widget.visible = true - icon.image = PLAY_ICON_NAME - widget.colors = {beautiful.widget_main_color} - mpdarc_current_song_widget.markup = current_song - elseif mpdstatus == "Paused" then - mpdarc_icon_widget.visible = true - icon.image = PAUSE_ICON_NAME - widget.colors = {beautiful.widget_main_color} - mpdarc_current_song_widget.markup = current_song - elseif mpdstatus == "Stopped" then - mpdarc_icon_widget.visible = true - icon.image = STOP_ICON_NAME - mpdarc_current_song_widget.markup = "" - else -- no player is running - icon.image = LIBRARY_ICON_NAME - mpdarc_icon_widget.visible = false - mpdarc_current_song_widget.markup = "" - widget.colors = {beautiful.widget_red} + if mpdstatus == "Playing" then + mpdarc_icon_widget.visible = true + icon.image = PLAY_ICON_NAME + widget.colors = {beautiful.widget_main_color} + mpdarc_current_song_widget.markup = current_song + elseif mpdstatus == "Paused" then + mpdarc_icon_widget.visible = true + icon.image = PAUSE_ICON_NAME + widget.colors = {beautiful.widget_main_color} + mpdarc_current_song_widget.markup = current_song + elseif mpdstatus == "Stopped" then + mpdarc_icon_widget.visible = true + icon.image = STOP_ICON_NAME + mpdarc_current_song_widget.markup = "" + else -- no player is running + icon.image = LIBRARY_ICON_NAME + mpdarc_icon_widget.visible = false + mpdarc_current_song_widget.markup = "" + widget.colors = {beautiful.widget_red} + end end -end -mpdarc:connect_signal("button::press", function(_, _, _, button) - if (button == 1) then - awful.spawn(TOGGLE_MPD_CMD, false) -- left click - elseif (button == 2) then - awful.spawn(STOP_MPD_CMD, false) - elseif (button == 3) then - awful.spawn(PAUSE_MPD_CMD, false) - elseif (button == 4) then - awful.spawn(NEXT_MPD_CMD, false) -- scroll up - elseif (button == 5) then - awful.spawn(PREV_MPD_CMD, false) -- scroll down - end + mpdarc:connect_signal("button::press", function(_, _, _, button) + if (button == 1) then + awful.spawn(TOGGLE_MPD_CMD, false) -- left click + elseif (button == 2) then + awful.spawn(STOP_MPD_CMD, false) + elseif (button == 3) then + awful.spawn(PAUSE_MPD_CMD, false) + elseif (button == 4) then + awful.spawn(NEXT_MPD_CMD, false) -- scroll up + elseif (button == 5) then + awful.spawn(PREV_MPD_CMD, false) -- scroll down + end - spawn.easy_async(GET_MPD_CMD, function(stdout, stderr, exitreason, exitcode) - update_graphic(mpdarc, stdout, stderr, exitreason, exitcode) + spawn.easy_async(GET_MPD_CMD, function(stdout, stderr, exitreason, exitcode) + update_graphic(mpdarc, stdout, stderr, exitreason, exitcode) + end) end) -end) - -local notification -function show_MPD_status() - spawn.easy_async(GET_MPD_CMD, function(stdout, _, _, _) - notification = naughty.notify { - text = current_song .. " by " .. artist, - title = mpdstatus, - timeout = 5, - hover_timeout = 0.5, - width = 600 - } + + local notification + local function show_MPD_status() + spawn.easy_async(GET_MPD_CMD, function(stdout, _, _, _) + notification = naughty.notify { + text = current_song .. " by " .. artist, + title = mpdstatus, + timeout = 5, + hover_timeout = 0.5, + width = 600 + } + end) + end + + mpdarc:connect_signal("mouse::enter", function() + if current_song ~= nil and artist ~= nil then show_MPD_status() end end) + mpdarc:connect_signal("mouse::leave", + function() naughty.destroy(notification) end) + + watch(GET_MPD_CMD, 1, update_graphic, mpdarc) + + mpdarc_widget = wibox.widget { + screen = 'primary', + mpdarc_icon_widget, + mpdarc_current_song_widget, + layout = wibox.layout.align.horizontal + } + return mpdarc_widget + end -mpdarc:connect_signal("mouse::enter", function() - if current_song ~= nil and artist ~= nil then show_MPD_status() end -end) -mpdarc:connect_signal("mouse::leave", - function() naughty.destroy(notification) end) - -watch(GET_MPD_CMD, 1, update_graphic, mpdarc) - -local mpdarc_widget = wibox.widget { - screen = 'primary', - mpdarc_icon_widget, - mpdarc_current_song_widget, - layout = wibox.layout.align.horizontal -} -return mpdarc_widget +return setmetatable(mpdarc_widget, { __call = function(_, ...) + return worker(...) +end })
\ No newline at end of file |