Skip to content

fix: deduplicate low-battery notifications during upgrade retries #320

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
zhaohuiw42 merged 1 commit into from
Mar 4, 2026
Merged

fix: deduplicate low-battery notifications during upgrade retries #320

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
1 change: 1 addition & 0 deletions src/lastore-daemon/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ type Manager struct {
updateTime string // 定时时间，记录定时更新通知，防止重复发通知

checkDpkgCapabilityOnce sync.Once
sysPowerWatchOnce sync.Once
supportDpkgScriptIgnore bool

logFds []*os.File
Expand Down
33 changes: 15 additions & 18 deletions src/lastore-daemon/manager_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (

"github.com/godbus/dbus/v5"
"github.com/linuxdeepin/go-lib/dbusutil"
"github.com/linuxdeepin/go-lib/dbusutil/proxy"
"github.com/linuxdeepin/go-lib/gettext"
"github.com/linuxdeepin/go-lib/utils"
)
Expand Down Expand Up @@ -551,7 +550,6 @@ func (m *Manager) distUpgrade(sender dbus.Sender, mode system.UpdateType, needAd
return m.afterUpgradeCmdSuccessHook()
},
string(system.EndStatus): func() error {
m.sysPower.RemoveHandler(proxy.RemovePropertiesChangedHandler)
if unref != nil {
unref()
}
Expand Down Expand Up @@ -581,8 +579,11 @@ func (m *Manager) distUpgrade(sender dbus.Sender, mode system.UpdateType, needAd

func (m *Manager) handleSysPowerChanged() {
isLaptop, err := m.sysPower.HasBattery().Get(0)
if err == nil && isLaptop {
var lowPowerNotifyId uint32 = 0
if err != nil || !isLaptop {
return
}
m.sysPowerWatchOnce.Do(func() {
var lowPowerNotifyID uint32
var handleSysPowerBatteryEventMu sync.Mutex
onBatteryGlobal, _ := m.sysPower.OnBattery().Get(0)
batteryPercentage, _ := m.sysPower.BatteryPercentage().Get(0)
Expand All @@ -601,21 +602,17 @@ func (m *Manager) handleSysPowerChanged() {
handleSysPowerBatteryEvent := func() {
handleSysPowerBatteryEventMu.Lock()
defer handleSysPowerBatteryEventMu.Unlock()
if onBatteryGlobal && batteryPercentage < 60.0 && m.statusManager.isUpgrading() && lowPowerNotifyId == 0 {
go func() {
msg := gettext.Tr("The battery capacity is lower than 60%. To get successful updates, please plug in.")
lowPowerNotifyId = m.sendNotify(updateNotifyShow, 0, "notification-battery_low", "", msg, nil, nil, system.NotifyExpireTimeoutNoHide)
}()
if onBatteryGlobal && batteryPercentage < 60.0 && m.statusManager.isUpgrading() && lowPowerNotifyID == 0 {
msg := gettext.Tr("The battery capacity is lower than 60%. To get successful updates, please plug in.")
lowPowerNotifyID = m.sendNotify(updateNotifyShow, 0, "notification-battery_low", "", msg, nil, nil, system.NotifyExpireTimeoutNoHide)
}
// 用户连上电源时,需要关闭通知
if !onBatteryGlobal {
if lowPowerNotifyId != 0 {
err = m.closeNotify(lowPowerNotifyId)
if err != nil {
logger.Warning(err)
} else {
lowPowerNotifyId = 0
}
if !onBatteryGlobal && lowPowerNotifyID != 0 {
closeErr := m.closeNotify(lowPowerNotifyID)
if closeErr != nil {
logger.Warning(closeErr)
} else {
lowPowerNotifyID = 0
}
}
}
Expand All @@ -635,7 +632,7 @@ func (m *Manager) handleSysPowerChanged() {
onBatteryGlobal = onBattery
go handleSysPowerBatteryEvent()
})
}
})
}

func (m *Manager) preRunningHook(needChangeGrub bool, mode system.UpdateType) {
Expand Down
Loading