Merge lp:~teemperor/switchboard-plug-about/storage-dmesg-change into lp:~elementary-apps/switchboard-plug-about/trunk

[Raphael Isemann]

[Raphael Isemann (teemperor)]

Forgot to add a description:

dmesg to get the available storage without su-rights. Also i renamed the hdd_* variables to storage_* variables to fit the translation change we had lately.

[Pim Vullers (pimvullers)]

Looks good, this should fix part of bug #1182396. Cannot test it due to not reaching that point in code (fails when getting graphics details):
** (about:9990): CRITICAL **: file /tmp/portage/pantheon-base/switchboard-plug-about-9999/work/switchboard-plug-about-9999_build/src/about-plug.c: line 731: uncaught error: Failed to execute child process "lspci" (No such file or directory) (g-exec-error-quark, 8)

[Cody Garver (codygarver)]

Only solves half of the bug.

review: Needs Fixing

Unmerged revisions

99. By Raphael Isemann on 2013-05-27

Replace df for storage size with a workaround via dmesg

=== modified file 'src/about-plug.vala'
--- src/about-plug.vala	2013-05-18 10:48:46 +0000
+++ src/about-plug.vala	2013-05-27 06:55:33 +0000
@@ -27,7 +27,7 @@
     private string processor;
     private string memory;
     private string graphics;
-    private string hdd;
+    private string storage;
 
     public AboutPlug () {
         setup_info ();
@@ -156,18 +156,19 @@
         }
 
         // Hard Drive
-        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 (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 ();
-                }
+        Process.spawn_command_line_sync ("dmesg", out storage);
+        Regex storage_size_regex = new Regex ("""sd \d+:\d+:\d+:\d+:+ \[sd[a-z]"""
+                             + """[a-z]?\] (\d+) (\d+)-byte logical blocks""");
+        uint64 storage_size = 0;
+        foreach (string line in storage.split ("\n")) {
+            MatchInfo match_info;
+            if (storage_size_regex.match (line, 0, out match_info)) {
+                //we multiply the block count with the size for the actual size
+                storage_size += uint64.parse (match_info.fetch (1))
+                                * uint64.parse (match_info.fetch (2));
             }
         }
-        hdd = GLib.format_size (hdd_size * 1024, FormatSizeFlags.IEC_UNITS);
+        storage = GLib.format_size (storage_size);
     }
 
     private string get_graphics_from_string(string graphics) {
@@ -240,8 +241,8 @@
         var graphics_label = new Gtk.Label (_("Graphics:"));
         graphics_label.set_alignment (1, 0);
 
-        var hdd_label = new Gtk.Label (_("Storage:"));
-        hdd_label.set_alignment (1, 0);
+        var storage_label = new Gtk.Label (_("Storage:"));
+        storage_label.set_alignment (1, 0);
 
         // Hardware info
         var processor_info = new Gtk.Label (processor);
@@ -261,10 +262,10 @@
         graphics_info.set_selectable (true);
         graphics_info.set_line_wrap (false);
 
-        var hdd_info = new Gtk.Label (hdd);
-        hdd_info.set_alignment (0, 0);
-        hdd_info.set_margin_left (6);
-        hdd_info.set_selectable (true);
+        var storage_info = new Gtk.Label (storage);
+        storage_info.set_alignment (0, 0);
+        storage_info.set_margin_left (6);
+        storage_info.set_selectable (true);
 
         // Hardware grid
         var hardware_grid = new Gtk.Grid ();
@@ -273,11 +274,11 @@
         hardware_grid.attach (processor_label, 0, 40, 100, 25);
         hardware_grid.attach (memory_label, 0, 80, 100, 25);
         hardware_grid.attach (graphics_label, 0, 120, 100, 25);
-        hardware_grid.attach (hdd_label, 0, 160, 100, 25);
+        hardware_grid.attach (storage_label, 0, 160, 100, 25);
         hardware_grid.attach (processor_info, 100, 40, 100, 25);
         hardware_grid.attach (memory_info, 100, 80, 100, 25);
         hardware_grid.attach (graphics_info, 100, 120, 100, 25);
-        hardware_grid.attach (hdd_info, 100, 160, 100, 25);
+        hardware_grid.attach (storage_info, 100, 160, 100, 25);
 
         // Help button
         const string HELP_BUTTON_STYLESHEET = """