Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions extension.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,6 +291,7 @@ var VitalsMenuButton = GObject.registerClass({
},
'storage' : { 'icon': 'storage-symbolic.svg' },
'battery' : { 'icon': 'battery-symbolic.svg' },
'io-devices' : { 'icon': 'system-symbolic.svg' },
'gpu' : { 'icon': 'gpu-symbolic.svg' }
}

Expand DownExpand Up@@ -334,7 +335,7 @@ var VitalsMenuButton = GObject.registerClass({
let settings = [ 'use-higher-precision', 'alphabetize', 'hide-zeros',
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'network-public-ip-show-flag', 'network-speed-format', 'network-speed-unit', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];

for (let setting of Object.values(settings))
Expand DownExpand Up@@ -674,7 +675,11 @@ var VitalsMenuButton = GObject.registerClass({
item.value = value;
} else if (type.includes('-group')) {
// update text next to group header
let group = type.split('-')[0];
let group = type.replace('-group', '');
// for multi-word sensor names like io-devices, use full name
// for network-rx-group, fall back to first segment
if (!this._groups[group])
group = type.split('-')[0];
if (this._groups[group]) {
this._groups[group].status.text = value;
this._sensorMenuItems[type] = this._groups[group];
Expand All@@ -689,8 +694,15 @@ var VitalsMenuButton = GObject.registerClass({
_appendMenuItem(sensor, key) {
let split = sensor.type.split('-');
let type = split[0];
let icon = (split.length == 2)?'icon-' + split[1]:'icon';
let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, icon));
let iconKey = (split.length == 2)?'icon-' + split[1]:'icon';

// special handling for multi-word sensor names
if (sensor.type == 'io-devices' || sensor.type == 'io-devices-group') {
type = sensor.type;
iconKey = 'icon';
}

let gicon = Gio.icon_new_for_string(this._sensorIconPath(type, iconKey));

let item = new MenuItem.MenuItem(gicon, key, sensor.label, sensor.value, this._hotLabels[key]);
item.connect('toggle', (self) => {
Expand Down
4 changes: 2 additions & 2 deletions prefs.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ const Settings = new GObject.Class({
'alphabetize', 'hide-zeros', 'include-public-ip',
'network-public-ip-show-flag', 'show-battery', 'fixed-widths',
'hide-icons', 'menu-centered', 'include-static-info',
'show-gpu', 'include-static-gpu-info' ];
'show-gpu', 'include-static-gpu-info', 'show-io-devices' ];

for (let key in sensors) {
let sensor = sensors[key];
Expand All@@ -62,7 +62,7 @@ const Settings = new GObject.Class({
}

// process individual drop down sensor preferences
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
sensors = [ 'position-in-panel', 'unit', 'network-speed-format', 'network-speed-unit', 'memory-measurement', 'storage-measurement', 'battery-slot', 'icon-style' ];
for (let key in sensors) {
let sensor = sensors[key];

Expand Down
62 changes: 62 additions & 0 deletions prefs.ui
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,40 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Speed Unit</property>
</object>
</child>
<child>
<object class="GtkComboBoxText" id="network-speed-unit">
<property name="can_focus">0</property>
<property name="active">0</property>
<items>
<item translatable="yes">Auto</item>
<item translatable="yes">Kbps / KiB/s</item>
<item translatable="yes">Mbps / MiB/s</item>
</items>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand DownExpand Up@@ -996,6 +1030,34 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">0</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label" translatable="yes">Monitor I/O Devices</property>
</object>
</child>
<child>
<object class="GtkSwitch" id="show-io-devices">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin-end">5</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</child>
<child type="label_item">
Expand Down
Binary file modifiedschemas/gschemas.compiled
Binary file not shown.
10 changes: 10 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="i" name="network-speed-unit">
<default>0</default>
<summary>Fixed network speed unit</summary>
<description>Fix the network speed unit instead of auto-scaling. 0=Auto, 1=Kbps/KiB/s, 2=Mbps/MiB/s</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand DownExpand Up@@ -159,5 +164,10 @@
<summary>Icon styles</summary>
<description>Set the style for the displayed sensor icons ('original', 'updated')</description>
</key>
<key type="b" name="show-io-devices">
<default>false</default>
<summary>Monitor I/O devices</summary>
<description>Display connected USB and input devices</description>
</key>
</schema>
</schemalist>
34 changes: 33 additions & 1 deletion sensors.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@

import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import Gio from 'gi://Gio';
import * as SubProcessModule from './helpers/subprocess.js';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
Expand DownExpand Up@@ -121,7 +122,7 @@ export const Sensors = GObject.registerClass({
this._queryTempVoltFan(callback, sensor);
} else {
// directly call queryFunction below
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1);
let method = '_query' + sensor[0].toUpperCase() + sensor.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
this[method](callback, dwell);
}
}
Expand DownExpand Up@@ -399,6 +400,37 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'storage', avail, 'storage-group', 'storage');
}

_queryIoDevices(callback) {
// read USB device info from sysfs using the same File module as other sensors
let usbBase = '/sys/bus/usb/devices/';
let deviceCount = 0;

new FileModule.File(usbBase).list().then(entries => {
for (let entry of entries) {
// skip interfaces (contain ':'), only want actual devices
if (entry.indexOf(':') !== -1) continue;

let productPath = usbBase + entry + '/product';

new FileModule.File(productPath).read().then(product => {
deviceCount++;
new FileModule.File(usbBase + entry + '/manufacturer').read().then(mfr => {
this._returnValue(callback, product, mfr, 'io-devices', 'string');
}).catch(err => {
this._returnValue(callback, product, '', 'io-devices', 'string');
});
}).catch(err => {
});
}

// update group label after listing
GLib.timeout_add(GLib.PRIORITY_DEFAULT, 200, () => {
this._returnValue(callback, 'io-devices', deviceCount + ' devices', 'io-devices-group', 'string');
return GLib.SOURCE_REMOVE;
});
}).catch(err => { });
}

_queryBattery(callback) {
let battery_slot = this._settings.get_int('battery-slot');

Expand Down
33 changes: 26 additions & 7 deletions values.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,11 +141,23 @@ export const Values = GObject.registerClass({

break;
case 'speed':
let fixed_unit = this._settings.get_int('network-speed-unit');

if (value > 0) {
if (use_bps) value *= 8;
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));

if (fixed_unit > 0) {
// fixed unit: force to K (exp=1) or M (exp=2)
exp = fixed_unit;
value = parseFloat((value / Math.pow(unit, exp)));
} else {
// auto: current behavior
exp = Math.floor(Math.log(value) / Math.log(unit));
if (value >= Math.pow(unit, exp) * (unit - 0.05)) exp++;
value = parseFloat((value / Math.pow(unit, exp)));
}
} else {
exp = 0;
}

format = (use_higher_precision)?'%.1f %s':'%.0f %s';
Expand DownExpand Up@@ -253,22 +265,29 @@ export const Values = GObject.registerClass({
if (type == 'temperature' || type == 'voltage' || type == 'fan') {
let vals = Object.values(this._history[type]).map(x => parseFloat(x[1]));

// for fans, exclude 0 RPM ghost sensors from average calculation (#547)
let avgVals = vals;
if (type == 'fan') {
let nonZero = vals.filter(v => v > 0);
if (nonZero.length > 0) avgVals = nonZero;
}

// show value in group even if there is one value present
let sum = vals.reduce((a, b) => a + b);
let avg = this._legible(sum / vals.length, format);
let sum = avgVals.reduce((a, b) => a + b);
let avg = this._legible(sum / avgVals.length, format);
output.push({ label: type, value: avg, type: type + '-group', key: '' });

// If only one value is present, don't display avg, min and max
if (vals.length > 1) {
output.push({ label: 'Average', value: avg, type, key: '__' + type + '_avg__' });

// calculate Minimum value
let min = Math.min(...vals);
let min = Math.min(...avgVals);
min = this._legible(min, format);
output.push({ label: 'Minimum', value: min, type, key: '__' + type + '_min__' });

// calculate Maximum value
let max = Math.max(...vals);
let max = Math.max(...avgVals);
max = this._legible(max, format);
output.push({ label: 'Maximum', value: max, type, key: '__' + type + '_max__' });
}
Expand Down