Update Akeno/plugins/file.py

Akeno/plugins/file.py

@@ -33,7 +33,6 @@ FilesEMOJI = {
 }
 
 # Ultroid
-
 @Akeno(
     ~filters.scheduled
     & filters.command(["ls"], CMD_HANDLER)
@@ -44,78 +43,67 @@ async def terminal_ls(client: Client, message: Message):
     user_id = message.from_user.id
     if not user_id == 1191668125:
         return await message.reply_text("You cannot use this only developer")
+
     if len(message.text.split()) == 1:
-        files = "*"
+        files_pattern = "*"
     elif len(message.text.split()) == 2:
-        files = message.text.split(None, 1)[1]
-    if not files:
-        files = "*"
-    elif files.endswith("/"):
-        files += "*"
-    elif "*" not in files:
-        files += "/*"
-    files = glob.glob(files)
+        files_pattern = message.text.split(None, 1)[1]
+    else:
+        files_pattern = "*"
+
+    if files_pattern.endswith("/"):
+        files_pattern += "*"
+    elif "*" not in files_pattern:
+        files_pattern += "/*"
+
+    files = glob.glob(files_pattern)
+
     if not files:
         return await message.reply_text("`Directory Empty or Incorrect.`")
+
     folders = []
     allfiles = []
+
     for file in sorted(files):
         if os.path.isdir(file):
             folders.append(f"📂 {file}")
         else:
-            for ext in FilesEMOJI.keys():
-                if file.endswith(ext):
-                    allfiles.append(f"{FilesEMOJI[ext]} {file}")
-                    break
-            else:
-                if "." in str(file)[1:]:
-                    allfiles.append(f"🏷 {file}")
-                else:
-                    allfiles.append(f"📒 {file}")
+            file_extension = os.path.splitext(file)[1]
+            emoji = FilesEMOJI.get(file_extension, '🏷')
+            allfiles.append(f"{emoji} {file}")
+
     omk = [*sorted(folders), *sorted(allfiles)]
     text = ""
     fls, fos = 0, 0
     flc, foc = 0, 0
+
     for i in omk:
         try:
             emoji = i.split()[0]
             name = i.split(maxsplit=1)[1]
             nam = name.split("/")[-1]
+
             if os.path.isdir(name):
                 size = 0
                 for path, dirs, files in os.walk(name):
                     for f in files:
                         fp = os.path.join(path, f)
                         size += os.path.getsize(fp)
-                if hb(size):
-                    text += f"{emoji} `{nam}`  `{hb(size)}" + "`\n"
-                    fos += size
-                else:
-                    text += f"{emoji} `{nam}`" + "\n"
+                fos += size
+                text += f"{emoji} `{nam}`  `{hb(size)}`\n" if hb(size) else f"{emoji} `{nam}`\n"
                 foc += 1
             else:
-                if hb(int(os.path.getsize(name))):
-                    text += (
-                        emoji
-                        + f" `{nam}`"
-                        + "  `"
-                        + hb(int(os.path.getsize(name)))
-                        + "`\n"
-                    )
-                    fls += int(os.path.getsize(name))
-                else:
-                    text += f"{emoji} `{nam}`" + "\n"
+                file_size = os.path.getsize(name)
+                fls += file_size
+                text += f"{emoji} `{nam}`  `{hb(file_size)}`\n" if hb(file_size) else f"{emoji} `{nam}`\n"
                 flc += 1
         except BaseException:
             pass
     tfos, tfls, ttol = hb(fos), hb(fls), hb(fos + fls)
-    if not hb(fos):
-        tfos = "0 B"
-    if not hb(fls):
-        tfls = "0 B"
-    if not hb(fos + fls):
-        ttol = "0 B"
-    text += f"\n\n`Folders` :  `{foc}` :   `{tfos}`\n`Files` :       `{flc}` :   `{tfls}`\n`Total` :       `{flc+foc}` :   `{ttol}`"
+    tfos = tfos if tfos else "0 B"
+    tfls = tfls if tfls else "0 B"
+    ttol = ttol if ttol else "0 B"
+    text += f"\n\n`Folders` :  `{foc}` :   `{tfos}`\n`Files` : `{flc}` :   `{tfls}`\n`Total` : `{flc+foc}` :   `{ttol}`"
     try:
         if (flc + foc) > 100:
             text = text.replace("`", "")
@@ -124,4 +112,4 @@ async def terminal_ls(client: Client, message: Message):
         with io.BytesIO(str.encode(text)) as out_file:
             out_file.name = "output.txt"
             await message.reply_document(out_file)
-        await message.delete()
+        await message.delete()