never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Autoformat

Browse source
This commit is contained in:
Ly-sec 2025-08-31 07:34:59 +02:00
parent f19eaf689b
commit 6deb039906
2 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Modules/ArchUpdaterPanel/ArchUpdaterPanel.qml
View file

@ -13,8 +13,6 @@ NPanel {
panelHeight: 500 * scaling panelHeight: 500 * scaling
panelAnchorRight: true panelAnchorRight: true
panelContent: Rectangle { panelContent: Rectangle {
color: Color.mSurface color: Color.mSurface
radius: Style.radiusL * scaling radius: Style.radiusL * scaling
@ -70,7 +68,8 @@ NPanel {
// Update summary (only show when packages are available) // Update summary (only show when packages are available)
NText { NText {
visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy && ArchUpdaterService.totalUpdates > 0 visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy
&& ArchUpdaterService.totalUpdates > 0
text: ArchUpdaterService.totalUpdates + " package" + (ArchUpdaterService.totalUpdates !== 1 ? "s" : "") + " can be updated" text: ArchUpdaterService.totalUpdates + " package" + (ArchUpdaterService.totalUpdates !== 1 ? "s" : "") + " can be updated"
font.pointSize: Style.fontSizeL * scaling font.pointSize: Style.fontSizeL * scaling
font.weight: Style.fontWeightMedium font.weight: Style.fontWeightMedium
@ -80,7 +79,8 @@ NPanel {
// Package selection info (only show when not updating and have packages) // Package selection info (only show when not updating and have packages)
NText { NText {
visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy && ArchUpdaterService.totalUpdates > 0 visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy
&& ArchUpdaterService.totalUpdates > 0
text: ArchUpdaterService.selectedPackagesCount + " of " + ArchUpdaterService.totalUpdates + " packages selected" text: ArchUpdaterService.selectedPackagesCount + " of " + ArchUpdaterService.totalUpdates + " packages selected"
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
color: Color.mOnSurfaceVariant color: Color.mOnSurfaceVariant
@ -181,7 +181,8 @@ NPanel {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy && ArchUpdaterService.totalUpdates === 0 visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy
&& ArchUpdaterService.totalUpdates === 0
ColumnLayout { ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
@ -217,8 +218,7 @@ NPanel {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
visible: ArchUpdaterService.aurBusy && !ArchUpdaterService.updateInProgress visible: ArchUpdaterService.aurBusy && !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed
&& !ArchUpdaterService.updateFailed
ColumnLayout { ColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
@ -251,7 +251,8 @@ NPanel {
// Package list (only show when not in any special state) // Package list (only show when not in any special state)
NBox { NBox {
visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy && ArchUpdaterService.totalUpdates > 0 visible: !ArchUpdaterService.updateInProgress && !ArchUpdaterService.updateFailed && !ArchUpdaterService.aurBusy
&& ArchUpdaterService.totalUpdates > 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -344,8 +345,7 @@ NPanel {
NIconButton { NIconButton {
icon: "refresh" icon: "refresh"
tooltipText: ArchUpdaterService.aurBusy ? "Checking for updates..." : tooltipText: ArchUpdaterService.aurBusy ? "Checking for updates..." : (!ArchUpdaterService.canPoll ? "Refresh available soon" : "Refresh package lists")
(!ArchUpdaterService.canPoll ? "Refresh available soon" : "Refresh package lists")
onClicked: { onClicked: {
ArchUpdaterService.forceRefresh() ArchUpdaterService.forceRefresh()
} }

19
Services/ArchUpdaterService.qml
View file

@ -29,7 +29,7 @@ Singleton {
readonly property int updates: repoPackages.length readonly property int updates: repoPackages.length
readonly property int aurUpdates: aurPackages.length readonly property int aurUpdates: aurPackages.length
readonly property int totalUpdates: updates + aurUpdates readonly property int totalUpdates: updates + aurUpdates
// Polling cooldown (prevent excessive polling) // Polling cooldown (prevent excessive polling)
property int lastPollTime: 0 property int lastPollTime: 0
readonly property int pollCooldownMs: 5 * 60 * 1000 // 5 minutes readonly property int pollCooldownMs: 5 * 60 * 1000 // 5 minutes
@ -224,8 +224,6 @@ Singleton {
// PACKAGE CHECKING PROCESSES // PACKAGE CHECKING PROCESSES
// ============================================================================ // ============================================================================
// Process for checking all updates with AUR helper (repo + AUR) // Process for checking all updates with AUR helper (repo + AUR)
Process { Process {
id: checkAurUpdatesProcess id: checkAurUpdatesProcess
@ -260,7 +258,8 @@ Singleton {
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
parseAllUpdatesOutput(allUpdatesOutput, text) parseAllUpdatesOutput(allUpdatesOutput, text)
Logger.log("ArchUpdater", "found", repoPackages.length, "repo package(s) and", aurPackages.length, "AUR package(s) to upgrade") Logger.log("ArchUpdater", "found", repoPackages.length, "repo package(s) and", aurPackages.length,
"AUR package(s) to upgrade")
} }
} }
} }
@ -301,7 +300,7 @@ Singleton {
function parseAllUpdatesOutput(allOutput, aurOnlyOutput) { function parseAllUpdatesOutput(allOutput, aurOnlyOutput) {
const allLines = allOutput.trim().split('\n').filter(line => line.trim()) const allLines = allOutput.trim().split('\n').filter(line => line.trim())
const aurOnlyLines = aurOnlyOutput.trim().split('\n').filter(line => line.trim()) const aurOnlyLines = aurOnlyOutput.trim().split('\n').filter(line => line.trim())
// Create a set of AUR package names for quick lookup // Create a set of AUR package names for quick lookup
const aurPackageNames = new Set() const aurPackageNames = new Set()
for (const line of aurOnlyLines) { for (const line of aurOnlyLines) {
@ -310,7 +309,7 @@ Singleton {
aurPackageNames.add(m[1]) aurPackageNames.add(m[1])
} }
} }
const repoPackages = [] const repoPackages = []
const aurPackages = [] const aurPackages = []
@ -323,7 +322,7 @@ Singleton {
"newVersion": m[3], "newVersion": m[3],
"description": `${m[1]} ${m[2]} -> ${m[3]}` "description": `${m[1]} ${m[2]} -> ${m[3]}`
} }
// Check if this package is in the AUR-only list // Check if this package is in the AUR-only list
if (aurPackageNames.has(m[1])) { if (aurPackageNames.has(m[1])) {
packageInfo.source = "aur" packageInfo.source = "aur"
@ -347,13 +346,13 @@ Singleton {
if (aurBusy || !canPoll) { if (aurBusy || !canPoll) {
return return
} }
// Get the AUR helper and set commands // Get the AUR helper and set commands
const aurHelper = getAurHelper() const aurHelper = getAurHelper()
if (aurHelper) { if (aurHelper) {
checkAurUpdatesProcess.command = [aurHelper, "-Qu"] checkAurUpdatesProcess.command = [aurHelper, "-Qu"]
checkAurOnlyProcess.command = [aurHelper, "-Qua"] checkAurOnlyProcess.command = [aurHelper, "-Qua"]
// Start AUR updates check (includes both repo and AUR packages) // Start AUR updates check (includes both repo and AUR packages)
checkAurUpdatesProcess.running = true checkAurUpdatesProcess.running = true
lastPollTime = Date.now() lastPollTime = Date.now()
@ -491,7 +490,7 @@ Singleton {
if (aurHelper) { if (aurHelper) {
checkAurUpdatesProcess.command = [aurHelper, "-Qu"] checkAurUpdatesProcess.command = [aurHelper, "-Qu"]
checkAurOnlyProcess.command = [aurHelper, "-Qua"] checkAurOnlyProcess.command = [aurHelper, "-Qua"]
// Force refresh by bypassing cooldown // Force refresh by bypassing cooldown
checkAurUpdatesProcess.running = true checkAurUpdatesProcess.running = true
lastPollTime = Date.now() lastPollTime = Date.now()