Merge lp:~jonathanlambrechts/do-plugins/MultipleBattery into lp:do-plugins/docklets

[Jonathan Lambrechts]

[Jonathan Lambrechts (jonathanlambrechts)]

Hi,
this is a proposition to use the sysfs instead of the proc interface and handle multiple batteries in the Battery applet.
This branch applies and cleans up the patch of the bug #390996.
It's a simplification of the UpdateBattStat method.

Jonathan

[Robert Dyer (psybers)]

This looks promising. I will probably do something along these lines at some point.

[Robert Dyer (psybers)]

Thanks for the submission. I am rejecting because a) we split Docky out into its own app and b) for Docky 2 I went ahead and implemented similar functionality (supporting multiple batteries) for that docklet.

review: Disapprove

Unmerged revisions

66. By Jonathan Lambrechts <email address hidden> on 2009-07-29

Use sysfs and handle multiple battery in battery monitor applet

=== modified file 'BatteryMonitor/src/BatteryMonitor.cs'
--- BatteryMonitor/src/BatteryMonitor.cs	2009-06-03 15:40:26 +0000
+++ BatteryMonitor/src/BatteryMonitor.cs	2009-07-29 07:01:14 +0000
@@ -37,8 +37,7 @@
 	
 	public class BatteryMonitor : AbstractDockletItem
 	{
-		const string BattInfoPath = "/proc/acpi/battery/BAT0/info";
-		const string BattStatePath = "/proc/acpi/battery/BAT0/state";
+		const string PowerSupplyPath ="/sys/class/power_supply";
 		
 		const string BottomSvg  = "battery_bottom.svg";
 		const string InsideSvg  = "battery_inside_{0}.svg";
@@ -49,8 +48,6 @@
 		int current_capacity;
 		uint timer;
 		
-		Regex number_regex;
-		
 		double Capacity {
 			get {
 				return (double) current_capacity / max_capacity;
@@ -71,10 +68,6 @@
 		
 		public BatteryMonitor ()
 		{
-			number_regex = new Regex ("[0-9]+");
-			
-			max_capacity = GetBatteryCapacity ();
-			
 			UpdateBattStat ();
 			
 			timer = GLib.Timeout.Add (20 * 1000, UpdateBattStat);
@@ -90,66 +83,42 @@
 			RedrawIcon ();
 		}
 		
-		int GetBatteryCapacity ()
+		string ReadFile (string path) 
 		{
-			int capacity = 1;
-			
-			if (File.Exists (BattInfoPath)) {
-				using (StreamReader reader = new StreamReader (BattInfoPath)) {
-					string line;
-					while (!reader.EndOfStream) {
-						line = reader.ReadLine ();
-						if (!line.StartsWith ("last full capacity"))
-							continue;
-						
-						try {
-							capacity = Convert.ToInt32 (number_regex.Matches (line) [0].Value);
-						} catch { }
-						break;
-					}
-				}
-			}
-			
-			return capacity;
+			StreamReader file = new StreamReader (path);
+			string r = file.ReadLine ();
+			file.Close();
+			return r;
 		}
 		
 		bool UpdateBattStat ()
 		{
-			string capacity = null;
-			string chargeState = null;
-			
-			if (!File.Exists (BattStatePath)) {
-				SetText ("No Battery Found");
-				current_capacity = 0;
-				max_capacity = 1;
-				
-				RedrawIcon ();
-				return true;
-			}
-			
-			using (StreamReader reader = new StreamReader (BattStatePath)) {
-				string line;
-				while (!reader.EndOfStream) {
-					if (!string.IsNullOrEmpty (capacity) && !string.IsNullOrEmpty (chargeState))
-						break;
-					
-					line = reader.ReadLine ();
-					if (line.StartsWith ("remaining capacity")) {
-						capacity = line;
+			current_capacity = 0;
+			max_capacity = 0;
+			string full_text = "";
+			int n_devices = 0;
+			try {
+				foreach (string file in Directory.GetDirectories (PowerSupplyPath) ) {
+					if (ReadFile (file + "/type") != "Battery")
 						continue;
-					}
-					
-					if (line.StartsWith ("charging state"))
-						chargeState = line;
+					n_devices ++;
+					if (n_devices != 1)
+						full_text += " - ";
+					int d_current = Convert.ToInt32 (ReadFile (file + "/charge_now"));
+					int d_max = Convert.ToInt32 (ReadFile (file + "/charge_full"));
+					string name = ReadFile (file + "/model_name");
+					full_text += name + string.Format (" {0:0.0}%", 100 * d_current / d_max);
+					current_capacity += d_current;
+					max_capacity += d_max;
 				}
-			}
-			
-			try {
-				current_capacity = Convert.ToInt32 (number_regex.Matches (capacity) [0].Value);
 			} catch { }
-			
+			if(n_devices == 0){
+				max_capacity = 1;
+				SetText ("No Battery Found");
+			} else {
+				SetText (full_text);
+			}
 			RedrawIcon ();
-			SetText (string.Format ("{0:0.0}%", Capacity * 100));
 			return true;
 		}