fix upload path view in usetting and limit ffmpeg threads by taskset pkg

Signed-off-by: anasty17 <e.anastayyar@gmail.com>

Author: anasty17

bot/helper/ext_utils/media_utils.py

@@ -16,6 +16,9 @@
 from .files_utils import get_mime_type, is_archive, is_archive_split
 from .status_utils import time_to_seconds
 
+threads = max(1, cpu_no // 2)
+cores = ",".join(str(i) for i in range(threads))
+
 
 async def create_thumb(msg, _id=""):
     if not _id:
@@ -125,6 +128,9 @@ async def take_ss(video_file, ss_nb) -> bool:
         for i in range(ss_nb):
             output = f"{dirpath}/SS.{name}_{i:02}.png"
             cmd = [
+                "taskset",
+                "-c",
+                f"{cores}",
                 "ffmpeg",
                 "-hide_banner",
                 "-loglevel",
@@ -138,7 +144,7 @@ async def take_ss(video_file, ss_nb) -> bool:
                 "-frames:v",
                 "1",
                 "-threads",
-                f"{max(1, cpu_no // 2)}",
+                f"{threads}",
                 output,
             ]
             cap_time += interval
@@ -168,6 +174,9 @@ async def get_audio_thumbnail(audio_file):
     await makedirs(output_dir, exist_ok=True)
     output = ospath.join(output_dir, f"{time()}.jpg")
     cmd = [
+        "taskset",
+        "-c",
+        f"{cores}",
         "ffmpeg",
         "-hide_banner",
         "-loglevel",
@@ -178,7 +187,7 @@ async def get_audio_thumbnail(audio_file):
         "-vcodec",
         "copy",
         "-threads",
-        f"{max(1, cpu_no // 2)}",
+        f"{threads}",
         output,
     ]
     try:
@@ -206,6 +215,9 @@ async def get_video_thumbnail(video_file, duration):
         duration = 3
     duration = duration // 2
     cmd = [
+        "taskset",
+        "-c",
+        f"{cores}",
         "ffmpeg",
         "-hide_banner",
         "-loglevel",
@@ -221,7 +233,7 @@ async def get_video_thumbnail(video_file, duration):
         "-frames:v",
         "1",
         "-threads",
-        f"{max(1, cpu_no // 2)}",
+        f"{threads}",
         output,
     ]
     try:
@@ -249,6 +261,9 @@ async def get_multiple_frames_thumbnail(video_file, layout, keep_screenshots):
     await makedirs(output_dir, exist_ok=True)
     output = ospath.join(output_dir, f"{time()}.jpg")
     cmd = [
+        "taskset",
+        "-c",
+        f"{cores}",
         "ffmpeg",
         "-hide_banner",
         "-loglevel",
@@ -266,7 +281,7 @@ async def get_multiple_frames_thumbnail(video_file, layout, keep_screenshots):
         "-f",
         "mjpeg",
         "-threads",
-        f"{max(1, cpu_no // 2)}",
+        f"{threads}",
         output,
     ]
     try:
@@ -445,7 +460,7 @@ async def convert_video(self, video_file, ext, retry=False):
                 "-c:a",
                 "aac",
                 "-threads",
-                f"{max(1, cpu_no // 2)}",
+                f"{threads}",
                 output,
             ]
             if ext == "mp4":
@@ -469,7 +484,7 @@ async def convert_video(self, video_file, ext, retry=False):
                 "-c",
                 "copy",
                 "-threads",
-                f"{max(1, cpu_no // 2)}",
+                f"{threads}",
                 output,
             ]
         if self._listener.is_cancelled:
@@ -516,7 +531,7 @@ async def convert_audio(self, audio_file, ext):
             "-i",
             audio_file,
             "-threads",
-            f"{max(1, cpu_no // 2)}",
+            f"{threads}",
             output,
         ]
         if self._listener.is_cancelled:
@@ -596,7 +611,7 @@ async def sample_video(self, video_file, sample_duration, part_duration):
             "-c:a",
             "aac",
             "-threads",
-            f"{max(1, cpu_no // 2)}",
+            f"{threads}",
             output_file,
         ]
 
@@ -661,7 +676,7 @@ async def split(self, f_path, file_, parts, split_size):
                 "-c",
                 "copy",
                 "-threads",
-                f"{max(1, cpu_no // 2)}",
+                f"{threads}",
                 out_path,
             ]
             if not multi_streams:

bot/modules/users_settings.py

@@ -245,7 +245,7 @@ async def get_user_settings(from_user, stype="main"):
         upload_paths = user_dict.get("UPLOAD_PATHS", {})
         if not upload_paths and "UPLOAD_PATHS" not in user_dict and Config.UPLOAD_PATHS:
             upload_paths = Config.UPLOAD_PATHS
-        else:
+        if not upload_paths:
             upload_paths = "None"
 
         buttons.data_button("Upload Paths", f"userset {user_id} menu UPLOAD_PATHS")
@@ -279,7 +279,9 @@ async def get_user_settings(from_user, stype="main"):
             ex_ex = "None"
 
         ns_msg = "Added" if user_dict.get("NAME_SUBSTITUTE", False) else "None"
-        buttons.data_button("Name Substitute", f"userset {user_id} menu NAME_SUBSTITUTE")
+        buttons.data_button(
+            "Name Substitute", f"userset {user_id} menu NAME_SUBSTITUTE"
+        )
 
         buttons.data_button("YT-DLP Options", f"userset {user_id} menu YT_DLP_OPTIONS")
         if user_dict.get("YT_DLP_OPTIONS", False):