wiki: some typos fixed

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

diff --git a/widgets/mpd.lua b/widgets/mpd.lua
index 58d9430c59d8d3938f810b2ffc30873c1e0253f4..36c3ed767b7239d88c96fab0b4fa2b5ddeb49a81 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"


@@ -38,7 +38,19 @@ local function worker(args)
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port
 
     local mpdcover = helpers.scripts_dir .. "mpdcover"
     local mpdh = "telnet://" .. host .. ":" .. port

-    local echo = "echo 'password " .. password .. "\nstatus\ncurrentsong\nclose'"
+
+    local echo = nil
+
+    if password == "" then
+        echo = "(echo -e 'status'; sleep 0.1;" ..
+               "echo -e 'currentsong'; sleep 0.1;" ..
+               "echo -e 'close')"
+    else
+        echo = "(echo -e 'password " .. password .. "'" ..
+               "echo -e 'status'; sleep 0.1;" ..
+               "echo -e 'currentsong'; sleep 0.1;" ..
+               "echo -e 'close')"
+    end

 
     mpd.widget = wibox.widget.textbox('')
 
 
     mpd.widget = wibox.widget.textbox('')
 


@@ -59,7 +71,7 @@ local function worker(args)
             date   = "N/A"
         }
 
             date   = "N/A"
         }
 

-        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 3 " .. mpdh)
+        local f = io.popen(echo .. " | curl --connect-timeout 1 -fsm 1 " .. mpdh)

 
         for line in f:lines() do
             for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do
 
         for line in f:lines() do
             for k, v in string.gmatch(line, "([%w]+):[%s](.*)$") do