|
24 | 24 |
|
25 | 25 | const { St, GObject, NM, GLib, Shell, Gio, Clutter } = imports.gi; |
26 | 26 |
|
27 | | -const ByteArray = imports.byteArray; |
28 | | - |
29 | 27 | const Main = imports.ui.main; |
30 | 28 | const PanelMenu = imports.ui.panelMenu; |
31 | 29 |
|
@@ -912,8 +910,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
912 | 910 | _refreshCpu() { |
913 | 911 | let file = Gio.file_new_for_path('/proc/stat'); |
914 | 912 | 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'); |
917 | 915 |
|
918 | 916 | let entry = lines[0].trim().split(/\s+/); |
919 | 917 | let cpuTot = 0; |
@@ -942,8 +940,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
942 | 940 | _refreshRam() { |
943 | 941 | let file = Gio.file_new_for_path('/proc/meminfo'); |
944 | 942 | 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'); |
947 | 945 |
|
948 | 946 | let total, available, used; |
949 | 947 |
|
@@ -973,8 +971,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
973 | 971 | _refreshSwap() { |
974 | 972 | let file = Gio.file_new_for_path('/proc/meminfo'); |
975 | 973 | 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'); |
978 | 976 |
|
979 | 977 | let total, available, used; |
980 | 978 |
|
@@ -1004,8 +1002,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
1004 | 1002 | _refreshDiskStats() { |
1005 | 1003 | let file = Gio.file_new_for_path('/proc/diskstats'); |
1006 | 1004 | 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'); |
1009 | 1007 |
|
1010 | 1008 | if (this.diskStatsMode === true) { |
1011 | 1009 | let field = this.diskStatsItems['All']; |
@@ -1211,8 +1209,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
1211 | 1209 |
|
1212 | 1210 | let file = Gio.file_new_for_path('/proc/net/dev'); |
1213 | 1211 | 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'); |
1216 | 1214 |
|
1217 | 1215 | for (let i = 2; i < lines.length - 1; i++) { |
1218 | 1216 | let line = lines[i]; |
@@ -1269,8 +1267,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
1269 | 1267 |
|
1270 | 1268 | let file = Gio.file_new_for_path('/proc/net/dev'); |
1271 | 1269 | 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'); |
1274 | 1272 |
|
1275 | 1273 | for (let i = 2; i < lines.length - 1; i++) { |
1276 | 1274 | let line = lines[i]; |
@@ -1326,8 +1324,8 @@ var ResourceMonitor = class ResourceMonitor extends PanelMenu.Button { |
1326 | 1324 | if (GLib.file_test(cpuTemperatureFile, GLib.FileTest.EXISTS)) { |
1327 | 1325 | let file = Gio.file_new_for_path(cpuTemperatureFile); |
1328 | 1326 | 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; |
1331 | 1329 |
|
1332 | 1330 | if (this.cpuTemperatureFahrenheit) { |
1333 | 1331 | temperature = (temperature * 1.8) + 32; |
|
0 commit comments