Merge lp:~alucryd/switchboard-plug-networking/no-ifconfig into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Maxime Gauduin]

ifconfig has been deprecated for some time by most distros. This change makes the plug read the received and transferred bytes values from /sys and process them to make them look pretty.
I also fixed all whitespace issues while I was at it.

I'm open to criticism as I've never written any vala or C code before so I may have done some stupid things.

[lp:~alucryd/switchboard-plug-networking/no-ifconfig]

86. By Danielle Foré on 2015-06-20

use "channel-secure-symbolic" instead of "lock-screen"

87. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-21

Launchpad automatic translations update.

88. By Adam Bieńkowski on 2015-06-22

Check for duplicates in access points list

89. By Danielle Foré on 2015-06-23

* Fix mixed tabs and spaces
* Cuddle else

90. By Cody Garver on 2015-06-23

Packaging dependencies

91. By Cody Garver on 2015-06-23

Valac dependency

92. By Danielle Foré on 2015-06-23

* Set margins and spacing to multiples of 3
* Use 12px outside margin, 24px between sections as in alert/dialog
* Replace three dots with ellipsis char
* Add ellipsis to actions that occur in a new window
* Group actions that affect this network and set homogeneous
* Ungroup action that affects a new/different network

93. By Adam Bieńkowski on 2015-06-23

For now disable the duplicate checking; fixed: device switch gets into loop when switching it

94. By Adam Bieńkowski on 2015-06-23

Fixed: add exeption is on the wrong side + title case

95. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-24

Launchpad automatic translations update.

96. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-25

Launchpad automatic translations update.

97. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-27

Launchpad automatic translations update.

[Viko Adi Rahmawan (vikoadi)]

You can use format_size (http://valadoc.org/#!api=glib-2.0/GLib.format_size) instead of dividing by 1024

review: Needs Fixing

[Corentin Noël (tintou)]

The format_size fonction is definitely the way to go, it also returns a translated string (Byte is Octet in french so kb becomes ko)

[Maxime Gauduin (alucryd)]

Thx for the suggestion, works like a charm!

[Adam Bieńkowski (donadigo)]

It works well, but the code has some issues:
* Branch the current revision to apply the latest changes;
* Diff lines from 101 to 107 don't have proper ident;
* The code throws 2 additional warnings on the compile: unhandled error `GLib.FileError':
I think you should change the SpawnError to FileError.

* Lastly I would change diff line 109 to: error ("%s\n", e.message);

Other than that it is okay ;)

review: Needs Fixing

[lp:~alucryd/switchboard-plug-networking/no-ifconfig]

98. By Launchpad Translations on behalf of elementary-pantheon on 2015-07-04

Launchpad automatic translations update.

99. By Maxime Gauduin on 2015-07-04

Ditch deprecated ifconfig

Unmerged revisions

=== modified file 'src/Widgets/Device/DevicePage.vala'
--- src/Widgets/Device/DevicePage.vala	2015-06-23 21:22:11 +0000
+++ src/Widgets/Device/DevicePage.vala	2015-07-04 08:53:41 +0000
@@ -30,10 +30,10 @@
         private Gtk.Label sent;
         private Gtk.Label received;
 
-		private string sent_l = (_("Sent:") + SUFFIX);
-		private string received_l = (_("Received:") + SUFFIX);
+        private string sent_l = (_("Sent:") + SUFFIX);
+        private string received_l = (_("Received:") + SUFFIX);
 
-        public DevicePage.from_owner (DeviceItem? _owner) {           
+        public DevicePage.from_owner (DeviceItem? _owner) {
             owner = _owner;
             device = owner.get_item_device ();
 
@@ -50,16 +50,16 @@
 
             var device_img = new Gtk.Image.from_icon_name (owner.get_item_icon_name (), Gtk.IconSize.DIALOG);
             device_img.margin_end = 15;
-            
+
             var device_label = new Gtk.Label (Utils.type_to_string (device.get_device_type ()));
             device_label.get_style_context ().add_class ("h2");
-            
+
             control_switch = new Gtk.Switch ();
 
             var control_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
             control_box.pack_start (device_img, false, false, 0);
             control_box.pack_start (device_label, false, false, 0);
-            control_box.pack_end (control_switch, false, false, 0);     
+            control_box.pack_end (control_switch, false, false, 0);
 
             var activitybox = new Gtk.Box (Gtk.Orientation.VERTICAL, 1);
             activitybox.hexpand = true;
@@ -75,11 +75,10 @@
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
             details_box.pack_start (Utils.get_advanced_button_from_device (device), false, false, 0);
-
             activitybox.add (new Gtk.Label ("\n"));
             activitybox.add (sent);
             activitybox.add (received);
-            
+
             update_activity ();
             update_switch_state ();
 
@@ -89,11 +88,11 @@
             this.show_all ();
         }
 
-        private void update_activity () {         
+        private void update_activity () {
             string sent_bytes, received_bytes;
             get_activity_information (device.get_iface (), out sent_bytes, out received_bytes);
             sent.label = sent_l + sent_bytes ?? UNKNOWN;
-            received.label = received_l + received_bytes ?? UNKNOWN;         
+            received.label = received_l + received_bytes ?? UNKNOWN;
         }
 
         private void update_switch_state () {
@@ -101,36 +100,21 @@
         }
 
         /* Main method to get all information about the interface */
-        private void get_activity_information (string iface, out string received_bytes, out string transfered_bytes) {
+        private void get_activity_information (string iface, out string sent_bytes, out string received_bytes) {
+            sent_bytes = UNKNOWN;
             received_bytes = UNKNOWN;
-            transfered_bytes = UNKNOWN;
-
-    	    try {
-    	        string[] spawn_args = { "ifconfig", iface };
-    	    	string[] spawn_env = Environ.get ();
-    	    	string output;
-
-    	    	Process.spawn_sync ("/",
-    	    						spawn_args,
-    	    						spawn_env,
-    	    						SpawnFlags.SEARCH_PATH,
-    	    						null,
-    	    						out output,
-    	    						null,
-    	    						null);
-
-                string[] data = output.split ("\n");
-                foreach (string line in data) {
-                    if (line.contains ("RX bytes:")) {
-                        string[] inf3 = line.split (":");
-                        received_bytes = inf3[1].split ("  ")[0].split (" ", 2)[1].replace ("(", "").replace (")", "");
-                        transfered_bytes = inf3[2].split (" ", 2)[1].replace ("(", "").replace (")", "");
-                    }
-                }
-
-	        } catch (SpawnError e) {
-	        	error (e.message);
-	        }               
-        }                 
-    }  
+
+            try {
+                string tx_bytes, rx_bytes;
+
+                FileUtils.get_contents ("/sys/class/net/" + iface + "/statistics/tx_bytes", out tx_bytes);
+                FileUtils.get_contents ("/sys/class/net/" + iface + "/statistics/rx_bytes", out rx_bytes);
+
+                sent_bytes = format_size (uint64.parse (tx_bytes));
+                received_bytes = format_size (uint64.parse (rx_bytes));
+            } catch (FileError e) {
+                error ("%s\n", e.message);
+            }
+        }
+    }
 }