Update cleaning

Author: konkor

common/Application.js

@@ -10,20 +10,20 @@
 
 imports.gi.versions.Gtk = '3.0';
 
-let d = new Date ();
+/*let d = new Date ();
 print ("\x1b[00;32m[" + d.toString().substring (0, d.toString().indexOf (" GMT")) + "." + (d.getMilliseconds() / 1000).toFixed(3).slice(2, 5) +
-  "](DD) [cpufreq][application]\x1b[0m Starting application");
+  "](DD) [cpufreq][application]\x1b[0m Starting application");*/
 
 const Gtk = imports.gi.Gtk;
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 
+const Logger = imports.common.Logger;
 const Convenience = imports.convenience;
 const cpu = imports.common.HelperCPUFreq;
 const Settings = imports.common.Settings;
-const Logger = imports.common.Logger;
 const MainWindow = imports.common.ui.MainWindow;
 
 var DEBUG_LVL = 0;
@@ -91,52 +91,39 @@ var CPUFreqApplication = new Lang.Class ({
       let v = options.lookup_value ("profile", null);
       if (v) [v, ] = v.get_string ();
       this.process_profile (v);
-      Logger.debug ("finishing loading profile: \`%s\`".format (v));
       //TODO: fix https://gitlab.gnome.org/GNOME/gjs/issues/232
       return 0;
     }
 
-    Logger.debug ("verbose:%s debug:%s extension:%s".format (DEBUG_LVL>0, DEBUG_LVL>1, this.extension));
+    //Logger.debug ("verbose:%s debug:%s extension:%s".format (DEBUG_LVL>0, DEBUG_LVL>1, this.extension));
     return -1;
   },
 
   vfunc_startup: function () {
-    Logger.info ("startup");
     this.parent();
     this.initialize ();
-
-    /*this.connect ('open', Lang.bind (this, (files) => {
-      print ("open", files.map(function(f) { return f.get_uri(); }));
-    }));*/
   },
 
   initialize: function () {
     if (this.settings) return;
-    Logger.info ("initialization ...");
     this.settings = new Settings.Settings ();
-    Logger.info ("Settings creatad.");
     cpu.init (this.settings);
-    Logger.info ("CPUFreq initialized.");
   },
 
   vfunc_activate: function () {
-    Logger.info ("activating ... " + !this.finishing);
     if (this.finishing) return;
     if (!this.active_window) {
       window = new MainWindow.MainWindow ({ application:this });
-      Logger.info ("created MainWindow");
       window.connect ("destroy", () => {
         return true;
       });
       window.show_all ();
       cpu.profile_changed_callback = Lang.bind (this, this.on_profile_changed);
-      Logger.info ("restoring saved " + this.settings.save);
       if (this.settings.save) cpu.restore_saved ();
-      Logger.info ("post_init " + !!window.cpanel);
       if (window.cpanel) window.cpanel.post_init ();
       else this.quit ();
       window.connect ("realize", () => {
-        Logger.info ("realize");
+        Logger.debug ("realize");
       });
     } else {
       if (this.extension) {

common/HelperCPUFreq.js

@@ -63,8 +63,6 @@ function init (prefs) {
   get_governors ();
   get_frequencies ();
   default_profile = get_default_profile ();
-
-  //get_profile ("Testing Profile");
 }
 
 function check_install () {
@@ -86,7 +84,6 @@ function check_install () {
     localctl = get_command_line_string (APPDIR + "/cpufreqctl version");
     debug ("Versions local:%s global:%s".format (localctl, globalctl));
     updated = localctl == globalctl;
-    //if (!updated) cpufreqctl_path = APPDIR + "/cpufreqctl";
   }
 }
 
@@ -354,7 +351,6 @@ function load_stage (prf) {
   } else if (stage == 3) {
     set_turbo (prf.turbo);
   } else if (stage == 4) {
-    //TODO: Test applying per core frequencies on pstate
     if (pstate_present) {
       GLib.spawn_command_line_sync (pkexec_path + " " + cpufreqctl_path + " min " + prf.minf);
     } else {

common/Settings.js

@@ -91,7 +91,6 @@ var Settings = new Lang.Class({
   update_user_profile: function () {
     let s = JSON.stringify (current);
     this.set_string (USER_PROFILE_KEY, s);
-    print ("Updating settings");
   },
 
   get monitor () { return this.get_int (MONITOR_KEY); },
@@ -101,7 +100,6 @@ var Settings = new Lang.Class({
     return _guid;
   },
   set guid (val) {
-    print ("set guid:", val, _guid);
     if (_guid == val) return;
     _guid = val;
     this.set_string (PROFILE_ID_KEY, _guid);
@@ -162,7 +160,6 @@ var Settings = new Lang.Class({
     return true;
   },
   set turbo (val) {
-    print ("set turbo");
     if (!current || (current.turbo == val)) return;
     current.turbo = val;
     this.update_user_profile ();
@@ -173,7 +170,6 @@ var Settings = new Lang.Class({
     return 1;
   },
   set cpu_cores (val) {
-    print ("set cores online");
     if (!current || (current.cpu == val)) return;
     current.cpu = val;
     this.update_user_profile ();
@@ -185,7 +181,6 @@ var Settings = new Lang.Class({
     return 0;
   },
   set min_freq (val) {
-    print ("set min_freq");
     if (!current) return;
     var equal = true;
     for (let i = 0; i < current.cpu; i++) {
@@ -201,7 +196,6 @@ var Settings = new Lang.Class({
     return 0;
   },
   set max_freq (val) {
-    print ("set max_freq");
     if (!current) return;
     var equal = true;
     for (let i = 0; i < current.cpu; i++) {
@@ -212,13 +206,11 @@ var Settings = new Lang.Class({
   },
 
   get governor () {
-    print ("get governor");
     if (current && current.core[0])
       return current.core[0].g;
     return "";
   },
   set governor (val) {
-    print ("set governor");
     if (!current) return;
     var equal = true;
     for (let i = 0; i < current.cpu; i++) {

common/ui/ControlPanel.js

@@ -234,9 +234,7 @@ var ControlPanel = new Lang.Class({
       }
     });
     this.add_submenu (this.activeg);
-    //this.pack_start (this.activeg, true, true, 0);
     if (this.userspace  && (cpu.frequencies.length > 0)) this.add_submenu (this.userspace);
-    //  this.pack_start (this.userspace, true, true, 0);
   },
 
   on_governor: function (o) {
@@ -273,7 +271,6 @@ var ControlPanel = new Lang.Class({
       this.sliders_build ();
       if (this.activeg.label.indexOf ("Powersave") > -1) {
         this.slider_max.sensitive = false;
-        //debug (this.activeg.label);
       } else if (this.activeg.label.indexOf ("Performance") > -1) {
         this.slider_min.sensitive = false;
       }

common/ui/InfoPanel.js

@@ -187,7 +187,6 @@ var InfoPanel = new Lang.Class({
         dis.close (null);
         if (model) {
           model = model.substring (model.indexOf (":") + 1).trim ();
-          //if (model.lastIndexOf ("@") > -1) model = model.substring (0, model.lastIndexOf ("@")).trim ();
           if (model.toLowerCase().lastIndexOf ("amd") > -1) this.amd = true;
           model = model.replace ("(R)", "®");
           model = model.replace ("(TM)", "™");
@@ -199,7 +198,7 @@ var InfoPanel = new Lang.Class({
           return model.trim ().toString ();
         }
       } catch (e) {
-        print ("Get CPU Error:", e.message);
+        Logger.error ("cpu_name", e.message);
       }
     }
     return "unknown processor";
@@ -235,7 +234,7 @@ var InfoPanel = new Lang.Class({
           distro = model;
         }
       } catch (e) {
-        print ("Get Release Error:", e.message);
+        Logger.error ("linux_kernel", e.message);
       }
     }
     let kernel_version = Helper.get_command_line_string ("uname -r");

common/ui/MainWindow.js

@@ -17,6 +17,7 @@ const Lang = imports.lang;
 
 var APPDIR = getCurrentFile ()[1];
 
+const Logger = imports.common.Logger;
 const cpu = imports.common.HelperCPUFreq;
 const InfoPanel = imports.common.ui.InfoPanel;
 const ControlPanel = imports.common.ui.ControlPanel;
@@ -39,7 +40,7 @@ var MainWindow = new Lang.Class ({
     if (!this.icon) try {
       this.icon = Gtk.Image.new_from_file (APPDIR + "/data/icons/cpufreq.svg").pixbuf;
     } catch (e) {
-      error (e.message);
+      Logger.error (e.message);
     }
     if (!cpu.installed) this.install ();
     else if (!cpu.updated) this.install (true);
@@ -99,8 +100,6 @@ var MainWindow = new Lang.Class ({
 
     this.prefs_button = new Gtk.Button ({always_show_image: true, tooltip_text:"Preferences"});
     this.prefs_button.image = Gtk.Image.new_from_icon_name ("application-menu-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
-    //this.prefs_button.image = Gtk.Image.new_from_gicon (new Gio.ThemedIcon({name: "cpufreq"}), Gtk.IconSize.SMALL_TOOLBAR);
-    //Gtk.Image.new_from_file (APPDIR + "/data/icons/application-menu-symbolic.svg");
     this.prefs_button.get_style_context ().add_class ("hb-button");
     this.prefs_button.set_relief (Gtk.ReliefStyle.NONE);
     this.hb.pack_end (this.prefs_button);
@@ -190,7 +189,7 @@ function get_css_provider () {
   try {
     cssp.load_from_file (css_file);
   } catch (e) {
-    print (e);
+    Logger.error (e);
     cssp = null;
   }
   return cssp;

common/ui/Switch.js

@@ -19,7 +19,6 @@ var Switch = new Lang.Class({
     this.parent ({orientation:Gtk.Orientation.HORIZONTAL,margin:8});
     state = state || false;
     this.margin_left = 16;
-    //this.margin_bottom = 8;
     this.get_style_context ().add_class ("switch");
     this.tooltip_text = tooltip;
 

prefs.js

@@ -272,7 +272,6 @@ var PageMonitorCPUFreq = new Lang.Class({
         this.pack_start (hbox, false, false, 0);
         this.cb_color = Gtk.CheckButton.new_with_label (_("Use color"));
         this.cb_color.tooltip_text = _("Colorful Monitor's title depending on warning state");
-        //this.cb_color.margin = 6;
         this.cb_color.active = color_show;
         hbox.pack_start (this.cb_color, true, true, 0);
         this.cb_color.connect ('toggled', Lang.bind (this, (o)=>{