Fix status

Signed-off-by: anasty17 <[email protected]>

Author: anasty17

bot/helper/__init__.py

@@ -0,0 +1 @@
+

bot/helper/ext_utils/bot_utils.py

@@ -10,7 +10,11 @@
 from functools import partial, wraps
 
 from bot import user_data, config_dict, bot_loop
-from bot.helper.ext_utils.help_messages import YT_HELP_DICT, MIRROR_HELP_DICT
+from bot.helper.ext_utils.help_messages import (
+    YT_HELP_DICT,
+    MIRROR_HELP_DICT,
+    CLONE_HELP_DICT,
+)
 from bot.helper.ext_utils.telegraph_helper import telegraph
 from bot.helper.telegram_helper.button_build import ButtonMaker
 
@@ -37,14 +41,19 @@ def cancel(self):
 def create_help_buttons():
     buttons = ButtonMaker()
     for name in list(MIRROR_HELP_DICT.keys())[1:]:
-        buttons.ibutton(name, f"help m {name}")
+        buttons.ibutton(name, f"help mirror {name}")
     buttons.ibutton("Close", "help close")
     COMMAND_USAGE["mirror"] = [MIRROR_HELP_DICT["main"], buttons.build_menu(3)]
     buttons.reset()
     for name in list(YT_HELP_DICT.keys())[1:]:
         buttons.ibutton(name, f"help yt {name}")
     buttons.ibutton("Close", "help close")
     COMMAND_USAGE["yt"] = [YT_HELP_DICT["main"], buttons.build_menu(3)]
+    buttons.reset()
+    for name in list(CLONE_HELP_DICT.keys())[1:]:
+        buttons.ibutton(name, f"help clone {name}")
+    buttons.ibutton("Close", "help close")
+    COMMAND_USAGE["clone"] = [CLONE_HELP_DICT["main"], buttons.build_menu(3)]
 
 
 def bt_selection_buttons(id_):
@@ -163,7 +172,7 @@ def update_user_ldata(id_, key, value):
     user_data[id_][key] = value
 
 
-async def retry_function(func, *args, retry=10, **kwargs):
+async def retry_function(func, *args, retry=30, **kwargs):
     try:
         return await func(*args, **kwargs)
     except:

bot/helper/ext_utils/help_messages.py

@@ -18,6 +18,9 @@
 Check here all supported <a href='https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md'>SITES</a>
 Check all yt-dlp api options from this <a href='https://github.com/yt-dlp/yt-dlp/blob/master/yt_dlp/YoutubeDL.py#L184'>FILE</a> or use this <a href='https://t.me/mltb_official_channel/177'>script</a> to convert cli arguments to api options."""
 
+clone = """Send Gdrive|Gdot|Filepress|Filebee|Appdrive|Gdflix link or rclone path along with command or by replying to the link/rc_path by command.
+Use -sync to use sync method in rclone. Example: /cmd rcl/rclone_path -up rcl/rclone_path/rc -sync"""
+
 new_name = """<b>New Name</b>: -n
 
 /cmd link -n new name
@@ -154,7 +157,7 @@
 You can add tuple and dict also. Use double quotes inside dict."""
 
 convert_media = """<b>Convert Media</b>: -ca -cv
-/cmd link -ca mp3 -cv mp4  (convert all audios to mp3 and videos to mp4)
+/cmd link -ca mp3 -cv mp4 (convert all audios to mp3 and all videos to mp4)
 /cmd link -ca mp3 (convert all audios to mp3)
 /cmd link -cv mp4 (convert all videos to mp4)
 /cmd link -ca mp3 + flac ogg (convert only flac and ogg audios to mp3)
@@ -165,6 +168,19 @@
 /cmd link -fd (force download only)
 /cmd link -fu (force upload directly after download finish)"""
 
+gdrive = """<b>Gdrive</b>: link
+If DEFAULT_UPLOAD is `rc` then you can pass up: `gd` to upload using gdrive tools to GDRIVE_ID.
+/cmd gdriveLink or gdl or gdriveId -up gdl or gdriveId or gd
+/cmd tp:gdriveLink or tp:gdriveId -up tp:gdriveId or gdl or gd (to use token.pickle if service account enabled)
+/cmd sa:gdriveLink or sa:gdriveId -p sa:gdriveId or gdl or gd (to use service account if service account disabled)
+/cmd mtp:gdriveLink or mtp:gdriveId -up mtp:gdriveId or gdl or gd(if you have added upload gdriveId from usetting) (to use user token.pickle that uploaded by usetting)"""
+
+rclone_cl = """<b>Rclone</b>: path
+If DEFAULT_UPLOAD is `gd` then you can pass up: `rc` to upload to RCLONE_PATH.
+/cmd rcl/rclone_path -up rcl/rclone_path/rc -rcf flagkey:flagvalue|flagkey|flagkey:flagvalue
+/cmd rcl or rclonePath -up rclonePath or rc or rcl
+/cmd mrcc:rclonePath -up rcl or rc(if you have add rclone path from usetting) (to use user config)"""
+
 YT_HELP_DICT = {
     "main": yt,
     "New-Name": f"{new_name}\nNote: Don't add file extension",
@@ -209,6 +225,14 @@
     "User-Download": user_download,
 }
 
+CLONE_HELP_DICT = {
+    "main": clone,
+    "Multi-Link": multi_link,
+    "Bulk": bulk,
+    "Gdrive": gdrive,
+    "Rclone": rclone_cl,
+}
+
 RSS_HELP_MESSAGE = """
 Use this format to add feed url:
 Title1 link (required)
