fix: Add hot update mechanism to specific configurations

Author: xml

src/internal/config/config.go

@@ -485,25 +485,6 @@ func getConfigFromDSettings() *Config {
 		}
 	}
 	updateLastoreDaemonStatus()
-	_, err = c.dsLastoreManager.ConnectValueChanged(func(key string) {
-		switch key {
-		case DSettingsKeyLastoreDaemonStatus:
-			oldStatus := c.lastoreDaemonStatus
-			updateLastoreDaemonStatus()
-			newStatus := c.lastoreDaemonStatus
-			if (oldStatus & DisableUpdate) != (newStatus & DisableUpdate) {
-				c.dsettingsChangedCbMapMu.Lock()
-				cb := c.dsettingsChangedCbMap[key]
-				if cb != nil {
-					go cb(DisableUpdate, c.lastoreDaemonStatus)
-				}
-				c.dsettingsChangedCbMapMu.Unlock()
-			}
-		}
-	})
-	if err != nil {
-		logger.Warning(err)
-	}
 
 	v, err = c.dsLastoreManager.Value(0, dSettingsKeyCheckUpdateMode)
 	if err != nil {
@@ -628,15 +609,6 @@ func getConfigFromDSettings() *Config {
 		}
 	}
 	updateUpgradeDeliveryEnabled()
-	_, err = c.dsLastoreManager.ConnectValueChanged(func(key string) {
-		switch key {
-		case dSettingsKeyUpgradeDeliveryEnabled:
-			updateUpgradeDeliveryEnabled()
-		}
-	})
-	if err != nil {
-		logger.Warning(err)
-	}
 
 	v, err = c.dsLastoreManager.Value(0, dSettingsKeySystemCustomSource)
 	if err != nil {
@@ -722,6 +694,77 @@ func getConfigFromDSettings() *Config {
 	}
 	c.OtherSourceList = append(c.OtherSourceList, "/etc/apt/sources.list.d/driver.list")
 	c.SecuritySourceList = append(c.SecuritySourceList, system.SecuritySourceFile)
+
+	_, err = c.dsLastoreManager.ConnectValueChanged(func(key string) {
+		switch key {
+		case dSettingsKeyIntranetUpdate:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyIntranetUpdate)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.IntranetUpdate = v.Value().(bool)
+			}
+		case dSettingsKeyPlatformUpdate:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyPlatformUpdate)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.PlatformUpdate = v.Value().(bool)
+			}
+		case dSettingsKeyPlatformUrl:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyPlatformUrl)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.PlatformUrl = v.Value().(string)
+			}
+		case dSettingsKeyGetHardwareIdByHelper:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyGetHardwareIdByHelper)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.GetHardwareIdByHelper = v.Value().(bool)
+			}
+		case dSettingsKeyIncludeDiskInfo:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyIncludeDiskInfo)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.IncludeDiskInfo = v.Value().(bool)
+			}
+		case dSettingsKeyIncrementalUpdate:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyIncrementalUpdate)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.IncrementalUpdate = v.Value().(bool)
+			}
+		case dSettingsKeyAutoDownloadUpdates:
+			v, err = c.dsLastoreManager.Value(0, dSettingsKeyAutoDownloadUpdates)
+			if err != nil {
+				logger.Warning(err)
+			} else {
+				c.AutoDownloadUpdates = v.Value().(bool)
+			}
+		case dSettingsKeyUpgradeDeliveryEnabled:
+			updateUpgradeDeliveryEnabled()
+		case DSettingsKeyLastoreDaemonStatus:
+			oldStatus := c.lastoreDaemonStatus
+			updateLastoreDaemonStatus()
+			newStatus := c.lastoreDaemonStatus
+			if (oldStatus & DisableUpdate) != (newStatus & DisableUpdate) {
+				c.dsettingsChangedCbMapMu.Lock()
+				cb := c.dsettingsChangedCbMap[key]
+				if cb != nil {
+					go cb(DisableUpdate, c.lastoreDaemonStatus)
+				}
+				c.dsettingsChangedCbMapMu.Unlock()
+			}
+		}
+	})
+	if err != nil {
+		logger.Warning(err)
+	}
 	return c
 }
 

src/internal/system/common.go

@@ -214,10 +214,6 @@ const (
 )
 
 func IsAuthorized() bool {
-	// TODO: only for test
-	if IntranetUpdate {
-		return true
-	}
 	edition, err := getEditionName()
 	if err != nil {
 		return false

src/internal/system/system.go

@@ -12,8 +12,6 @@ import (
 
 const VarLibDir = "/var/lib/lastore"
 
-var IntranetUpdate bool
-
 type Status string
 
 const (

src/lastore-daemon/main.go

@@ -75,7 +75,6 @@ func main() {
 	}
 	config := NewConfig(path.Join(system.VarLibDir, "config.json"))
 	logger.Info("intranet update:", config.IntranetUpdate)
-	system.IntranetUpdate = config.IntranetUpdate
 	if config.IntranetUpdate {
 		go func() {
 			out, err := exec.Command("/usr/bin/lastore-tools", "gatherinfo", "-type=post").CombinedOutput()