feat: total revamp of progress system

Author: datawhores

ofscraper/commands/check.py

@@ -248,11 +248,12 @@ def post_checker():
 @run
 async def post_check_runner():
     async for user_name, model_id, final_post_array in post_check_retriver():
-        with progress_utils.setup_api_split_progress_live(revert=True):
-            progress_updater.update_activity_task(
+        with progress_utils.setup_live("api"):
+            progress_updater.activity.update_task(
                 description=check_str.format(
                     username=user_name, activity="Timeline posts"
-                )
+                ),
+                visible=True
             )
             await process_post_media(user_name, model_id, final_post_array)
             await make_changes_to_content_tables(
@@ -452,9 +453,10 @@ def message_checker():
 @run
 async def message_checker_runner():
     async for user_name, model_id, final_post_array in message_check_retriver():
-        with progress_utils.setup_api_split_progress_live(revert=True):
-            progress_updater.update_activity_task(
-                description=check_str.format(username=user_name, activity="Messages")
+        with progress_utils.setup_live("api"):
+            progress_updater.activity.update_task(
+                description=check_str.format(username=user_name, activity="Messages"),
+                visible=True
             )
             await process_post_media(user_name, model_id, final_post_array)
             await make_changes_to_content_tables(
@@ -525,11 +527,12 @@ def purchase_checker():
 @run
 async def purchase_checker_runner():
     async for user_name, model_id, final_post_array in purchase_check_retriver():
-        with progress_utils.setup_api_split_progress_live(revert=True):
-            progress_updater.update_activity_task(
+        with progress_utils.setup_live("api"):
+            progress_updater.activity.update_task(
                 description=check_str.format(
                     username=user_name, activity="Purchased posts"
-                )
+                ),
+                visible=True
             )
             await process_post_media(user_name, model_id, final_post_array)
             await make_changes_to_content_tables(
@@ -582,8 +585,8 @@ def stories_checker():
 @run
 async def stories_checker_runner():
     async for user_name, model_id, final_post_array in stories_check_retriver():
-        with progress_utils.setup_api_split_progress_live(revert=True):
-            progress_updater.update_activity_task(
+        with progress_utils.setup_live("api"):
+            progress_updater.activity.update_task(
                 description=check_str.format(
                     username=user_name, activity="Stories posts"
                 )

ofscraper/commands/manual.py

@@ -45,7 +45,7 @@ def manual_download(urls=None):
             log.warning("No valid data found from the provided URLs.")
             return
 
-        with progress_utils.setup_activity_progress_live():
+        with progress_utils.setup_live("manual"):
             # Consolidate media and posts from all processed collections
             all_media = [
                 item
@@ -67,16 +67,16 @@ def manual_download(urls=None):
             set_user_data(url_dicts)
 
         for _, value in url_dicts.items():
-            with progress_utils.setup_activity_progress_live():
                 collection = value["collection"]
                 model_id = collection.model_id
                 username = collection.username
                 media=collection.all_unique_media
                 posts=collection.posts
 
                 log.info(download_manual_str.format(username=username))
-                progress_updater.update_activity_task(
-                    description=download_manual_str.format(username=username)
+                progress_updater.activity.update_task(
+                    description=download_manual_str.format(username=username),
+                    visible=True
                 )
 
                 operations.table_init_create(model_id=model_id, username=username)
@@ -126,10 +126,11 @@ def process_urls(urls):
         "unknown": unknown_type_helper,
     }
 
-    with progress_utils.setup_api_split_progress_live(revert=False):
+    with progress_utils.setup_live("api"):
         for url in url_helper(urls):
-            progress_updater.update_activity_task(
-                description=post_str_manual.format(url=url)
+            progress_updater.activity.update_task(
+                description=post_str_manual.format(url=url),
+                visible=True
             )
 
             model_id, post_id, api_type = get_info(url)

ofscraper/commands/metadata/consumer.py

@@ -70,7 +70,7 @@ async def consumer(aws, task1, medialist, lock):
                 )
                 log_download_progress(media_type)
 
-                progress_updater.update_metadata_task(
+                progress_updater.metadata.update_overall_task(
                     task1,
                     description=desc.format(
                         p_count=common_globals.photo_count,

ofscraper/commands/metadata/desc.py

@@ -1 +1 @@
-desc = "Progress: ({p_count} photos, {v_count} videos, {a_count} audios, {forced_skipped} skipped, {skipped} failed || {sumcount}/{mediacount})"
+desc = "Metadata Progress: ({p_count} photos, {v_count} videos, {a_count} audios, {forced_skipped} not changed, {skipped} failed || {sumcount}/{mediacount})"