lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactoring 1/?

Browse Source
This commit is contained in:
Turann_
2026-01-27 10:01:04 +03:00
parent 382e548d2b
commit cfacfc1366
3 changed files with 85 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/Battery.qml
+3 -3
View File
@@ -53,9 +53,9 @@ Item {
readonly property bool testPluggedIn: false
readonly property string deviceNativePath: widgetSettings.deviceNativePath || ""
readonly property var battery: BatteryService.findUPowerDevice(deviceNativePath)
readonly property var bluetoothDevice: deviceNativePath ? BatteryService.findBluetoothDevice(deviceNativePath) : null
readonly property var device: bluetoothDevice || battery
readonly property var device: BatteryService.resolveDevice(deviceNativePath)
readonly property var battery: device && !BatteryService.isBluetoothDevice(device) ? device : null
readonly property var bluetoothDevice: device && BatteryService.isBluetoothDevice(device) ? device : null
readonly property bool hasBluetoothBattery: BatteryService.isBluetoothDevice(device)
readonly property bool isReady: testMode ? true : (initializationComplete && BatteryService.isDeviceReady(device))
Modules/Panels/Battery/BatteryPanel.qml
+13 -53
View File
@@ -35,15 +35,9 @@ SmartPanel {
}
readonly property string deviceNativePath: getBatteryDevicePath()
readonly property var selectedBattery: BatteryService.findUPowerDevice(deviceNativePath)
readonly property var selectedBluetoothDevice: deviceNativePath ? BatteryService.findBluetoothDevice(deviceNativePath) : null
readonly property var selectedDevice: {
var dev = selectedBluetoothDevice || selectedBattery;
if (BatteryService.isDevicePresent(dev))
return dev;
return allDevices.length > 0 ? allDevices[0] : null;
}
// Use the centralized helper to find the specific device or fallback to primary
readonly property var selectedDevice: BatteryService.resolveDevice(deviceNativePath)
// Check if selected device is actually present/connected
readonly property bool isDevicePresent: BatteryService.isDevicePresent(selectedDevice)
@@ -52,51 +46,17 @@ SmartPanel {
readonly property int percent: isReady ? Math.round(BatteryService.getPercentage(selectedDevice)) : -1
readonly property bool isCharging: BatteryService.isCharging(selectedDevice)
readonly property bool isPluggedIn: BatteryService.isPluggedIn(selectedDevice)
readonly property bool healthAvailable: (isReady && selectedBattery && selectedBattery.healthSupported) || (selectedBattery && BatteryService.healthAvailable)
readonly property int healthPercent: (isReady && selectedBattery && selectedBattery.healthSupported) ? Math.round(selectedBattery.healthPercentage) : BatteryService.healthPercent
readonly property bool isLaptopBattery: selectedDevice && !BatteryService.isBluetoothDevice(selectedDevice)
readonly property bool healthAvailable: (isReady && isLaptopBattery && selectedDevice.healthSupported) || (isLaptopBattery && BatteryService.healthAvailable)
readonly property int healthPercent: (isReady && isLaptopBattery && selectedDevice.healthSupported) ? Math.round(selectedDevice.healthPercentage) : BatteryService.healthPercent
readonly property string deviceName: BatteryService.getDeviceName(selectedDevice)
readonly property string panelTitle: deviceName ? `${I18n.tr("common.battery")} - ${deviceName}` : I18n.tr("common.battery")
readonly property var allDevices: {
var list = [];
var seenPaths = new Set();
// Add UPower batteries
if (UPower.devices) {
var upowerArray = UPower.devices.values || [];
for (var i = 0; i < upowerArray.length; i++) {
var d = upowerArray[i];
if (BatteryService.isDevicePresent(d) && d.type === UPowerDeviceType.Battery) {
if (d.nativePath && !seenPaths.has(d.nativePath)) {
list.push(d);
seenPaths.add(d.nativePath);
}
}
}
}
// Add Bluetooth batteries
if (BluetoothService.devices) {
var btArray = BluetoothService.devices.values || [];
for (var j = 0; j < btArray.length; j++) {
var btd = btArray[j];
if (BatteryService.isDevicePresent(btd) && btd.batteryAvailable) {
// Bluetooth devices use address as unique ID
if (btd.address && !seenPaths.has(btd.address)) {
list.push(btd);
seenPaths.add(btd.address);
}
}
}
}
// Fallback: if no specific batteries found but display device is a battery, use it
if (list.length === 0 && UPower.displayDevice && UPower.displayDevice.type === UPowerDeviceType.Battery && BatteryService.isDevicePresent(UPower.displayDevice)) {
list.push(UPower.displayDevice);
}
return list;
}
// Use the centralized list of all devices
readonly property var allDevices: BatteryService.devices
readonly property var laptopBatteries: allDevices.filter(d => !BatteryService.isBluetoothDevice(d))
readonly property var otherDevices: allDevices.filter(d => BatteryService.isBluetoothDevice(d))
@@ -302,7 +262,7 @@ SmartPanel {
ColumnLayout {
Layout.fillWidth: true
spacing: Style.marginS
visible: modelData.healthSupported || (modelData === selectedBattery && BatteryService.healthAvailable)
visible: modelData.healthSupported || (modelData === BatteryService.primaryDevice && BatteryService.healthAvailable)
RowLayout {
Layout.fillWidth: true
spacing: Style.marginS
@@ -333,14 +293,14 @@ SmartPanel {
height: parent.height
radius: parent.radius
width: {
var h = modelData.healthSupported ? modelData.healthPercentage : (modelData === selectedBattery ? BatteryService.healthPercent : 0);
var h = modelData.healthSupported ? modelData.healthPercentage : (modelData === BatteryService.primaryDevice ? BatteryService.healthPercent : 0);
if (h <= 0)
return 0;
var ratio = Math.max(0, Math.min(1, h / 100));
return parent.width * ratio;
}
color: {
var h = modelData.healthSupported ? modelData.healthPercentage : (modelData === selectedBattery ? BatteryService.healthPercent : 0);
var h = modelData.healthSupported ? modelData.healthPercentage : (modelData === BatteryService.primaryDevice ? BatteryService.healthPercent : 0);
return h >= 80 ? Color.mPrimary : (h >= 50 ? Color.mTertiary : Color.mError);
}
}
@@ -349,7 +309,7 @@ SmartPanel {
Layout.preferredWidth: 40 * Style.uiScaleRatio
horizontalAlignment: Text.AlignRight
readonly property int h: modelData.healthSupported ? Math.round(modelData.healthPercentage) : (modelData === selectedBattery ? BatteryService.healthPercent : -1)
readonly property int h: modelData.healthSupported ? Math.round(modelData.healthPercentage) : (modelData === BatteryService.primaryDevice ? BatteryService.healthPercent : -1)
text: h >= 0 ? `${h}%` : "--"
color: Color.mOnSurface
pointSize: Style.fontSizeS
Services/Hardware/BatteryService.qml
+69 -79
View File
@@ -11,14 +11,53 @@ import qs.Services.UI
Singleton {
id: root
// Cached device lookups (computed once, used by all properties)
readonly property var _laptopBattery: {
if (!UPower.devices)
return UPower.displayDevice;
// 1. Centralized list of all batteries
readonly property var devices: {
var list = [];
var seenPaths = new Set();
var devices = UPower.devices.values || [];
// Add UPower batteries
if (UPower.devices) {
var upowerArray = UPower.devices.values || [];
for (var i = 0; i < upowerArray.length; i++) {
var d = upowerArray[i];
if (isDevicePresent(d) && d.type === UPowerDeviceType.Battery) {
if (d.nativePath && !seenPaths.has(d.nativePath)) {
list.push(d);
seenPaths.add(d.nativePath);
}
}
}
}
// 1. Explicitly look for BAT0 first
// Add Bluetooth batteries
if (BluetoothService.devices) {
var btArray = BluetoothService.devices.values || [];
for (var j = 0; j < btArray.length; j++) {
var btd = btArray[j];
if (isDevicePresent(btd) && btd.batteryAvailable) {
// Bluetooth devices use address as unique ID
if (btd.address && !seenPaths.has(btd.address)) {
list.push(btd);
seenPaths.add(btd.address);
}
}
}
}
// Fallback: if no specific batteries found but display device is a battery, use it
if (list.length === 0 && UPower.displayDevice && UPower.displayDevice.type === UPowerDeviceType.Battery && isDevicePresent(UPower.displayDevice)) {
list.push(UPower.displayDevice);
}
return list;
}
// 2. Determine the primary device (System Battery)
readonly property var primaryDevice: {
if (devices.length === 0)
return null;
// Prioritize BAT0
for (var i = 0; i < devices.length; i++) {
var d = devices[i];
if (d && (d.nativePath === "BAT0" || d.objectPath === "/org/freedesktop/UPower/devices/battery_BAT0")) {
@@ -26,94 +65,49 @@ Singleton {
}
}
// 2. Fallback to displayDevice if it's a laptop battery
if (UPower.displayDevice && UPower.displayDevice.isLaptopBattery) {
return UPower.displayDevice;
}
// 3. Any other device marked as a laptop battery
// Prioritize (any) Laptop Battery
for (var j = 0; j < devices.length; j++) {
var device = devices[j];
if (device && device.type === UPowerDeviceType.Battery && device.isLaptopBattery) {
return device;
var dev = devices[j];
if (dev && !isBluetoothDevice(dev) && dev.isLaptopBattery) {
return dev;
}
}
if (UPower.displayDevice.isPresent) {
return UPower.displayDevice;
}
return null;
// Fallback to the first available device
return devices[0];
}
readonly property var _bluetoothBattery: {
var devices = BluetoothService.devices ? (BluetoothService.devices.values || []) : [];
for (var i = 0; i < devices.length; i++) {
var device = devices[i];
if (device && device.connected && device.batteryAvailable) {
return device;
}
}
return null;
}
// Primary battery device (prioritizes laptop over Bluetooth)
readonly property var primaryDevice: _laptopBattery || _bluetoothBattery || null
// Whether the primary device is a laptop battery
readonly property bool isLaptopBattery: _laptopBattery !== null && primaryDevice === _laptopBattery
readonly property bool isLaptopBattery: primaryDevice !== null && !isBluetoothDevice(primaryDevice) && primaryDevice.isLaptopBattery
// Global properties for the Primary Device (used by LockScreen etc)
readonly property real batteryPercentage: getPercentage(primaryDevice)
readonly property bool batteryCharging: isCharging(primaryDevice)
readonly property bool batteryPluggedIn: isPluggedIn(primaryDevice)
readonly property bool batteryReady: isDeviceReady(primaryDevice)
readonly property bool batteryPresent: isDevicePresent(primaryDevice)
property bool healthAvailable: false
property int healthPercent: -1
function findUPowerDevice(nativePath) {
// 3. Helper to resolve a device by path, or return primary if path is empty/invalid
function resolveDevice(nativePath) {
if (!nativePath || nativePath === "") {
return _laptopBattery;
return primaryDevice;
}
if (!UPower.devices) {
return null;
}
var deviceArray = UPower.devices.values || [];
for (var i = 0; i < deviceArray.length; i++) {
var device = deviceArray[i];
if (device && device.nativePath === nativePath) {
if (device.type === UPowerDeviceType.LinePower) {
continue;
}
return device;
}
}
return null;
}
function findBluetoothDevice(nativePath) {
if (!nativePath || !BluetoothService.devices) {
return null;
}
var macMatch = nativePath.match(/([0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2})/);
if (!macMatch) {
return null;
}
var macAddress = macMatch[1].toUpperCase();
var deviceArray = BluetoothService.devices.values || [];
for (var i = 0; i < deviceArray.length; i++) {
var device = deviceArray[i];
if (device && device.address && device.address.toUpperCase() === macAddress) {
return device;
// Search in our cached list
for (var i = 0; i < devices.length; i++) {
var d = devices[i];
if (isBluetoothDevice(d)) {
if (d.address && d.address.toUpperCase() === nativePath.toUpperCase())
return d;
// Try matching MAC in path string if passed format differs
if (nativePath.includes(d.address.toUpperCase()))
return d;
} else {
if (d.nativePath === nativePath)
return d;
}
}
return null;
@@ -123,7 +117,7 @@ Singleton {
if (!device)
return false;
// Handle Bluetooth devices (identified by having batteryAvailable property)
// Handle Bluetooth devices
if (device.batteryAvailable !== undefined) {
return device.connected === true;
}
@@ -133,11 +127,8 @@ Singleton {
if (device.type === UPowerDeviceType.Battery && device.isPresent !== undefined) {
return device.isPresent === true;
}
// Fallback for non-battery UPower devices or if isPresent is missing
return device.ready && device.percentage !== undefined;
}
return false;
}
@@ -148,7 +139,6 @@ Singleton {
if (device.batteryAvailable !== undefined) {
return device.battery !== undefined;
}
return device.ready && device.percentage !== undefined;
}