@@ -232,36 +256,6 @@
 Timeout: 60 sec.
 """
 
-CLONE_HELP_MESSAGE = """
-Send Gdrive|Gdot|Filepress|Filebee|Appdrive|Gdflix link or rclone path along with command or by replying to the link/rc_path by command.
-
-<b>Multi links only by replying to first gdlink or rclone_path:</b> -i
-/cmd -i 10(number of links/paths)
-
-<b>Bulk Clone</b>: -b
-Bulk can be used by text message and by replying to text file contains links seperated by new line.
-You can use it only by reply to message(text/file).
-Example:
-link1 -up remote1:path1 -rcf |key:value|key:value
-link2 -up remote2:path2
-link3 -up remote2:path2
-Reply to this example by this cmd /cmd -b(bulk)
-You can set start and end of the links from the bulk like seed, with -b start:end or only end by -b :end or only start by -b start. The default start is from zero(first link) to inf.
-
-<b>Clone Destination</b>: -up
-If DEFAULT_UPLOAD is `rc` then you can pass up: `gd` to upload using gdrive tools to GDRIVE_ID.
-If DEFAULT_UPLOAD is `gd` then you can pass up: `rc` to upload to RCLONE_PATH.
-If you want to add path or gdrive manually from your config/token (uploaded from usetting) add mrcc: for rclone and mtp: before the path/gdrive_id without space.
-Incase you want to specify whether using token or service accounts you can add tp:link or tp:gdrive_id or sa:link or sa:gdrive_id. This for links and upload destination.
-
-<b>Gdrive:</b>
-/cmd gdrivelink/gdl/gdrive_id -up gdl/gdrive_id/gd
-
-<b>Rclone:</b>
-/cmd rcl/rclone_path -up rcl/rclone_path/rc -rcf flagkey:flagvalue|flagkey|flagkey:flagvalue
-Use -sync to use sync method in rclone. Example: /cmd rcl/rclone_path -up rcl/rclone_path/rc -sync
-"""
-
 PASSWORD_ERROR_MESSAGE = """
 <b>This link requires a password!</b>
 - Insert <b>::</b> after the link and write the password after the sign.

bot/helper/ext_utils/status_utils.py

@@ -1,7 +1,7 @@
 from html import escape
 from psutil import virtual_memory, cpu_percent, disk_usage
 from time import time
-from asyncio import gather
+from asyncio import gather, iscoroutinefunction
 
 from bot import DOWNLOAD_DIR, task_dict, task_dict_lock, botStartTime, config_dict
 from bot.helper.ext_utils.bot_utils import sync_to_async
@@ -174,7 +174,12 @@ async def get_readable_message(sid, is_user, page_no=1, status="All", page_step=
             MirrorStatus.STATUS_CONVERTING,
             MirrorStatus.STATUS_QUEUEUP,
         ]:
-            msg += f"\n{get_progress_bar_string(task.progress())} {task.progress()}"
+            progress = (
+                await task.progress()
+                if iscoroutinefunction(task.progress)
+                else task.progress()
+            )
+            msg += f"\n{get_progress_bar_string(progress)} {progress}"
             msg += f"\n<b>Processed:</b> {task.processed_bytes()} of {task.size()}"
             msg += f"\n<b>Speed:</b> {task.speed()} | <b>ETA:</b> {task.eta()}"
             if hasattr(task, "seeders_num"):

bot/helper/mirror_utils/status_utils/extract_status.py

@@ -1,7 +1,6 @@
 from time import time
 
 from bot import LOGGER, subprocess_lock
