Merge branch '74-externalize-config'

Note: breaking change, now widgets should be created with parentheses, i.e. battery(), instead of battery. Read more in README of the widget.

1 files changed, 64 insertions, 48 deletions

diff --git a/spotify-widget/spotify.lua b/spotify-widget/spotify.lua
index c6f2188..e826de9 100644
--- a/spotify-widget/spotify.lua
+++ b/spotify-widget/spotify.lua
@@ -14,59 +14,75 @@ local watch = require("awful.widget.watch")
 
 local GET_SPOTIFY_STATUS_CMD = 'sp status'
 local GET_CURRENT_SONG_CMD = 'sp current-oneline'
-local PATH_TO_ICONS = "/usr/share/icons/Arc"
 
-local spotify_widget = wibox.widget {
-    {
-        id = "icon",
-        widget = wibox.widget.imagebox,
-    },
-    {
-        id = 'current_song',
-        widget = wibox.widget.textbox,
-        font = 'Play 9'
-    },
-    layout = wibox.layout.align.horizontal,
-    set_status = function(self, is_playing)
-        self.icon.image = PATH_TO_ICONS ..
-                (is_playing and "/actions/24/player_play.png"
-                            or "/actions/24/player_pause.png")
-    end,
-    set_text = function(self, path)
-        self.current_song.markup = path
-    end,
-}
+local spotify_widget = {}
 
-local update_widget_icon = function(widget, stdout, _, _, _)
-    stdout = string.gsub(stdout, "\n", "")
-    widget:set_status(stdout == 'Playing' and true or false)
-end
+local function worker(args)
 
-local update_widget_text = function(widget, stdout, _, _, _)
-    if string.find(stdout, 'Error: Spotify is not running.') ~= nil then
-        widget:set_text('')
-        widget:set_visible(false)
-    else
-        widget:set_text(stdout)
-        widget:set_visible(true)
-    end
-end
+    local args = args or {}
 
-watch(GET_SPOTIFY_STATUS_CMD, 1, update_widget_icon, spotify_widget)
-watch(GET_CURRENT_SONG_CMD, 1, update_widget_text, spotify_widget)
+    local play_icon = args.play_icon or '/usr/share/icons/Arc/actions/24/player_play.png'
+    local pause_icon = args.pause_icon or '/usr/share/icons/Arc/actions/24/player_pause.png'
+    local font = args.font or 'Play 9'
+
+    spotify_widget = wibox.widget {
+        {
+            id = "icon",
+            widget = wibox.widget.imagebox,
+        },
+        {
+            id = 'current_song',
+            widget = wibox.widget.textbox,
+            font = font
+        },
+        layout = wibox.layout.align.horizontal,
+        set_status = function(self, is_playing)
+            self.icon.image = (is_playing and play_icon or pause_icon)
+        end,
+        set_text = function(self, path)
+            self.current_song.markup = path
+        end,
+    }
+
+    local update_widget_icon = function(widget, stdout, _, _, _)
+        stdout = string.gsub(stdout, "\n", "")
+        widget:set_status(stdout == 'Playing' and true or false)
+    end
 
---- Adds mouse controls to the widget:
---  - left click - play/pause
---  - scroll up - play next song
---  - scroll down - play previous song
-spotify_widget:connect_signal("button::press", function(_, _, _, button)
-    if (button == 1) then awful.spawn("sp play", false)      -- left click
-    elseif (button == 4) then awful.spawn("sp next", false)  -- scroll up
-    elseif (button == 5) then awful.spawn("sp prev", false)  -- scroll down
+    local update_widget_text = function(widget, stdout, _, _, _)
+        if string.find(stdout, 'Error: Spotify is not running.') ~= nil then
+            widget:set_text('')
+            widget:set_visible(false)
+        else
+            widget:set_text(stdout)
+            widget:set_visible(true)
+        end
     end
-    awful.spawn.easy_async(GET_SPOTIFY_STATUS_CMD, function(stdout, stderr, exitreason, exitcode)
-        update_widget_icon(spotify_widget, stdout, stderr, exitreason, exitcode)
+
+    watch(GET_SPOTIFY_STATUS_CMD, 1, update_widget_icon, spotify_widget)
+    watch(GET_CURRENT_SONG_CMD, 1, update_widget_text, spotify_widget)
+
+    --- Adds mouse controls to the widget:
+    --  - left click - play/pause
+    --  - scroll up - play next song
+    --  - scroll down - play previous song
+    spotify_widget:connect_signal("button::press", function(_, _, _, button)
+        if (button == 1) then
+            awful.spawn("sp play", false)      -- left click
+        elseif (button == 4) then
+            awful.spawn("sp next", false)  -- scroll up
+        elseif (button == 5) then
+            awful.spawn("sp prev", false)  -- scroll down
+        end
+        awful.spawn.easy_async(GET_SPOTIFY_STATUS_CMD, function(stdout, stderr, exitreason, exitcode)
+            update_widget_icon(spotify_widget, stdout, stderr, exitreason, exitcode)
+        end)
     end)
-end)
 
-return spotify_widget
+    return spotify_widget
+
+end
+
+return setmetatable(spotify_widget, { __call = function(_, ...)
+    return worker(...)
+end })
\ No newline at end of file