pull #239; better implementation

diff --git a/scripts/dfs b/scripts/dfs
index bc27b816a552fffcc17ff4b716dd2bdf2f129037..1de819a94ba2813867b8fb2d19197fafc8e0a871 100755 (executable)
--- a/scripts/dfs
+++ b/scripts/dfs
@@ -11,10 +11,11 @@
 # -------------------------------------------------------------------------
 #   Decoding options
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
 #   Decoding options
 # -------------------------------------------------------------------------

-USAGE="Usage: $0 [-h(elp)] | [-n(arrow mode)] | [-w(eb output)]"
+USAGE="Usage: $0 [-h(elp)] | [-n(arrow mode)] | [-w(eb output) | --type=<fstype> | --exclude-type=<fstype>]"

 
 NARROW_MODE=0
 WEB_OUTPUT=0
 
 NARROW_MODE=0
 WEB_OUTPUT=0

+DF_OPTIONS=""

 
 while [ $# -gt 0 ]; do
 case "$1" in
 
 while [ $# -gt 0 ]; do
 case "$1" in


@@ -31,6 +32,12 @@ NARROW_MODE=1
 "-w" )
 WEB_OUTPUT=1
 ;;
 "-w" )
 WEB_OUTPUT=1
 ;;

+--type=*)
+DF_OPTIONS+=" $1"
+;;
+--exclude-type=*)
+DF_OPTIONS+=" $1"
+;;

 * )
 echo $USAGE
 exit
 * )
 echo $USAGE
 exit


@@ -58,6 +65,9 @@ AWK_COMMAND="/usr/bin/env gawk"
 ;;
 esac
 
 ;;
 esac
 

+# Add additional df options
+DF_COMMAND+=$DF_OPTIONS
+

 # -------------------------------------------------------------------------
 #   Grabbing "df" result
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
 #   Grabbing "df" result
 # -------------------------------------------------------------------------

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index c1d25d03f72e426e739aff92f4be00c775b350e1..b20bc4025b1287712bb1929e182aa7e7ebb2481f 100644 (file)
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -155,23 +155,23 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    alsabar.bar:buttons (awful.util.table.join (
-          awful.button ({}, 1, function()
+    alsabar.bar:buttons(awful.util.table.join (
+          awful.button({}, 1, function()

             awful.util.spawn(alsabar.mixer)
           end),
             awful.util.spawn(alsabar.mixer)
           end),

-          awful.button ({}, 2, function()
+          awful.button({}, 2, function()

                                                awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
             pulsebar.update()
           end),
                                                awful.util.spawn(string.format("%s set %s 100%%", alsabar.cmd, alsabar.channel))
             pulsebar.update()
           end),

-          awful.button ({}, 3, function()
+          awful.button({}, 3, function()

             awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.channel))
             alsabar.update()
           end),
             awful.util.spawn(string.format("%s set %s toggle", alsabar.cmd, alsabar.channel))
             alsabar.update()
           end),

-          awful.button ({}, 4, function()
+          awful.button({}, 4, function()

             awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end),
             awful.util.spawn(string.format("%s set %s %s+", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end),

-          awful.button ({}, 5, function()
+          awful.button({}, 5, function()

             awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end)
             awful.util.spawn(string.format("%s set %s %s-", alsabar.cmd, alsabar.channel, alsabar.step))
             alsabar.update()
           end)

diff --git a/widgets/calendar.lua b/widgets/calendar.lua
index 1a481cab64243a792c9c81fbabedf543d8244744..a38a1426ef8eb08fad4d6359287fe3a65c0332eb 100644 (file)
--- a/widgets/calendar.lua
+++ b/widgets/calendar.lua
@@ -27,15 +27,15 @@ local setmetatable = setmetatable
 local calendar = {}
 local cal_notification = nil
 
 local calendar = {}
 local cal_notification = nil
 

-function calendar:hide()
+function calendar.hide()

     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 
     if cal_notification ~= nil then
         naughty.destroy(cal_notification)
         cal_notification = nil
     end
 end
 

-function calendar:show(t_out, inc_offset, scr)
-    calendar:hide()
+function calendar.show(t_out, inc_offset, scr)
+    calendar.hide()

 
     local f, c_text
     local offs  = inc_offset or 0
 
     local f, c_text
     local offs  = inc_offset or 0


@@ -96,7 +96,7 @@ function calendar:show(t_out, inc_offset, scr)
     })
 end
 
     })
 end
 

