Skip to content

fix: Fix the issue of failed reporting to the platform. #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiuzhiqian merged 1 commit into from
Mar 21, 2026
Merged

fix: Fix the issue of failed reporting to the platform. #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
33 changes: 0 additions & 33 deletions src/internal/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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)
}
8 changes: 4 additions & 4 deletions src/internal/updateplatform/message_report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions src/lastore-daemon/manager_download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/lastore-daemon/manager_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions src/lastore-daemon/manager_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
Loading