Enhancement: custom system updater command (#414)

* enhancement: system updater custom command and custom additional terminal parameters

* removed console log

* minor: tabs

Common/SettingsData.qml

@@ -175,6 +175,9 @@ Singleton {
     property int notificationTimeoutCritical: 0
     property int notificationPopupPosition: SettingsData.Position.Top
     property bool osdAlwaysShowValue: false
+    property bool updaterUseCustomCommand: false
+    property string updaterCustomCommand: ""
+    property string updaterTerminalAdditionalParams: ""
     property var screenPreferences: ({})
     property int animationSpeed: SettingsData.AnimationSpeed.Short
     readonly property string defaultFontFamily: "Inter Variable"
@@ -410,6 +413,9 @@ Singleton {
                 notificationTimeoutCritical = settings.notificationTimeoutCritical !== undefined ? settings.notificationTimeoutCritical : 0
                 notificationPopupPosition = settings.notificationPopupPosition !== undefined ? settings.notificationPopupPosition : SettingsData.Position.Top
                 osdAlwaysShowValue = settings.osdAlwaysShowValue !== undefined ? settings.osdAlwaysShowValue : false
+                updaterUseCustomCommand = settings.updaterUseCustomCommand !== undefined ? settings.updaterUseCustomCommand : false;
+                updaterCustomCommand = settings.updaterCustomCommand !== undefined ? settings.updaterCustomCommand : "";
+                updaterTerminalAdditionalParams = settings.updaterTerminalAdditionalParams !== undefined ? settings.updaterTerminalAdditionalParams : "";
                 dankBarSpacing = settings.dankBarSpacing !== undefined ? settings.dankBarSpacing : (settings.topBarSpacing !== undefined ? settings.topBarSpacing : 4)
                 dankBarBottomGap = settings.dankBarBottomGap !== undefined ? settings.dankBarBottomGap : (settings.topBarBottomGap !== undefined ? settings.topBarBottomGap : 0)
                 dankBarInnerPadding = settings.dankBarInnerPadding !== undefined ? settings.dankBarInnerPadding : (settings.topBarInnerPadding !== undefined ? settings.topBarInnerPadding : 4)
@@ -560,6 +566,9 @@ Singleton {
                                                 "notificationTimeoutCritical": notificationTimeoutCritical,
                                                 "notificationPopupPosition": notificationPopupPosition,
                                                 "osdAlwaysShowValue": osdAlwaysShowValue,
+				                "updaterUseCustomCommand": updaterUseCustomCommand,
+				                "updaterCustomCommand": updaterCustomCommand,
+				                "updaterTerminalAdditionalParams": updaterTerminalAdditionalParams,
                                                 "screenPreferences": screenPreferences,
                                                 "animationSpeed": animationSpeed
                                             }, null, 2))
@@ -601,6 +610,21 @@ Singleton {
         saveSettings()
     }
 
+    function setUpdaterUseCustomCommandEnabled(enabled) {
+        updaterUseCustomCommand = enabled;
+        saveSettings();
+    }
+
+    function setUpdaterCustomCommand(command) {
+        updaterCustomCommand = command;
+        saveSettings();
+    }
+
+    function setUpdaterTerminalAdditionalParams(customArgs) {
+        updaterTerminalAdditionalParams = customArgs;
+        saveSettings();
+    }
+
     function setWorkspaceNameIcon(workspaceName, iconData) {
         var iconMap = JSON.parse(JSON.stringify(workspaceNameIcons))
         iconMap[workspaceName] = iconData

Modules/Settings/WidgetTweaksTab.qml

@@ -184,7 +184,126 @@ Item {
                         description: "Use animated wave progress bars for media playback"
                         checked: SettingsData.waveProgressEnabled
                         onToggled: checked => {
-                            return SettingsData.setWaveProgressEnabled(checked)
+                            return SettingsData.setWaveProgressEnabled(checked);
+                        }
+                    }
+                }
+            }
+
+            StyledRect {
+                width: parent.width
+                height: updaterSection.implicitHeight + Theme.spacingL * 2
+                radius: Theme.cornerRadius
+                color: Theme.surfaceContainerHigh
+                border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
+                border.width: 0
+
+                Column {
+                    id: updaterSection
+
+                    anchors.fill: parent
+                    anchors.margins: Theme.spacingL
+                    spacing: Theme.spacingM
+
+                    Row {
+                        width: parent.width
+                        spacing: Theme.spacingM
+
+                        DankIcon {
+                            name: "refresh"
+                            size: Theme.iconSize
+                            color: Theme.primary
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+
+                        StyledText {
+                            text: I18n.tr("System Updater")
+                            font.pixelSize: Theme.fontSizeLarge
+                            font.weight: Font.Medium
+                            color: Theme.surfaceText
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+
+                    DankToggle {
+                        width: parent.width
+                        text: I18n.tr("Use Custom Command")
+                        description: I18n.tr("Use custom command for update your system")
+                        checked: SettingsData.updaterUseCustomCommand
+                        onToggled: checked => {
+                            if (!checked) {
+                                updaterCustomCommand.text = "";
+                                updaterTerminalCustomClass.text = "";
+                                SettingsData.setUpdaterCustomCommand("");
+                                SettingsData.setUpdaterTerminalAdditionalParams("");
+                            }
+                            return SettingsData.setUpdaterUseCustomCommandEnabled(checked);
+                        }
+                    }
+
+                    Column {
+                        width: parent.width - Theme.spacingM * 2
+                        spacing: Theme.spacingXS
+                        anchors.left: parent.left
+                        anchors.leftMargin: Theme.spacingM
+
+                        StyledText {
+                            text: I18n.tr("System update custom command")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
+
+                        DankTextField {
+                            id: updaterCustomCommand
+                            width: parent.width
+                            height: 48
+                            placeholderText: "myPkgMngr --sysupdate"
+                            backgroundColor: Theme.surfaceVariant
+                            normalBorderColor: Theme.primarySelected
+                            focusedBorderColor: Theme.primary
+
+                            Component.onCompleted: {
+                                if (SettingsData.updaterCustomCommand) {
+                                    text = SettingsData.updaterCustomCommand;
+                                }
+                            }
+
+                            onTextEdited: {
+                                SettingsData.setUpdaterCustomCommand(text.trim());
+                            }
+                        }
+                    }
+
+                    Column {
+                        width: parent.width - Theme.spacingM * 2
+                        spacing: Theme.spacingXS
+                        anchors.left: parent.left
+                        anchors.leftMargin: Theme.spacingM
+
+                        StyledText {
+                            text: I18n.tr("Terminal custom additional parameters")
+                            font.pixelSize: Theme.fontSizeSmall
+                            color: Theme.surfaceVariantText
+                        }
+
+                        DankTextField {
+                            id: updaterTerminalCustomClass
+                            width: parent.width
+                            height: 48
+                            placeholderText: "-T udpClass"
+                            backgroundColor: Theme.surfaceVariant
+                            normalBorderColor: Theme.primarySelected
+                            focusedBorderColor: Theme.primary
+
+                            Component.onCompleted: {
+                                if (SettingsData.updaterTerminalAdditionalParams) {
+                                    text = SettingsData.updaterTerminalAdditionalParams;
+                                }
+                            }
+
+                            onTextEdited: {
+                                SettingsData.setUpdaterTerminalAdditionalParams(text.trim());
+                            }
                         }
                     }
                 }

Services/SystemUpdateService.qml

@@ -176,11 +176,27 @@ Singleton {
         if (!distributionSupported || !pkgManager || updateCount === 0) return
 
         const terminal = Quickshell.env("TERMINAL") || "xterm"
-        const params = packageManagerParams[pkgManager].upgradeSettings.params.join(" ")
-        const sudo = packageManagerParams[pkgManager].upgradeSettings.requiresSudo ? "sudo" : ""
-        const updateCommand = `${sudo} ${pkgManager} ${params} && echo "Updates complete! Press Enter to close..." && read`
 
-        updater.command = [terminal, "-e", "sh", "-c", updateCommand]
+        if (SettingsData.updaterUseCustomCommand && SettingsData.updaterCustomCommand.length > 0) {
+            const updateCommand = `${SettingsData.updaterCustomCommand} && echo "Updates complete! Press Enter to close..." && read`
+            const termClass = SettingsData.updaterTerminalAdditionalParams
+
+            var finalCommand = [terminal]
+            if (termClass.length > 0) {
+                finalCommand = finalCommand.concat(termClass.split(" "))
+            }
+            finalCommand.push("-e")
+            finalCommand.push("sh")
+            finalCommand.push("-c")
+            finalCommand.push(updateCommand)
+            updater.command = finalCommand
+        } else {
+            const params = packageManagerParams[pkgManager].upgradeSettings.params.join(" ")
+            const sudo = packageManagerParams[pkgManager].upgradeSettings.requiresSudo ? "sudo" : ""
+            const updateCommand = `${sudo} ${pkgManager} ${params} && echo "Updates complete! Press Enter to close..." && read`
+    
+            updater.command = [terminal, "-e", "sh", "-c", updateCommand]
+        }
         updater.running = true
     }