pull #239; better implementation

scripts/dfs

@@ -11,10 +11,11 @@
 # -------------------------------------------------------------------------
 #   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
+DF_OPTIONS=""
 
 while [ $# -gt 0 ]; do
 case "$1" in
@@ -31,6 +32,12 @@ NARROW_MODE=1
 "-w" )
 WEB_OUTPUT=1
 ;;
+--type=*)
+DF_OPTIONS+=" $1"
+;;
+--exclude-type=*)
+DF_OPTIONS+=" $1"
+;;
 * )
 echo $USAGE
 exit
@@ -58,6 +65,9 @@ AWK_COMMAND="/usr/bin/env gawk"
 ;;
 esac
 
+# Add additional df options
+DF_COMMAND+=$DF_OPTIONS
+
 # -------------------------------------------------------------------------
 #   Grabbing "df" result
 # -------------------------------------------------------------------------

widgets/calendar.lua

@@ -27,15 +27,15 @@ local setmetatable = setmetatable
 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
 
-function calendar:show(t_out, inc_offset, scr)
+function calendar.show(t_out, inc_offset, scr)
-    calendar:hide()
+    calendar.hide()
 
     local f, c_text
     local offs  = inc_offset or 0
@@ -96,7 +96,7 @@ function calendar:show(t_out, inc_offset, scr)
     })
 end
 
-function calendar:attach(widget, args)
+function calendar.attach(widget, args)
     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 ()
-                                             calendar:show(0, -1, calendar.scr_pos) end),
+                                             calendar.show(0, -1, calendar.scr_pos) end),
                                          awful.button({ }, 3, function ()
-                                             calendar:show(0, 1, calendar.scr_pos) end),
+                                             calendar.show(0, 1, calendar.scr_pos) end),
                                          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

widgets/contrib/task.lua

@@ -30,15 +30,15 @@ function findLast(haystack, needle)
     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
 
-function task:show(scr_pos)
+function task.show(scr_pos)
-    task:hide()
+    task.hide()
 
     local f, c_text, scrp
 
@@ -67,7 +67,7 @@ function task:show(scr_pos)
                                      })
 end
 
-function task:prompt_add()
+function task.prompt_add()
   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
 
-function task:prompt_search()
+function task.prompt_search()
   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
 
-function task:attach(widget, args)
+function task.attach(widget, args)
     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"
 
-    widget:connect_signal("mouse::enter", function () task:show(task.scr_pos) end)
+    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::leave", function () task.hide() end)
 end
 
 return setmetatable(task, { __call = function(_, ...) return create(...) end })

widgets/fs.lua

@@ -28,17 +28,18 @@ local setmetatable = setmetatable
 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
 
-function fs:show(t_out)
+function fs.show(t_out, fs_args)
-    fs:hide()
+    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

widgets/imap.lua

@@ -41,8 +41,7 @@ local function worker(args)
 
     helpers.set_map(mail, 0)
 
-    if not is_plain
+    if not is_plain then
-    then
         password = helpers.read_pipe(password):gsub("\n", "")
     end
 

widgets/maildir.lua

@@ -39,8 +39,7 @@ local function worker(args)
     maildir.widget = wibox.widget.textbox('')
 
     function update()
-        if ext_mail_cmd ~= nil
+        if ext_mail_cmd then
-        then
             awful.util.spawn(ext_mail_cmd)
         end
 
@@ -75,6 +74,7 @@ local function worker(args)
         p:close()
 
         newmail = "no mail"
+
         -- Count the total number of mails irrespective of where it was found
         total = 0