-function calendar:attach(widget, args)
+function calendar.attach(widget, args)

     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"
     local args = args or {}
 
     calendar.cal         = args.cal or "/usr/bin/cal"


@@ -119,11 +119,11 @@ function calendar:attach(widget, args)
     widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()
     widget:connect_signal("mouse::enter", function () calendar:show(0, 0, calendar.scr_pos) end)
     widget:connect_signal("mouse::leave", function () calendar:hide() end)
     widget:buttons(awful.util.table.join(awful.button({ }, 1, function ()

-                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                             calendar.show(0, -1, calendar.scr_pos) end),

                                          awful.button({ }, 3, function ()
                                          awful.button({ }, 3, function ()

-                                             calendar:show(0, 1, calendar.scr_pos) end),
+                                             calendar.show(0, 1, calendar.scr_pos) end),

                                          awful.button({ }, 4, function ()
                                          awful.button({ }, 4, function ()

-                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                             calendar.show(0, -1, calendar.scr_pos) end),

                                          awful.button({ }, 5, function ()
                                              calendar:show(0, 1, calendar.scr_pos) end)))
 end
                                          awful.button({ }, 5, function ()
                                              calendar:show(0, 1, calendar.scr_pos) end)))
 end

diff --git a/widgets/contrib/kbdlayout.lua b/widgets/contrib/kbdlayout.lua
index 64ea6b30fa83b93bd059d5c47f9ad1771abfc1da..23dc6e3cb975b15e34c7f93883ab045478559de3 100644 (file)
--- a/widgets/contrib/kbdlayout.lua
+++ b/widgets/contrib/kbdlayout.lua
@@ -19,7 +19,7 @@ local setmetatable = setmetatable
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout
 
 -- Keyboard layout switcher
 -- lain.widgets.contrib.kblayout
 

-local function worker (args)
+local function worker(args)

    local kbdlayout    = {}
    kbdlayout.widget   = wibox.widget.textbox('')
 
    local kbdlayout    = {}
    kbdlayout.widget   = wibox.widget.textbox('')
 


@@ -36,21 +36,21 @@ local function worker (args)
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 
                               awful.button({ }, 1, function () kbdlayout.next() end),
                               awful.button({ }, 3, function () kbdlayout.prev() end)))
 

-   local function run_settings (layout, variant)
+   local function run_settings(layout, variant)

       widget = kbdlayout.widget
       kbdlayout_now = { layout=string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
                        variant=variant }
       settings()
    end
 
       widget = kbdlayout.widget
       kbdlayout_now = { layout=string.match(layout, "[^,]+"), -- Make sure to match the primary layout only.
                        variant=variant }
       settings()
    end
 

-   function kbdlayout.update ()
+   function kbdlayout.update()

       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),
                    string.match(status, "variant:%s*([^\n]*)"))
    end
 
       local status = read_pipe('setxkbmap -query')
 
       run_settings(string.match(status, "layout:%s*([^\n]*)"),
                    string.match(status, "variant:%s*([^\n]*)"))
    end
 

