Skip to content

Commit 1342ee9

Browse files
authored
New Version (#26)
- Fixed ByteArray conversion error (Gnome < 3.32).
1 parent 7cba6a2 commit 1342ee9

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

Resource_Monitor@Ory0n/extension.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
const { St, GObject, NM, GLib, Shell, Gio, Clutter } = imports.gi;
2626

27-
const ByteArray = imports.byteArray;
28-
2927
const Main = imports.ui.main;
3028
const PanelMenu = imports.ui.panelMenu;
3129

@@ -912,8 +910,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
912910
_refreshCpu() {
913911
let file = Gio.file_new_for_path('/proc/stat');
914912
file.load_contents_async(null, (source, result) => {
915-
let contents = source.load_contents_finish(result);
916-
let lines = ByteArray.toString(contents[1]).split('\n');
913+
let contents = source.load_contents_finish(result)[1];
914+
let lines = String(contents).split('\n');
917915

918916
let entry = lines[0].trim().split(/\s+/);
919917
let cpuTot = 0;
@@ -942,8 +940,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
942940
_refreshRam() {
943941
let file = Gio.file_new_for_path('/proc/meminfo');
944942
file.load_contents_async(null, (source, result) => {
945-
let contents = source.load_contents_finish(result);
946-
let lines = ByteArray.toString(contents[1]).split('\n');
943+
let contents = source.load_contents_finish(result)[1];
944+
let lines = String(contents).split('\n');
947945

948946
let total, available, used;
949947

@@ -973,8 +971,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
973971
_refreshSwap() {
974972
let file = Gio.file_new_for_path('/proc/meminfo');
975973
file.load_contents_async(null, (source, result) => {
976-
let contents = source.load_contents_finish(result);
977-
let lines = ByteArray.toString(contents[1]).split('\n');
974+
let contents = source.load_contents_finish(result)[1];
975+
let lines = String(contents).split('\n');
978976

979977
let total, available, used;
980978

@@ -1004,8 +1002,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
10041002
_refreshDiskStats() {
10051003
let file = Gio.file_new_for_path('/proc/diskstats');
10061004
file.load_contents_async(null, (source, result) => {
1007-
let contents = source.load_contents_finish(result);
1008-
let lines = ByteArray.toString(contents[1]).split('\n');
1005+
let contents = source.load_contents_finish(result)[1];
1006+
let lines = String(contents).split('\n');
10091007

10101008
if (this.diskStatsMode === true) {
10111009
let field = this.diskStatsItems['All'];
@@ -1211,8 +1209,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
12111209

12121210
let file = Gio.file_new_for_path('/proc/net/dev');
12131211
file.load_contents_async(null, (source, result) => {
1214-
let contents = source.load_contents_finish(result);
1215-
let lines = ByteArray.toString(contents[1]).split('\n');
1212+
let contents = source.load_contents_finish(result)[1];
1213+
let lines = String(contents).split('\n');
12161214

12171215
for (let i = 2; i < lines.length - 1; i++) {
12181216
let line = lines[i];
@@ -1269,8 +1267,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
12691267

12701268
let file = Gio.file_new_for_path('/proc/net/dev');
12711269
file.load_contents_async(null, (source, result) => {
1272-
let contents = source.load_contents_finish(result);
1273-
let lines = ByteArray.toString(contents[1]).split('\n');
1270+
let contents = source.load_contents_finish(result)[1];
1271+
let lines = String(contents).split('\n');
12741272

12751273
for (let i = 2; i < lines.length - 1; i++) {
12761274
let line = lines[i];
@@ -1326,8 +1324,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button {
13261324
if (GLib.file_test(cpuTemperatureFile, GLib.FileTest.EXISTS)) {
13271325
let file = Gio.file_new_for_path(cpuTemperatureFile);
13281326
file.load_contents_async(null, (source, result) => {
1329-
let contents = source.load_contents_finish(result);
1330-
let temperature = parseInt(ByteArray.toString(contents[1])) / 1000;
1327+
let contents = source.load_contents_finish(result)[1];
1328+
let temperature = parseInt(String(contents)) / 1000;
13311329

13321330
if (this.cpuTemperatureFahrenheit) {
13331331
temperature = (temperature * 1.8) + 32;

0 commit comments

Comments
 (0)