From eea63821ce1be98e37fc0419a2c4c1bbedfe53c1 Mon Sep 17 00:00:00 2001 From: xml Date: Sat, 21 Mar 2026 18:17:01 +0800 Subject: [PATCH] fix: Fix the issue of failed reporting to the platform. --- src/internal/config/config.go | 2 +- src/internal/config/config_test.go | 33 ------------------- src/internal/updateplatform/message_report.go | 8 ++--- src/lastore-daemon/manager_download.go | 6 ++-- src/lastore-daemon/manager_update.go | 6 ++-- src/lastore-daemon/manager_upgrade.go | 10 +++--- 6 files changed, 16 insertions(+), 49 deletions(-) diff --git a/src/internal/config/config.go b/src/internal/config/config.go index ac1bb0a93..679fc1531 100644 --- a/src/internal/config/config.go +++ b/src/internal/config/config.go @@ -976,7 +976,7 @@ func (c *Config) SetStartCheckRange(checkRange []int) error { // TODO: remove this after bug of dde-dconfig fixed variants := make([]dbus.Variant, 0, len(checkRange)) for _, item := range checkRange { - variants = append(variants, dbus.MakeVariant(item)) + variants = append(variants, dbus.MakeVariant(int64(item))) } return c.save(dSettingsKeyStartCheckRange, variants) diff --git a/src/internal/config/config_test.go b/src/internal/config/config_test.go index ea9b59abc..b30981847 100644 --- a/src/internal/config/config_test.go +++ b/src/internal/config/config_test.go @@ -10,10 +10,7 @@ import ( "testing" "time" - "github.com/godbus/dbus/v5" - ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) @@ -81,33 +78,3 @@ func TestConfig(t *testing.T) { assert.Equal(t, configAfter.AppstoreRegion, configBefore.AppstoreRegion+"Test") assert.Equal(t, configAfter.UpdateMode, configBefore.UpdateMode+1) } - -func TestSetStartCheckRangeSavesDBusVariants(t *testing.T) { - manager := &ConfigManager.MockManager{} - cfg := &Config{ - dsLastoreManager: manager, - } - checkRange := []int{22, 21} - - manager.MockInterfaceManager. - On("SetValue", dbus.Flags(0), dSettingsKeyStartCheckRange, mock.MatchedBy(func(value dbus.Variant) bool { - variants, ok := value.Value().([]dbus.Variant) - if !ok || len(variants) != len(checkRange) { - return false - } - for i, variant := range variants { - item, ok := variant.Value().(int) - if !ok || item != checkRange[i] { - return false - } - } - return true - })). - Return(nil). - Once() - - err := cfg.SetStartCheckRange(checkRange) - require.NoError(t, err) - assert.Equal(t, checkRange, cfg.StartCheckRange) - manager.MockInterfaceManager.AssertExpectations(t) -} diff --git a/src/internal/updateplatform/message_report.go b/src/internal/updateplatform/message_report.go index 14c9f7312..3d3e47a7e 100644 --- a/src/internal/updateplatform/message_report.go +++ b/src/internal/updateplatform/message_report.go @@ -45,7 +45,7 @@ type ProcessEvent struct { EventType int `json:"eventType"` EventStatus bool `json:"eventStatus"` EventContent string `json:"eventContent"` - ExecAct int64 `json:"execAct"` + ExecAt int64 `json:"execAt"` } const ( @@ -1428,7 +1428,7 @@ func (m *UpdatePlatformManager) UpdateAllPlatformDataSync() error { if (m.config.PlatformDisabled & DisabledTargetPkgLists) == 0 { syncFuncList = append(syncFuncList, m.updateTargetPkgMetaSync) // 目标版本信息 } - if (m.config.PlatformDisabled & DisabledCurrentPkgLists) == 0 { + if (m.config.PlatformDisabled&DisabledCurrentPkgLists) == 0 && m.preBaseline != "" { syncFuncList = append(syncFuncList, m.updateCurrentPreInstalledPkgMetaSync) // 基线版本信息 } if (m.config.PlatformDisabled & DisabledPkgCVEs) == 0 { @@ -1461,8 +1461,8 @@ func (m *UpdatePlatformManager) PostProcessEventMessage(body ProcessEvent) { } logger.Debug("post process event msg:", body) body.TaskID = m.taskID - if body.ExecAct == 0 { - body.ExecAct = time.Now().Unix() + if body.ExecAt == 0 { + body.ExecAt = time.Now().Unix() } if (m.config.PlatformDisabled & DisabledProcess) != 0 { logger.Warning("platform is disabled") diff --git a/src/lastore-daemon/manager_download.go b/src/lastore-daemon/manager_download.go index caabdcfd4..43e0d4881 100644 --- a/src/lastore-daemon/manager_download.go +++ b/src/lastore-daemon/manager_download.go @@ -174,7 +174,7 @@ func (m *Manager) prepareDistUpgrade(sender dbus.Sender, origin system.UpdateTyp TaskID: 1, EventType: updateplatform.PreDownloadCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PreDownloadCheck failed", }) }(systemErr) } else { @@ -262,7 +262,7 @@ func (m *Manager) prepareDistUpgrade(sender dbus.Sender, origin system.UpdateTyp TaskID: 1, EventType: updateplatform.PostDownloadCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostDownloadCheck failed", }) }(systemErr) } else { @@ -328,7 +328,7 @@ func (m *Manager) prepareDistUpgrade(sender dbus.Sender, origin system.UpdateTyp TaskID: 1, EventType: updateplatform.PostDownloadCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostDownloadCheck failed", }) }(systemErr) } else { diff --git a/src/lastore-daemon/manager_update.go b/src/lastore-daemon/manager_update.go index 1370b53ef..56b9c4aae 100644 --- a/src/lastore-daemon/manager_update.go +++ b/src/lastore-daemon/manager_update.go @@ -276,7 +276,7 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) { TaskID: 1, EventType: updateplatform.PostUpdateCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostUpdateCheck failed", }) }(systemErr) } else { @@ -333,7 +333,7 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) { TaskID: 1, EventType: updateplatform.PostUpdateCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostUpdateCheck failed", }) }(systemErr) } else { @@ -408,7 +408,7 @@ func (m *Manager) updateSource(sender dbus.Sender) (*Job, error) { TaskID: 1, EventType: updateplatform.PreUpdateCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PreUpdateCheck failed", }) }(systemErr) } else { diff --git a/src/lastore-daemon/manager_upgrade.go b/src/lastore-daemon/manager_upgrade.go index c1e9e97d0..4042090f0 100644 --- a/src/lastore-daemon/manager_upgrade.go +++ b/src/lastore-daemon/manager_upgrade.go @@ -222,7 +222,7 @@ func (m *Manager) distUpgradePartly(sender dbus.Sender, origin system.UpdateType TaskID: 1, EventType: updateplatform.PreBackupCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PreBackupCheck failed", }) }(systemErr) } else { @@ -254,7 +254,7 @@ func (m *Manager) distUpgradePartly(sender dbus.Sender, origin system.UpdateType TaskID: 1, EventType: updateplatform.PostBackupCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostBackupCheck failed", }) }(systemErr) } else { @@ -298,7 +298,7 @@ func (m *Manager) distUpgradePartly(sender dbus.Sender, origin system.UpdateType TaskID: 1, EventType: updateplatform.PostBackupCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PostBackupCheck failed", }) }(systemErr) } else { @@ -491,7 +491,7 @@ func (m *Manager) distUpgrade(sender dbus.Sender, mode system.UpdateType, needAd TaskID: 1, EventType: updateplatform.PreUpgradeCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "PreUpgradeCheck failed", }) m.updatePlatform.PostProcessEventMessage(updateplatform.ProcessEvent{ @@ -537,7 +537,7 @@ func (m *Manager) distUpgrade(sender dbus.Sender, mode system.UpdateType, needAd TaskID: 1, EventType: updateplatform.MidUpgradeCheck, EventStatus: false, - EventContent: err.ErrDetail, + EventContent: "MidUpgradeCheck failed", }) m.updatePlatform.PostProcessEventMessage(updateplatform.ProcessEvent{