transform progress message to list, change subscribe messages

tubearchivist/home/src/download.py

@@ -402,7 +402,7 @@ class PlaylistSubscription:
         all_youtube_ids = [i["youtube_id"] for i in all_indexed]
 
         new_thumbs = []
-
+        counter = 1
         for playlist in new_playlists:
             url_type = playlist["type"]
             playlist_id = playlist["url"]
@@ -425,9 +425,16 @@ class PlaylistSubscription:
                 self.change_subscribe(playlist_id, subscribe_status=True)
 
             # notify
+            message = {
+                "status": "message:subplaylist",
+                "level": "info",
+                "title": "Subscribing to Playlists",
+                "message": f"Processing {counter} of {len(new_playlists)}",
+            }
             RedisArchivist().set_message(
-                "progress:subscribe", {"status": "subscribing"}
+                "message:subplaylist", message=message
             )
+            counter = counter + 1
 
         return new_thumbs
 

tubearchivist/home/src/helper.py

@@ -155,6 +155,14 @@ class RedisArchivist:
     REDIS_HOST = os.environ.get("REDIS_HOST")
     REDIS_PORT = os.environ.get("REDIS_PORT") or 6379
     NAME_SPACE = "ta:"
+    CHANNELS = [
+        "download",
+        "add",
+        "rescan",
+        "subchannel",
+        "subplaylist",
+        "playlistscan",
+    ]
 
     def __init__(self):
         self.redis_connection = redis.Redis(
@@ -200,19 +208,19 @@ class RedisArchivist:
         redis_lock = self.redis_connection.lock(self.NAME_SPACE + lock_key)
         return redis_lock
 
-    def get_dl_message(self, cache_dir):
+    def get_progress(self):
-        """get latest download progress message if available"""
+        """get a list of all progress messages"""
+        all_messages = []
+        for channel in self.CHANNELS:
+            key = "message:" + channel
             reply = self.redis_connection.execute_command(
-            "JSON.GET", self.NAME_SPACE + "progress:download"
+                "JSON.GET", self.NAME_SPACE + key
             )
             if reply:
                 json_str = json.loads(reply)
-        elif json_str := self.monitor_cache_dir(cache_dir):
+                all_messages.append(json_str)
-            json_str = self.monitor_cache_dir(cache_dir)
-        else:
-            json_str = {"status": False}
 
-        return json_str
+        return all_messages
 
     @staticmethod
     def monitor_cache_dir(cache_dir):

tubearchivist/home/tasks.py

@@ -223,6 +223,7 @@ def re_sync_thumbs():
 def subscribe_to(url_str):
     """take a list of urls to subscribe to"""
     to_subscribe_list = UrlListParser(url_str).process_list()
+    counter = 1
     for item in to_subscribe_list:
         to_sub_id = item["url"]
         if item["type"] == "playlist":
@@ -242,10 +243,15 @@ def subscribe_to(url_str):
         ChannelSubscription().change_subscribe(
             channel_id_sub, channel_subscribed=True
         )
-        # notify
+        # notify for channels
-        RedisArchivist().set_message(
+        message = {
-            "progress:subscribe", {"status": "subscribing"}
+            "status": "message:subchannel",
-        )
+            "level": "info",
+            "title": "Subscribing to Channels",
+            "message": f"Processing {counter} of {len(to_subscribe_list)}",
+        }
+        RedisArchivist().set_message("message:subchannel", message=message)
+        counter = counter + 1
 
 
 @shared_task

tubearchivist/home/urls.py

@@ -34,7 +34,7 @@ urlpatterns = [
     ),
     path("settings/", login_required(SettingsView.as_view()), name="settings"),
     path("process/", login_required(process), name="process"),
-    path("downloads/progress/", login_required(progress), name="progress"),
+    path("progress/", login_required(progress), name="progress"),
     path("channel/", login_required(ChannelView.as_view()), name="channel"),
     path(
         "channel/<slug:channel_id_detail>/",

tubearchivist/home/views.py

@@ -521,9 +521,13 @@ class ChannelView(View):
         """handle http post requests"""
         subscribe_form = SubscribeToChannelForm(data=request.POST)
         if subscribe_form.is_valid():
-            RedisArchivist().set_message(
+            message = {
-                "progress:subscribe", {"status": "subscribing"}
+                "status": "message:subchannel",
-            )
+                "level": "info",
+                "title": "Subscribing to Channels",
+                "message": "Parsing form data",
+            }
+            RedisArchivist().set_message("message:subchannel", message=message)
             url_str = request.POST.get("subscribe")
             print(url_str)
             subscribe_to.delay(url_str)
@@ -800,6 +804,15 @@ class PlaylistView(View):
         if subscribe_form.is_valid():
             url_str = request.POST.get("subscribe")
             print(url_str)
+            message = {
+                "status": "message:subplaylist",
+                "level": "info",
+                "title": "Subscribing to Playlists",
+                "message": "Parsing form data",
+            }
+            RedisArchivist().set_message(
+                "message:subplaylist", message=message
+            )
             subscribe_to.delay(url_str)
 
         sleep(1)
@@ -929,10 +942,11 @@ class SettingsView(View):
 
 def progress(request):
     # pylint: disable=unused-argument
-    """endpoint for download progress ajax calls"""
+    """resolves to /progress/
-    config = AppConfig().config
+    return list of messages for frontend
-    cache_dir = config["application"]["cache_dir"]
+    """
-    json_data = RedisArchivist().get_dl_message(cache_dir)
+    all_messages = RedisArchivist().get_progress()
+    json_data = {"messages": all_messages}
     return JsonResponse(json_data)