fix: Adapt the maximum speed limit logic for incremental updates.

Bug: https://pms.uniontech.com/bug-view-338383.html

Author: xml

src/internal/system/apt/apt.go

@@ -88,9 +88,13 @@ func createCommandLine(cmdType string, cmdArgs []string) *exec.Cmd {
 	case system.BackupJobType:
 		return exec.Command(system.DeepinImmutableCtlPath, "admin", "deploy", "--backup", "-j")
 	case system.IncrementalDownloadJobType:
-		return exec.Command(system.DeepinImmutableCtlPath, "upgrade", "--download-only", "--status-fd", "3")
+		args := []string{"upgrade", "--download-only", "--status-fd", "3"}
+		args = append(args, cmdArgs...)
+		return exec.Command(system.DeepinImmutableCtlPath, args...)
 	case system.IncrementalUpdateJobType:
-		return exec.Command(system.DeepinImmutableCtlPath, "upgrade", "--status-fd", "3")
+		args := []string{"upgrade", "--status-fd", "3"}
+		args = append(args, cmdArgs...)
+		return exec.Command(system.DeepinImmutableCtlPath, args...)
 	case system.FixErrorJobType:
 		var errType system.JobErrorType
 		if len(cmdArgs) >= 1 {

src/internal/system/apt/proxy.go

@@ -21,6 +21,8 @@ import (
 	"github.com/linuxdeepin/lastore-daemon/src/internal/system"
 )
 
+const aptLimitKey = "Acquire::http::Dl-Limit"
+
 type APTSystem struct {
 	CmdSet            map[string]*system.Command
 	Indicator         system.Indicator
@@ -275,7 +277,12 @@ func (p *APTSystem) DownloadSource(jobId string, packages []string, environ map[
 	*/
 
 	if p.IncrementalUpdate {
-		c := newAPTCommand(p, jobId, system.IncrementalDownloadJobType, p.Indicator, append(packages, OptionToArgs(args)...))
+		var cmdArgs []string
+		speedLimit, ok := args[aptLimitKey]
+		if ok {
+			cmdArgs = append(cmdArgs, "--max-recv-speed", speedLimit)
+		}
+		c := newAPTCommand(p, jobId, system.IncrementalDownloadJobType, p.Indicator, cmdArgs)
 		c.SetEnv(environ)
 		return c.Start()
 	}
@@ -323,7 +330,12 @@ func (p *APTSystem) DistUpgrade(jobId string, packages []string, environ map[str
 
 	if p.IncrementalUpdate {
 		logger.Info("incremental update")
-		c := newAPTCommand(p, jobId, system.IncrementalUpdateJobType, p.Indicator, append(packages, OptionToArgs(args)...))
+		var cmdArgs []string
+		speedLimit, ok := args[aptLimitKey]
+		if ok {
+			cmdArgs = append(cmdArgs, "--max-recv-speed", speedLimit)
+		}
+		c := newAPTCommand(p, jobId, system.IncrementalUpdateJobType, p.Indicator, cmdArgs)
 		c.SetEnv(environ)
 		return c.Start()
 	}