From 3440075f86793af03d1c2a4b1008907f9fc34bdd Mon Sep 17 00:00:00 2001
From: zhangkun <zhangkun2@uniontech.com>
Date: Thu, 2 Jul 2026 09:32:09 +0800
Subject: [PATCH] fix(power): restart idle tasks from now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. Reset the power save plan from the current time when the battery state changes.
2. Add a reset path that keeps full task delays while the session is already idle.
3. Preserve elapsed-idle checks only for the normal idle entry path.

Log: Restart idle power save tasks from the current time after power source changes.

fix(power): 修复 idle 任务重置

1. 电池状态变化时从当前时间重新重置节能计划。
2. 会话已处于 idle 状态时保留任务完整延迟重新调度。
3. 仅在正常进入 idle 流程时保留已 idle 时长检查。

Log: 电源状态变化后从当前时间重新调度 idle 节能任务。
---
 session/power1/power_save_plan.go | 45 ++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/session/power1/power_save_plan.go b/session/power1/power_save_plan.go
index 261cf9572..fdc387be4 100644
--- a/session/power1/power_save_plan.go
+++ b/session/power1/power_save_plan.go
@@ -14,9 +14,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/linuxdeepin/dde-daemon/common/fileutil"
 	"time"
 
+	"github.com/linuxdeepin/dde-daemon/common/fileutil"
+
 	"github.com/godbus/dbus/v5"
 	ConfigManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
 	"github.com/linuxdeepin/go-lib/dbusutil"
@@ -204,7 +205,7 @@ func (psp *powerSavePlan) Start() error {
 
 	// OnBattery changed will effect current PowerSavePlan
 	err := power.OnBattery().ConnectChanged(func(hasValue bool, value bool) {
-		psp.Reset()
+		psp.ResetFromNow()
 	})
 	if err != nil {
 		logger.Warning("failed to connectChanged OnBattery:", err)
@@ -456,8 +457,20 @@ func (mts metaTasks) setRealDelay(min int32) {
 	}
 }
 
+func (mts metaTasks) setRealDelayFromNow() {
+	for idx := range mts {
+		t := &mts[idx]
+		t.realDelay = time.Second * time.Duration(t.delay)
+	}
+}
+
 func (psp *powerSavePlan) Update(screenSaverStartDelay, lockDelay,
 	screenBlackDelay, sleepDelay, shortIdleDelay int32) {
+	psp.doUpdate(screenSaverStartDelay, lockDelay, screenBlackDelay, sleepDelay, shortIdleDelay, false)
+}
+
+func (psp *powerSavePlan) doUpdate(screenSaverStartDelay, lockDelay,
+	screenBlackDelay, sleepDelay, shortIdleDelay int32, resetFromNow bool) {
 	psp.mu.Lock()
 	defer psp.mu.Unlock()
 
@@ -517,13 +530,33 @@ func (psp *powerSavePlan) Update(screenSaverStartDelay, lockDelay,
 	psp.metaTasks = tasks
 
 	if psp.isIdle {
+		if resetFromNow {
+			psp.metaTasks.setRealDelayFromNow()
+		}
 		logger.Info("System is already idle, restarting power delay tasks.")
-		psp.startIdleTasksLocked()
+		psp.startIdleTasksLocked(!resetFromNow)
 	} else {
 		psp.metaTasks.setRealDelay(min)
 	}
 }
 
+func (psp *powerSavePlan) ResetFromNow() {
+	m := psp.manager
+	if m.OnBattery {
+		psp.doUpdate(int32(m.BatteryScreensaverDelay), int32(m.BatteryLockDelay),
+			int32(m.BatteryScreenBlackDelay),
+			int32(m.BatterySleepDelay),
+			int32(m.BatteryShortIdleDelay),
+			true)
+	} else {
+		psp.doUpdate(int32(m.LinePowerScreensaverDelay), int32(m.LinePowerLockDelay),
+			int32(m.LinePowerScreenBlackDelay),
+			int32(m.LinePowerSleepDelay),
+			int32(m.LinePowerShortIdleDelay),
+			true)
+	}
+}
+
 func (psp *powerSavePlan) setScreenSaverTimeout(seconds int32) error {
 	psp.screenSaverTimeout = seconds
 	logger.Debugf("set ScreenSaver timeout to %d", seconds)
@@ -1006,12 +1039,12 @@ func (psp *powerSavePlan) HandleIdleOn() {
 	logger.Info("HandleIdleOn")
 
 	psp.isIdle = true
-	psp.startIdleTasksLocked()
+	psp.startIdleTasksLocked(true)
 }
 
-func (psp *powerSavePlan) startIdleTasksLocked() {
+func (psp *powerSavePlan) startIdleTasksLocked(useElapsedIdle bool) {
 	// check window, only x11 is supported, not apply to wayland
-	if !psp.manager.UseWayland {
+	if useElapsedIdle && !psp.manager.UseWayland {
 		preventIdle, err := psp.shouldPreventIdle()
 		if err != nil {
 			logger.Warning(err)