-   function kbdlayout.set (i)
+   function kbdlayout.set(i)

       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = 'setxkbmap ' .. layouts[idx].layout
 
       idx = ((i - 1) % #layouts) + 1 -- Make sure to wrap around as needed.
       local to_execute = 'setxkbmap ' .. layouts[idx].layout
 


@@ -67,11 +67,11 @@ local function worker (args)
       end
    end
 
       end
    end
 

-   function kbdlayout.next ()
+   function kbdlayout.next()

       kbdlayout.set(idx + 1)
    end
 
       kbdlayout.set(idx + 1)
    end
 

-   function kbdlayout.prev ()
+   function kbdlayout.prev()

       kbdlayout.set(idx - 1)
    end
 
       kbdlayout.set(idx - 1)
    end
 

diff --git a/widgets/contrib/task.lua b/widgets/contrib/task.lua
index 27061b9573be578ae1eeeb90ef1b27b7aac051dd..fc438d9bfce40fc7534a91765473391657e77197 100644 (file)
--- a/widgets/contrib/task.lua
+++ b/widgets/contrib/task.lua
@@ -30,15 +30,15 @@ function findLast(haystack, needle)
     if i==nil then return nil else return i-1 end
 end
 
     if i==nil then return nil else return i-1 end
 end
 

-function task:hide()
+function task.hide()

     if task_notification ~= nil then
         naughty.destroy(task_notification)
         task_notification = nil
     end
 end
 
     if task_notification ~= nil then
         naughty.destroy(task_notification)
         task_notification = nil
     end
 end
 

-function task:show(scr_pos)
-    task:hide()
+function task.show(scr_pos)
+    task.hide()

 
     local f, c_text, scrp
 
 
     local f, c_text, scrp
 


@@ -67,7 +67,7 @@ function task:show(scr_pos)
                                      })
 end
 
                                      })
 end
 

-function task:prompt_add()
+function task.prompt_add()

   awful.prompt.run({ prompt = "Add task: " },
       mypromptbox[mouse.screen].widget,
       function (...)
   awful.prompt.run({ prompt = "Add task: " },
       mypromptbox[mouse.screen].widget,
       function (...)


@@ -92,7 +92,7 @@ function task:prompt_add()
       awful.util.getdir("cache") .. "/history_task_add")
 end
 
       awful.util.getdir("cache") .. "/history_task_add")
 end
 

-function task:prompt_search()
+function task.prompt_search()

   awful.prompt.run({ prompt = "Search task: " },
       mypromptbox[mouse.screen].widget,
       function (...)
   awful.prompt.run({ prompt = "Search task: " },
       mypromptbox[mouse.screen].widget,
       function (...)


@@ -126,7 +126,7 @@ function task:prompt_search()
       awful.util.getdir("cache") .. "/history_task")
 end
 
       awful.util.getdir("cache") .. "/history_task")
 end
 

-function task:attach(widget, args)
+function task.attach(widget, args)

     local args       = args or {}
 
     task.font_size   = tonumber(args.font_size) or 12
     local args       = args or {}
 
     task.font_size   = tonumber(args.font_size) or 12


@@ -143,8 +143,8 @@ function task:attach(widget, args)
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 
     task.notify_icon = icons_dir .. "/taskwarrior/task.png"
     task.notify_icon_small = icons_dir .. "/taskwarrior/tasksmall.png"
 

-    widget:connect_signal("mouse::enter", function () task:show(task.scr_pos) end)
-    widget:connect_signal("mouse::leave", function () task:hide() end)
+    widget:connect_signal("mouse::enter", function () task.show(task.scr_pos) end)
+    widget:connect_signal("mouse::leave", function () task.hide() end)

 end
 
 return setmetatable(task, { __call = function(_, ...) return create(...) end })
 end
 
 return setmetatable(task, { __call = function(_, ...) return create(...) end })

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 5215c8632de1996283b3855a9e1ebb3f7a091911..ad5b204e48d0e2c8ffb00dae2e627443461d9f0a 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -28,17 +28,18 @@ local setmetatable = setmetatable
 local fs = {}
 local fs_notification  = nil
 
 local fs = {}
 local fs_notification  = nil
 

-function fs:hide()
+function fs.hide()

     if fs_notification ~= nil then
         naughty.destroy(fs_notification)
         fs_notification = nil
     end
 end
 
     if fs_notification ~= nil then
         naughty.destroy(fs_notification)
         fs_notification = nil
     end
 end
 

