Created yawn (rest)

[etc/awesome.git] / widgets / mpd.lua

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 4ee922ff57dc402d6cfb0b93c97390c3c5d77cdb..1749b5710b9e0588ae2bf83e35b27e0e23e98687 100644 (file)
--- a/widgets/mpd.lua
+++ b/widgets/mpd.lua
@@ -16,7 +16,7 @@ local wibox        = require("wibox")
 local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }
 local io           = { popen    = io.popen }
 local os           = { execute  = os.execute,
                        getenv   = os.getenv }

-local string       = { format   = string.format, 
+local string       = { format   = string.format,

                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable
                        gmatch   = string.gmatch }
 
 local setmetatable = setmetatable


@@ -28,7 +28,7 @@ local mpd = {}
 local function worker(args)
     local args        = args or {}
     local timeout     = args.timeout or 2
 local function worker(args)
     local args        = args or {}
     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 port        = args.port or "6600"
     local music_dir   = args.music_dir or os.getenv("HOME") .. "/Music"
     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"


@@ -42,15 +42,6 @@ local function worker(args)
 
     mpd.widget = wibox.widget.textbox('')
 
 
     mpd.widget = wibox.widget.textbox('')
 

-    mpd_now = {
-        state  = "N/A",
-        file   = "N/A",
-        artist = "N/A",
-        title  = "N/A",
-        album  = "N/A",
-        date   = "N/A"
-    }
-

     mpd_notification_preset = {
         title   = "Now playing",
         timeout = 6
     mpd_notification_preset = {
         title   = "Now playing",
         timeout = 6


@@ -59,6 +50,15 @@ local function worker(args)
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()
     helpers.set_map("current mpd track", nil)
 
     function mpd.update()

+        mpd_now = {
+            state  = "N/A",
+            file   = "N/A",
+            artist = "N/A",
+            title  = "N/A",
+            album  = "N/A",
+            date   = "N/A"
+        }
+

         local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh)
 
         for line in f:lines() do
         local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh)
 
         for line in f:lines() do