Skip to content

Commit c71580d

Browse files
konkorkonkor
committed
Add Logger module
Update filenames and license to more compact view
1 parent 7cc3f26 commit c71580d

17 files changed

+105
-274
lines changed

‎common/application.js ‎common/Application.js

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2019 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
imports.gi.versions.Gtk = '3.0';
@@ -31,6 +19,7 @@ const Lang = imports.lang;
3119
const Convenience = imports.convenience;
3220
const cpu = imports.common.HelperCPUFreq;
3321
const Settings = imports.common.Settings;
22+
const Logger = imports.common.Logger;
3423
const MainWindow = imports.common.ui.MainWindow;
3524

3625
const DEBUG_LVL = 2;
@@ -54,6 +43,7 @@ var CPUFreqApplication = new Lang.Class ({
5443

5544
vfunc_startup: function() {
5645
this.parent();
46+
Logger.init (DEBUG_LVL);
5747
this.settings = new Settings.Settings ();
5848
cpu.init (this.settings);
5949
},
@@ -82,11 +72,3 @@ var CPUFreqApplication = new Lang.Class ({
8272
return cpu;
8373
}
8474
});
85-
86-
function debug (msg) {
87-
if (msg && (DEBUG_LVL > 1)) print ("[cpufreq][manager]", msg);
88-
}
89-
90-
function error (msg) {
91-
log ("[cpufreq][manager] (EE) " + msg);
92-
}

‎common/HelperCPUFreq.js

+6-18
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gio = imports.gi.Gio;
@@ -26,6 +14,7 @@ const Lang = imports.lang;
2614

2715
const APPDIR = getCurrentFile ()[1];
2816

17+
const Logger = imports.common.Logger;
2918
const Convenience = imports.convenience;
3019
const byteArrayToString = Convenience.byteArrayToString;
3120

@@ -665,13 +654,12 @@ function get_cpufreq_info (params, user) {
665654
return s;
666655
}
667656

668-
const DEBUG_LVL = 2;
669657
function debug (msg) {
670-
if (DEBUG_LVL > 1) Convenience.debug ("cpu helper", msg);
658+
Logger.debug ("cpu helper", msg);
671659
}
672660

673661
function error (msg) {
674-
Convenience.error ("cpu helper", msg);
662+
Logger.error ("cpu helper", msg);
675663
}
676664

677665
function getCurrentFile () {

‎common/Logger.js

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
4+
*
5+
* Free Software Foundation, either version 3 of the License, or
6+
* (at your option) any later version.
7+
* You should have received a copy of the GNU General Public License along
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
9+
*/
10+
11+
var DEBUG_LVL = 0;
12+
13+
var Format = imports.format;
14+
String.prototype.format = Format.format;
15+
16+
//DOMAIN ERROR:0:RED, INFO:1:BLUE, DEBUG:2:GREEN
17+
const domain_color = ["00;31","00;34","00;32"];
18+
const domain_name = ["EE","II","DD"];
19+
20+
function init (level) {
21+
level = level || 0;
22+
DEBUG_LVL = level;
23+
}
24+
25+
function info (source, msg) {
26+
if (DEBUG_LVL > 0)
27+
print_msg (1, source, msg);
28+
}
29+
30+
function debug (source, msg) {
31+
if (DEBUG_LVL > 1)
32+
print_msg (2, source, msg);
33+
}
34+
35+
function error (source, msg) {
36+
print_msg (0, source, msg);
37+
}
38+
39+
function print_msg (domain, source, output) {
40+
let ds = new Date().toString ();
41+
let i = ds.indexOf (" GMT");
42+
if (i > 0) ds = ds.substring (0, i);
43+
44+
if (domain == 2) print ("\x1b[%sm[%s](%s) [cpufreq][%s]\x1b[0m %s".format (
45+
domain_color[domain],ds,domain_name[domain],source,output));
46+
else {
47+
log ("(%s) [cpufreq][%s] %s".format (domain_name[domain], source, output));
48+
if (logger) logger.put ("[%s](%s) %s".format (ds, domain_name[domain], output));
49+
}
50+
}

‎common/preferences.js ‎common/Preferences.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Author (C) 2016-2018 konkor <[email protected]>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

‎common/Settings.js

+3-22
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,18 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Lang = imports.lang;
2412
const Gio = imports.gi.Gio;
2513

2614
const SAVE_SETTINGS_KEY = 'save-settings';
2715
const REMEMBERED_KEY = 'remember-profile';
28-
/*const TURBO_BOOST_KEY = 'turbo-boost';
29-
const GOVERNOR_KEY = 'governor';
30-
const CPU_FREQ_KEY = 'cpu-freq';
31-
const MIN_FREQ_KEY = 'min-freq';
32-
const MAX_FREQ_KEY = 'max-freq';
33-
const MIN_FREQ_PSTATE_KEY = 'min-freq-pstate';
34-
const MAX_FREQ_PSTATE_KEY = 'max-freq-pstate';*/
3516
const PROFILES_KEY = 'profiles';
3617
const PROFILE_KEY = 'profile';
3718
const MONITOR_KEY = 'monitor';

‎common/ui/ControlPanel.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

‎common/ui/InfoPanel.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const GLib = imports.gi.GLib;

‎common/ui/ProfileItems.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

‎common/ui/SideMenu.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2019 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

‎common/ui/Slider.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

‎common/ui/Switch.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
/*
2-
* CPUFreq Manager - a lightweight CPU frequency scaling monitor
3-
* and powerful CPU management tool
2+
* This is a part of CPUFreq Manager
3+
* Copyright (C) 2016-2019 konkor <konkor.github.io>
44
*
5-
* Copyright (C) 2016-2018 konkor <github.com/konkor>
6-
*
7-
* This file is part of CPUFreq Manager.
8-
*
9-
* CPUFreq Manager is free software: you can redistribute it and/or modify it
10-
* under the terms of the GNU General Public License as published by the
115
* Free Software Foundation, either version 3 of the License, or
126
* (at your option) any later version.
13-
*
14-
* CPUFreq Manager is distributed in the hope that it will be useful, but
15-
* WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
17-
* See the GNU General Public License for more details.
18-
*
197
* You should have received a copy of the GNU General Public License along
20-
* with this program. If not, see <http://www.gnu.org/licenses/>.
8+
* with this program. If not, see <http://www.gnu.org/licenses/>.
219
*/
2210

2311
const Gtk = imports.gi.Gtk;

0 commit comments

Comments
 (0)