-function fs:show(t_out)
-    fs:hide()
+function fs.show(t_out, fs_args)
+    fs.hide()

 
 

-    local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
+    local cmd = (fs_args and string.format("dfs %s", fs_args)) or "dfs"
+    local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")

 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
 
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen

diff --git a/widgets/imap.lua b/widgets/imap.lua
index ea763dfa4127ff4baf1cdbd642b7abf61f789a1b..de2f7b454d5493191aca1c3c7d00e6425b9c328d 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -41,8 +41,7 @@ local function worker(args)
 
     helpers.set_map(mail, 0)
 
 
     helpers.set_map(mail, 0)
 

-    if not is_plain
-    then
+    if not is_plain then

         password = helpers.read_pipe(password):gsub("\n", "")
     end
 
         password = helpers.read_pipe(password):gsub("\n", "")
     end
 

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index c9937b47e0d2f4d2eb15a00cc945aab6e8920b4b..e963fc64c9a383e41da3d21ae2deffdb41020f4b 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -39,8 +39,7 @@ local function worker(args)
     maildir.widget = wibox.widget.textbox('')
 
     function update()
     maildir.widget = wibox.widget.textbox('')
 
     function update()

-        if ext_mail_cmd ~= nil
-        then
+        if ext_mail_cmd then

             awful.util.spawn(ext_mail_cmd)
         end
 
             awful.util.spawn(ext_mail_cmd)
         end
 


@@ -75,6 +74,7 @@ local function worker(args)
         p:close()
 
         newmail = "no mail"
         p:close()
 
         newmail = "no mail"

+

         -- Count the total number of mails irrespective of where it was found
         total = 0
 
         -- Count the total number of mails irrespective of where it was found
         total = 0
 

diff --git a/widgets/pulsebar.lua b/widgets/pulsebar.lua
index cd153a1c23aa7f0cec71483139ea2a265863a857..51de3a7460834e9fad61c810fe81aab9575d5bae 100644 (file)
--- a/widgets/pulsebar.lua
+++ b/widgets/pulsebar.lua
@@ -150,23 +150,23 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    pulsebar.bar:buttons (awful.util.table.join (
-          awful.button ({}, 1, function()
+    pulsebar.bar:buttons(awful.util.table.join (
+          awful.button({}, 1, function()

             awful.util.spawn(pulsebar.mixer)
           end),
             awful.util.spawn(pulsebar.mixer)
           end),

-          awful.button ({}, 2, function()
+          awful.button({}, 2, function()

                                                awful.util.spawn(string.format("pactl set-sink-lolume %d 100%%", pulsebar.sink))
             pulsebar.update()
           end),
                                                awful.util.spawn(string.format("pactl set-sink-lolume %d 100%%", pulsebar.sink))
             pulsebar.update()
           end),

-          awful.button ({}, 3, function()
+          awful.button({}, 3, function()

                                                awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))
             pulsebar.update()
           end),
                                                awful.util.spawn(string.format("pactl set-sink-mute %d toggle", pulsebar.sink))
             pulsebar.update()
           end),

-          awful.button ({}, 4, function()
+          awful.button({}, 4, function()

                                                awful.util.spawn(string.format("pactl set-sink-volume %d +%s", pulsebar.sink, pulsebar.step))
             pulsebar.update()
           end),
                                                awful.util.spawn(string.format("pactl set-sink-volume %d +%s", pulsebar.sink, pulsebar.step))
             pulsebar.update()
           end),

-          awful.button ({}, 5, function()
+          awful.button({}, 5, function()

                                                awful.util.spawn(string.format("pactl set-sink-volume %d -%s", pulsebar.sink, pulsebar.step))
             pulsebar.update()
                                        end)
                                                awful.util.spawn(string.format("pactl set-sink-volume %d -%s", pulsebar.sink, pulsebar.step))
             pulsebar.update()
                                        end)