Update fix restoring user profile after battery event

Add battery_test for simulations of battery events and additional debug strings

Author: konkor

extension.js

@@ -111,11 +111,14 @@ const FrequencyIndicator = new Lang.Class({
         error (e.message);
         return;
       }
-      this.on_power_state ();
+      this.on_power_state (proxy.State, proxy.Percentage);
       if (save && first_boot && !guid_battery) this.launch_app ("--profile=user");
       first_boot = false;
       GLib.timeout_add (0, 8000, () => {
-        powerID = this.power.connect ('g-properties-changed', this.on_power_state.bind (this));
+        powerID = this.power.connect ('g-properties-changed', (o,a,b) => {
+          debug ("power g-properties-changed: %s:%s:%s".format (o,a,b));
+          this.on_power_state (this.power.State, this.power.Percentage);
+        });
       });
     });
   },
@@ -150,22 +153,29 @@ const FrequencyIndicator = new Lang.Class({
     }
 
     if ((key == LABEL_KEY) && !monitor_timeout) this.statusLabel.set_text (this.get_title ());
+
+    if ((key == "power-state") || (key == "power-percentage")) {
+      debug ("power-state changed...");
+      this.on_power_state (o.get_uint ("power-state"), o.get_double ("power-percentage"));
+    }
   },
 
-  on_power_state: function () {
+  on_power_state: function (state, percentage) {
     let id = eprofiles[1].guid;
-    debug ("on_power_state: %d %.2f%%".format (this.power.State, this.power.Percentage));
-    if (!id || id == guid_battery) return;
-    if (this.power.State == 2) {
+    //debug ("on_power_state: %s %s%%".format (this.power.State, this.power.Percentage));
+    debug ("on_power_state: %s %s%%".format (state, percentage));
+    if (!id) return;
+    if (state == 2) {
       //on battery
-      if (this.power.Percentage < eprofiles[1].percent) {
+      if (id == guid_battery) return;
+      if (percentage < eprofiles[1].percent) {
         this.schedule_profile ('--no-save --profile=' + id);
         guid_battery = id;
       }
     } else {
       //restoring prev state
       if (guid_battery == this.guid) return;
-      if (this.power.Percentage >= eprofiles[1].percent) {
+      if (percentage >= eprofiles[1].percent) {
         this.schedule_profile ('--profile=user');
         guid_battery = this.guid;
       }
@@ -179,16 +189,16 @@ const FrequencyIndicator = new Lang.Class({
 
   schedule_profile: function (options) {
     if (scheduleID) this.unschedule_profile ();
-    scheduleID = GLib.timeout_add (0, 4000, () => {
+    scheduleID = GLib.timeout_add (0, 5000, () => {
       this.launch_app (options);
       scheduleID = 0;
     });
   },
 
   launch_app: function (options) {
     let extra = "";
-    if (Logger.debug_lvl == 2) extra = " --debug";
-    else if (Logger.debug_lvl == 1) extra = " --verbose";
+    /*if (Logger.debug_lvl == 2) extra = " --debug";
+    else if (Logger.debug_lvl == 1) extra = " --verbose";*/
     options = options || "--extension";
     info ("launch_app " + options + extra);
     GLib.spawn_command_line_async ("%s %s".format (APP_PATH, options + extra));

schemas/gschemas.compiled

@@ -141,5 +141,17 @@
       <description>Window maximized</description>
     </key>
 
+    <key type="u" name="power-state">
+      <default>0</default>
+      <summary>Debug Power State</summary>
+      <description>Emulate Power State</description>
+    </key>
+
+    <key type="d" name="power-percentage">
+      <default>0.0</default>
+      <summary>Debug Power Percentage</summary>
+      <description>Emulate Power Percentage</description>
+    </key>
+
   </schema>
 </schemalist>

schemas/org.gnome.shell.extensions.cpufreq.gschema.xml

@@ -0,0 +1,81 @@
+#!/usr/bin/gjs
+
+/*
+ * This is a part of CPUFreq Manager
+ * Copyright (C) 2016-2019 konkor <konkor.github.io>
+ *
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+
+var APPDIR = getCurrentFile ()[1];
+imports.searchPath.unshift (APPDIR);
+const Convenience = imports.convenience;
+
+let settings = Convenience.getSettings ();
+
+
+print ("battery");
+set_percentage (100);
+set_state (2);
+sleep (2000);
+
+set_percentage (90);
+sleep (2000);
+set_percentage (80);
+sleep (2000);
+set_percentage (70);
+sleep (2000);
+set_percentage (50);
+sleep (2000);
+
+set_state (4);
+sleep (2000);
+
+set_percentage (70);
+sleep (2000);
+set_percentage (80);
+sleep (2000);
+set_percentage (90);
+sleep (2000);
+
+set_percentage (100);
+set_state (0);
+
+
+function sleep (ms) {
+  print ("sleeping " + ms + "ms");
+  //GLib.usleep (ms);
+  ms = ms || 0;
+  let context = GLib.MainContext.default ();
+  let d = Date.now ();
+  while ((Date.now() - d) < ms) context.iteration (false);
+}
+
+function set_state (state) {
+  print ("setting state " + state);
+  settings.set_uint ('power-state', state);
+}
+
+function set_percentage (state) {
+  print ("battery percentage " + state + "%");
+  settings.set_double ('power-percentage', state);
+}
+
+function getCurrentFile () {
+  let stack = (new Error()).stack;
+  let stackLine = stack.split("\n")[1];
+  if (!stackLine)
+    throw new Error ("Could not find current file");
+  let match = new RegExp ("@(.+):\\d+").exec(stackLine);
+  if (!match)
+    throw new Error ("Could not find current file");
+  let path = match[1];
+  let file = Gio.File.new_for_path (path).get_parent();
+  return [file.get_path(), file.get_parent().get_path(), file.get_basename()];
+}