From aad2ffbd9bc69a0c3a4449c4726714daf5a4eab2 Mon Sep 17 00:00:00 2001
From: ikaros <327209194@qq.com>
Date: Fri, 12 Apr 2024 22:55:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E9=A1=B5=20=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=A4=8D=E8=AF=BB-=E6=8F=92=E9=98=9F=E9=A6=96=20?=
 =?UTF-8?q?=E5=85=A8=E6=92=AD=E6=94=BE=E5=99=A8=E9=80=82=E9=85=8D=20?=
 =?UTF-8?q?=E5=B9=B6=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B=E6=9C=AA?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.json     | 2 +-
 config.json.bak | 2 +-
 main.py         | 2 +-
 utils/audio.py  | 6 ++++--
 webui.py        | 7 -------
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/config.json b/config.json
index 311502aa..02037586 100644
--- a/config.json
+++ b/config.json
@@ -119,7 +119,7 @@
     "idle_time_task_forget_reserve_num": 1,
     "image_recognition_schedule_forget_duration": 0.1,
     "image_recognition_schedule_forget_reserve_num": 1,
-    "message_queue_max_len": 10,
+    "message_queue_max_len": 50,
     "priority_mapping": {
       "copywriting": 1,
       "abnormal_alarm": 1,
diff --git a/config.json.bak b/config.json.bak
index 311502aa..02037586 100644
--- a/config.json.bak
+++ b/config.json.bak
@@ -119,7 +119,7 @@
     "idle_time_task_forget_reserve_num": 1,
     "image_recognition_schedule_forget_duration": 0.1,
     "image_recognition_schedule_forget_reserve_num": 1,
-    "message_queue_max_len": 10,
+    "message_queue_max_len": 50,
     "priority_mapping": {
       "copywriting": 1,
       "abnormal_alarm": 1,
diff --git a/main.py b/main.py
index 03606c76..ce95e81f 100644
--- a/main.py
+++ b/main.py
@@ -106,7 +106,7 @@ def send():
                         logging.info(f"API收到数据：{data_json}")
 
                         if data_json["type"] in ["reread", "reread_top_priority"]:
-                            my_handle.reread_handle(data_json)
+                            my_handle.reread_handle(data_json, type=data_json["type"])
                         elif data_json["type"] == "comment":
                             my_handle.process_data(data_json, "comment")
                         elif data_json["type"] == "tuning":
diff --git a/utils/audio.py b/utils/audio.py
index 2540811a..b03288a5 100644
--- a/utils/audio.py
+++ b/utils/audio.py
@@ -425,7 +425,7 @@ def get_priority_level(audio_json):
         # 查找插入位置
         new_data_priority = get_priority_level(audio_json)
 
-        logging.debug(f"优先级: {new_data_priority}")
+        logging.info(f"优先级: {new_data_priority}")
         
         # 如果新数据没有 'type' 键或其类型不在 priority_mapping 中，直接插入到末尾
         if new_data_priority is None:
@@ -441,9 +441,11 @@ def get_priority_level(audio_json):
                     insert_position = i + 1
                     break
         
+        logging.info(f"insert_position={insert_position}")
+
         # 数据队列数据量超长判断，插入位置索引大于最大数，则说明优先级低与队列中已存在数据，丢弃数据
         if insert_position >= int(self.config.get("filter", "message_queue_max_len")):
-            logging.info(f"message_queue 已满，数据丢弃")
+            logging.info(f"message_queue 已满，数据丢弃：【{audio_json['content']}】")
             return {"code": 1, "msg": f"message_queue 已满，数据丢弃：【{audio_json['content']}】"}
 
         # 获取线程锁，避免同时操作
diff --git a/webui.py b/webui.py
index bebac612..1ebf6733 100644
--- a/webui.py
+++ b/webui.py
@@ -4738,13 +4738,6 @@ def talk_chat_box_reread(insert_index=-1, type="reread"):
                             "content": content
                         }
                     else:
-                        # 重载一下配置
-                        tmp_config = Config(config_path)
-
-                        # 判断下播放器类型
-                        if tmp_config.get("play_audio", "player") != "audio_player_v2":
-                            ui.notify(position="top", type="warning", message="插队功能仅在音频播放器为audio_player_v2的情况下可用")
-                            return
 
                         data = {
                             "type": type,