From dcbf4330be5fb35889c2da6cb46d01a6f494da9b Mon Sep 17 00:00:00 2001
From: hui <55790859+grayana@users.noreply.github.com>
Date: Wed, 18 Sep 2024 20:14:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=92=AD=E6=94=BE=E6=97=B6=E6=AD=8C=E6=9B=B2?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E4=B8=8D=E5=AE=8C=E6=95=B4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#177)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaomusic/static/default/setting.html |  2 +-
 xiaomusic/xiaomusic.py                | 28 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/xiaomusic/static/default/setting.html b/xiaomusic/static/default/setting.html
index 15fcac9..36051db 100644
--- a/xiaomusic/static/default/setting.html
+++ b/xiaomusic/static/default/setting.html
@@ -142,7 +142,7 @@ var vConsole = new window.VConsole();
           <option value="false" selected>false</option>
         </select>
 
-        <label for="continue_play">启用继续播放(可能导致兼容性问题及歌曲无法完整播放):</label>
+        <label for="continue_play">启用继续播放(可能导致兼容性问题):</label>
         <select id="continue_play">
           <option value="true">true</option>
           <option value="false" selected>false</option>
diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py
index 32af5ba..065b243 100644
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -536,6 +536,11 @@ class XiaoMusic:
                 query = new_record.get("query", "").strip()
                 did = new_record.get("did", "").strip()
                 await self.do_check_cmd(did, query, False)
+                answers = new_record.get("answers", [{}])
+                if answers:
+                    answer = answers[0].get("tts", {}).get("text", "").strip()
+                    await self.reset_timer_when_answer(len(answer), did)
+                    self.log.debug(f"query:{query} did:{did} answer:{answer}")
 
     # 匹配命令
     async def do_check_cmd(self, did="", query="", ctrl_panel=True, **kwargs):
@@ -552,6 +557,10 @@ class XiaoMusic:
         except Exception as e:
             self.log.exception(f"Execption {e}")
 
+    # 重置计时器
+    async def reset_timer_when_answer(self, answer_length, did):
+        await self.devices[did].reset_timer_when_answer(answer_length)
+
     def append_running_task(self, task):
         self.running_task.append(task)
 
@@ -938,6 +947,7 @@ class XiaoMusicDevice:
         # 播放进度
         self._start_time = 0
         self._duration = 0
+        self._paused_time = 0
 
         # 关机定时器
         self._stop_timer = None
@@ -948,9 +958,9 @@ class XiaoMusicDevice:
         return self.device.cur_music
 
     def get_offset_duration(self):
-        if not self._playing:
+        if not self.isplaying():
             return -1, -1
-        offset = time.time() - self._start_time
+        offset = time.time() - self._start_time - self._paused_time
         duration = self._duration
         return offset, duration
 
@@ -1084,6 +1094,7 @@ class XiaoMusicDevice:
         sec = sec + self.config.delay_sec
         self._start_time = time.time()
         self._duration = sec
+        self._paused_time = 0
         await self.set_next_music_timeout(sec)
         self.xiaomusic.save_cur_config()
 
@@ -1335,6 +1346,19 @@ class XiaoMusicDevice:
             self.log.error(f"_get_audio_id {e}")
         return str(audio_id)
 
+    # 重置计时器
+    async def reset_timer_when_answer(self, answer_length):
+        if not (self.isplaying() and self.config.continue_play):
+            return
+        pause_time = answer_length / 5 + 1
+        offset, duration = self.get_offset_duration()
+        self._paused_time += pause_time
+        new_time = duration - offset + pause_time
+        await self.set_next_music_timeout(new_time)
+        self.log.info(
+            f"reset_timer 延长定时器. answer_length:{answer_length} pause_time:{pause_time}"
+        )
+
     # 设置下一首歌曲的播放定时器
     async def set_next_music_timeout(self, sec):
         self.cancel_next_timer()