-from bot.helper.ext_utils.bot_utils import async_to_sync
 from bot.helper.ext_utils.files_utils import get_path_size
 from bot.helper.ext_utils.status_utils import (
     get_readable_file_size,
@@ -16,21 +15,23 @@ def __init__(self, listener, gid):
         self._size = self.listener.size
         self._gid = gid
         self._start_time = time()
+        self._proccessed_bytes = 0
 
     def gid(self):
         return self._gid
 
     def speed_raw(self):
-        return self.processed_raw() / (time() - self._start_time)
+        return self._proccessed_bytes / (time() - self._start_time)
 
-    def progress_raw(self):
+    async def progress_raw(self):
+        await self.processed_raw()
         try:
-            return self.processed_raw() / self._size * 100
+            return self._proccessed_bytes / self._size * 100
         except:
             return 0
 
-    def progress(self):
-        return f"{round(self.progress_raw(), 2)}%"
+    async def progress(self):
+        return f"{round(await self.progress_raw(), 2)}%"
 
     def speed(self):
         return f"{get_readable_file_size(self.speed_raw())}/s"
@@ -43,7 +44,7 @@ def size(self):
 
     def eta(self):
         try:
-            seconds = (self._size - self.processed_raw()) / self.speed_raw()
+            seconds = (self._size - self._proccessed_bytes) / self.speed_raw()
             return get_readable_time(seconds)
         except:
             return "-"
@@ -52,13 +53,13 @@ async def status(self):
         return MirrorStatus.STATUS_EXTRACTING
 
     def processed_bytes(self):
-        return get_readable_file_size(self.processed_raw())
+        return get_readable_file_size(self._proccessed_bytes)
 
     def processed_raw(self):
         if self.listener.newDir:
-            return async_to_sync(get_path_size, self.listener.newDir)
+            self._proccessed_bytes = get_path_size(self.listener.newDir)
         else:
-            return async_to_sync(get_path_size, self.listener.dir) - self._size
+            self._proccessed_bytes = get_path_size(self.listener.dir) - self._size
 
     def task(self):
         return self

bot/helper/mirror_utils/status_utils/media_convert_status.py

@@ -11,27 +11,15 @@ def __init__(self, listener, gid):
     def gid(self):
         return self._gid
 
-    def progress(self):
-        return "0"
-
-    def speed(self):
-        return "0"
-
     def name(self):
         return self.listener.name
 
     def size(self):
         return get_readable_file_size(self._size)
 
-    def eta(self):
-        return "0s"
-
     async def status(self):
         return MirrorStatus.STATUS_CONVERTING
 
-    def processed_bytes(self):
-        return 0
-
     def task(self):
         return self
 

bot/helper/mirror_utils/status_utils/sample_video_status.py

@@ -11,27 +11,15 @@ def __init__(self, listener, gid):
     def gid(self):
         return self._gid
 
-    def progress(self):
-        return "0"
-
-    def speed(self):
-        return "0"
-
     def name(self):
         return self.listener.name
 
     def size(self):
         return get_readable_file_size(self._size)
 
-    def eta(self):
-        return "0s"
-
     async def status(self):
         return MirrorStatus.STATUS_SAMVID
 
-    def processed_bytes(self):
-        return 0
-
     def task(self):
         return self
 

bot/helper/mirror_utils/status_utils/split_status.py

@@ -11,27 +11,15 @@ def __init__(self, listener, gid):
     def gid(self):
         return self._gid
 
-    def progress(self):
-        return "0"
-
-    def speed(self):
-        return "0"
-
     def name(self):
         return self.listener.name
 
     def size(self):
         return get_readable_file_size(self._size)
 
-    def eta(self):
-        return "0s"
-
     async def status(self):
         return MirrorStatus.STATUS_SPLITTING
 
-    def processed_bytes(self):
-        return 0
-
     def task(self):
         return self
 

bot/helper/mirror_utils/status_utils/yt_dlp_download_status.py

@@ -1,4 +1,3 @@
-from bot.helper.ext_utils.bot_utils import async_to_sync
 from bot.helper.ext_utils.files_utils import get_path_size
 from bot.helper.ext_utils.status_utils import (
     MirrorStatus,
@@ -12,18 +11,19 @@ def __init__(self, listener, obj, gid):
         self._obj = obj
         self._gid = gid
         self.listener = listener
+        self._proccessed_bytes = 0
 
     def gid(self):
         return self._gid
 
     def processed_bytes(self):
-        return get_readable_file_size(self.processed_raw())
+        return get_readable_file_size(self._proccessed_bytes)
 
-    def processed_raw(self):
+    async def processed_raw(self):
         if self._obj.downloaded_bytes != 0:
-            return self._obj.downloaded_bytes
+            self._proccessed_bytes = self._obj.downloaded_bytes
         else:
-            return async_to_sync(get_path_size, self.listener.dir)
+            self._proccessed_bytes = await get_path_size(self.listener.dir)
 
     def size(self):
         return get_readable_file_size(self._obj.size)
@@ -34,7 +34,8 @@ async def status(self):
     def name(self):
         return self.listener.name
 
-    def progress(self):
+    async def progress(self):
+        await self.processed_raw()
         return f"{round(self._obj.progress, 2)}%"
 
     def speed(self):
@@ -44,7 +45,9 @@ def eta(self):
         if self._obj.eta != "-":
             return get_readable_time(self._obj.eta)
         try:
-            seconds = (self._obj.size - self.processed_raw()) / self._obj.download_speed
+            seconds = (
+                self._obj.size - self._proccessed_bytes
+            ) / self._obj.download_speed
             return get_readable_time(seconds)
         except:
             return "-"