From 52d6c59f3f62d80789cca4b6a0226336b4c27651 Mon Sep 17 00:00:00 2001
From: Simon <simobilleter@gmail.com>
Date: Thu, 31 Aug 2023 12:16:42 +0700
Subject: [PATCH] fix incomplete messages outside of sendprogress task method

---
 .../home/src/download/subscriptions.py         | 18 +++++++-----------
 tubearchivist/home/src/ta/config.py            | 10 ++++++----
 tubearchivist/home/views.py                    |  4 +++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tubearchivist/home/src/download/subscriptions.py b/tubearchivist/home/src/download/subscriptions.py
index aef62d6..fee3fb6 100644
--- a/tubearchivist/home/src/download/subscriptions.py
+++ b/tubearchivist/home/src/download/subscriptions.py
@@ -12,7 +12,6 @@ from home.src.index.channel import YoutubeChannel
 from home.src.index.playlist import YoutubePlaylist
 from home.src.index.video_constants import VideoTypeEnum
 from home.src.ta.config import AppConfig
-from home.src.ta.ta_redis import RedisArchivist
 from home.src.ta.urlparser import Parser
 
 
@@ -197,16 +196,13 @@ class PlaylistSubscription:
             thumb = ThumbManager(playlist_id, item_type="playlist")
             thumb.download_playlist_thumb(url)
 
-            # notify
-            message = {
-                "status": "message:subplaylist",
-                "level": "info",
-                "title": "Subscribing to Playlists",
-                "message": f"Processing {idx + 1} of {len(new_playlists)}",
-            }
-            RedisArchivist().set_message(
-                "message:subplaylist", message=message, expire=True
-            )
+            if self.task:
+                self.task.send_progress(
+                    message_lines=[
+                        f"Processing {idx + 1} of {len(new_playlists)}"
+                    ],
+                    progress=(idx + 1) / len(new_playlists),
+                )
 
     @staticmethod
     def channel_validate(channel_id):
diff --git a/tubearchivist/home/src/ta/config.py b/tubearchivist/home/src/ta/config.py
index 4946bee..5c79c95 100644
--- a/tubearchivist/home/src/ta/config.py
+++ b/tubearchivist/home/src/ta/config.py
@@ -205,10 +205,11 @@ class ScheduleBuilder:
                 except ValueError:
                     print(f"failed: {key} {value}")
                     mess_dict = {
-                        "status": self.MSG,
+                        "group": "setting:schedule",
                         "level": "error",
                         "title": "Scheduler update failed.",
-                        "message": "Invalid schedule input",
+                        "messages": ["Invalid schedule input"],
+                        "id": "0000",
                     }
                     RedisArchivist().set_message(
                         self.MSG, mess_dict, expire=True
@@ -227,10 +228,11 @@ class ScheduleBuilder:
 
         RedisArchivist().set_message("config", redis_config, save=True)
         mess_dict = {
-            "status": self.MSG,
+            "group": "setting:schedule",
             "level": "info",
             "title": "Scheduler changed.",
-            "message": "Please restart container for changes to take effect",
+            "messages": ["Restart container for changes to take effect"],
+            "id": "0000",
         }
         RedisArchivist().set_message(self.MSG, mess_dict, expire=True)
 
diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py
index 8e9f89d..24c10fa 100644
--- a/tubearchivist/home/views.py
+++ b/tubearchivist/home/views.py
@@ -1104,9 +1104,11 @@ class SettingsApplicationView(MinView):
         key = "message:setting"
         message = {
             "status": key,
+            "group": "setting:application",
             "level": "error",
             "title": "Cookie import failed",
-            "message": message_line,
+            "messages": [message_line],
+            "id": "0000",
         }
         RedisArchivist().set_message(key, message=message, expire=True)