Offer the possibility to show the used space in MB/GB

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 6038746cc0d797c48c18d00841ebfe3dbae0de4c..4d05df518aeaa8fd4c3fdd5aa93a10d2f609c2fa 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -44,7 +44,7 @@ function fs.show(seconds, options, scr)
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
     elseif scr then
     if fs.followmouse then
         fs.notification_preset.screen = mouse.screen
     elseif scr then

-                         fs.notification_preset.screen = scr
+        fs.notification_preset.screen = scr

     end
 
     fs_notification = naughty.notify({
     end
 
     fs_notification = naughty.notify({


@@ -85,6 +85,8 @@ local function worker(args)
             if u and m then -- Handle 1st line and broken regexp
                 fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
                 fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])
             if u and m then -- Handle 1st line and broken regexp
                 fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
                 fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])

+                fs_info[m .. " used_mb"]  = string.format("%.1f", tonumber(u) / unit["mb"])
+                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / unit["gb"])

                 fs_info[m .. " used_p"]   = tonumber(p)
                 fs_info[m .. " avail_p"]  = 100 - tonumber(p)
             end
                 fs_info[m .. " used_p"]   = tonumber(p)
                 fs_info[m .. " avail_p"]  = 100 - tonumber(p)
             end


@@ -96,6 +98,8 @@ local function worker(args)
         fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
         fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
         fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0
         fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
         fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
         fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0

+        fs_now.used_mb   = tonumber(fs_info[partition .. " used_mb"]) or 0                                                                                                                    
+        fs_now.used_gb   = tonumber(fs_info[partition .. " used_gb"]) or 0

 
         notification_preset = fs.notification_preset
         widget = fs.widget
 
         notification_preset = fs.notification_preset
         widget = fs.widget


@@ -117,8 +121,8 @@ local function worker(args)
     end
 
     if showpopup == "on" then
     end
 
     if showpopup == "on" then

-        fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
-        fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+       fs.widget:connect_signal('mouse::enter', function () fs.show(0) end)
+       fs.widget:connect_signal('mouse::leave', function () fs.hide() end)

     end
 
     helpers.newtimer(partition, timeout, update)
     end
 
     helpers.newtimer(partition, timeout, update)