Merge lp:~noxan/switchboard-plug-about/fix-1161643-hdd-and-ram-size into lp:~elementary-apps/switchboard-plug-about/trunk

[Richard Stromer]

Improved the fix again.

[Richard Stromer (noxan)]

To give credits properly: Took the idea of using FormatSizeFlags.IEC_UNITS from teemperor's branch.

[Jaap Broekhuizen (jaapz-b)]

Would be nicer if we didn't have to execute command line tools with spawn_command_line_sync, but I guess this will do for now :)

review: Approve

=== modified file 'src/about-plug.vala'
--- src/about-plug.vala	2013-04-20 15:29:09 +0000
+++ src/about-plug.vala	2013-05-16 23:51:26 +0000
@@ -137,7 +137,7 @@
         }
 
         //Memory
-        memory = GLib.format_size (get_mem_info_for("MemTotal:") * 1000);
+        memory = GLib.format_size (get_mem_info_for("MemTotal:") * 1024, FormatSizeFlags.IEC_UNITS);
 
         // Graphics
         Process.spawn_command_line_sync ("lspci", out graphics);
@@ -156,15 +156,18 @@
         }
 
         // Hard Drive
-        Process.spawn_command_line_sync ("df -h", out hdd);
+        Process.spawn_command_line_sync ("df", out hdd);
+        Regex hdd_size_regex = /^\S+\s+(\d+)\s+\d+/;
+        uint64 hdd_size = 0;
         foreach (string partition in hdd.split ("\n")) {
-            if ("/\n" in partition + "\n") {
-                hdd = partition;
+            if (partition.has_prefix ("/dev/")) {
+                MatchInfo match_info;
+                if (hdd_size_regex.match (partition, 0, out match_info)) {
+                    hdd_size += match_info.fetch (1).to_uint64 ();
+                }
             }
         }
-        hdd = hdd.split ("G")[0];
-        hdd = hdd.reverse ().split (" ")[0].reverse ();
-        hdd = GLib.format_size (hdd.to_uint64 () * 1000000000);
+        hdd = GLib.format_size (hdd_size * 1024, FormatSizeFlags.IEC_UNITS);
     }
 
     private string get_graphics_from_string(string graphics) {