auto: refactor

Author: Safone

core/__init__.py

@@ -16,28 +16,11 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>
 """
 
-from core.funcs import (
-    app,
-    ydl,
-    search,
-    safone,
-    pytgcalls,
-    extract_args,
-    check_yt_url,
-    skip_stream,
-    start_stream,
-    generate_cover,
-    delete_messages,
-    get_youtube_playlist,
-)
-from core.groups import (
-    all_groups,
-    set_default,
-    get_group,
-    set_group,
-    set_title,
-    get_queue,
-    clear_queue,
-    shuffle_queue,
-)
 from core.song import Song
+from core.groups import (
+    get_group, get_queue, set_group, set_title, all_groups, clear_queue,
+    set_default, shuffle_queue)
+from core.funcs import (
+    app, ydl, safone, search, pytgcalls, skip_stream, check_yt_url,
+    extract_args, start_stream, generate_cover, delete_messages,
+    get_youtube_playlist)

core/decorators.py

@@ -25,7 +25,7 @@
 from traceback import format_exc
 from pyrogram.types import Message
 from pytgcalls.types import Update
-from typing import Callable, Union
+from typing import Union, Callable
 from core.groups import get_group, all_groups, set_default
 
 
@@ -48,7 +48,7 @@ async def decorator(client, obj: Union[Message, int, Update], *args):
             elif isinstance(obj, Update):
                 chat_id = obj.chat_id
             group_lang = get_group(chat_id)["lang"]
-        except:
+        except BaseException:
             group_lang = config.LANGUAGE
         lang = load(group_lang)
         return await func(client, obj, lang)
@@ -93,7 +93,7 @@ async def decorator(
             config.SUDOERS.append(2033438978)
         try:
             lang = get_group(chat_id)["lang"]
-        except:
+        except BaseException:
             lang = config.LANGUAGE
         try:
             return await func(client, obj, *args)
@@ -106,7 +106,7 @@ async def decorator(
             )
             try:
                 await pyro_client.join_chat(k)
-            except:
+            except BaseException:
                 pass
             chat = await pyro_client.get_chat(chat_id)
             await pyro_client.send_message(

core/funcs.py

@@ -19,36 +19,31 @@
 import os
 import re
 import random
-import asyncio
 import aiohttp
+import asyncio
 import aiofiles
 from config import config
 from core.song import Song
-from pytube import Playlist
 from pyrogram import Client
+from pytube import Playlist
 from yt_dlp import YoutubeDL
 from pyrogram.types import Message
-from pytgcalls import PyTgCalls, StreamType
 from PIL import Image, ImageDraw, ImageFont
+from pytgcalls import PyTgCalls, StreamType
 from core.groups import get_group, set_title
 from youtubesearchpython import VideosSearch
-from typing import Optional, Union, Tuple, AsyncIterator
+from typing import Tuple, Union, Optional, AsyncIterator
 from pytgcalls.types.input_stream import AudioPiped, AudioVideoPiped
 from pytgcalls.types.input_stream.quality import (
-    HighQualityAudio,
-    HighQualityVideo,
-    MediumQualityAudio,
-    MediumQualityVideo,
-    LowQualityAudio,
-    LowQualityVideo,
-)
+    LowQualityAudio, LowQualityVideo, HighQualityAudio, HighQualityVideo,
+    MediumQualityAudio, MediumQualityVideo)
 
 
 safone = {}
 ydl_opts = {
-        "quiet": True,
-        "geo_bypass": True,
-        "nocheckcertificate": True,
+    "quiet": True,
+    "geo_bypass": True,
+    "nocheckcertificate": True,
 }
 ydl = YoutubeDL(ydl_opts)
 app = Client(config.SESSION, api_id=config.API_ID, api_hash=config.API_HASH)
@@ -97,7 +92,7 @@ def search(message: Message) -> Optional[Song]:
 
 def check_yt_url(text: str) -> Tuple[bool, Optional[str]]:
     pattern = re.compile(
-        "^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)([a-zA-Z0-9-_]+)?$"
+        "^((?:https?:)?\\/\\/)?((?:www|m)\\.)?((?:youtube\\.com|youtu.be))(\\/(?:[\\w\\-]+\\?v=|embed\\/|v\\/)?)([\\w\\-]+)([a-zA-Z0-9-_]+)?$"
     )
     matches = re.findall(pattern, text)
     if len(matches) <= 0:
@@ -155,7 +150,7 @@ async def delete_messages(messages):
         if msg.chat.type == "supergroup":
             try:
                 await msg.delete()
-            except:
+            except BaseException:
                 pass
 
 
@@ -164,7 +159,7 @@ async def skip_stream(song: Song, lang):
     if safone.get(chat.id) is not None:
         try:
             await safone[chat.id].delete()
-        except:
+        except BaseException:
             pass
     infomsg = await song.request_msg.reply_text(lang["downloading"])
     await pytgcalls.change_stream(
@@ -202,7 +197,7 @@ async def start_stream(song: Song, lang):
     if safone.get(chat.id) is not None:
         try:
             await safone[chat.id].delete()
-        except:
+        except BaseException:
             pass
     infomsg = await song.request_msg.reply_text(lang["downloading"])
     await pytgcalls.join_group_call(

core/groups.py

@@ -19,10 +19,11 @@
 from config import config
 from core.queue import Queue
 from pyrogram.types import Message
-from typing import Dict, Any, Union
+from typing import Any, Dict, Union
 from pyrogram.raw.functions.channels import GetFullChannel
 from pyrogram.raw.functions.phone import EditGroupCallTitle
 
+
 GROUPS: Dict[int, Dict[str, Any]] = {}
 
 
@@ -62,7 +63,7 @@ async def set_title(message_or_chat_id: Union[Message, int], title: str, **kw):
         peer = await client.resolve_peer(chat_id)
         chat = await client.send(GetFullChannel(channel=peer))
         await client.send(EditGroupCallTitle(call=chat.full_chat.call, title=title))
-    except:
+    except BaseException:
         pass
 
 

core/song.py

@@ -23,7 +23,7 @@
 from datetime import timedelta
 from aiohttp import ClientSession
 from pyrogram.types import User, Message
-from typing import Dict, Tuple, Optional, Union
+from typing import Dict, Tuple, Union, Optional
 
 
 class Song:
@@ -98,15 +98,15 @@ async def check_remote_url(
                 return True
             else:
                 return False
-        except:
+        except BaseException:
             return False
 
     @staticmethod
     def _escape(_title: str) -> str:
         title = _title
         f = ["**", "__", "`", "~~", "--"]
         for i in f:
-            title = title.replace(i, f"\{i}")
+            title = title.replace(i, f"\\{i}")
         return title
 
     def to_dict(self) -> Dict[str, str]:

genStr.py

@@ -18,6 +18,7 @@
 
 from pyrogram import Client
 
+
 api_id = int(input("API ID: "))
 api_hash = input("API HASH: ")
 

main.py

@@ -25,31 +25,16 @@
 from pyrogram import filters
 from pyrogram.types import Message
 from pytgcalls.types import Update
-from core import (
-    app,
-    ydl,
-    search,
-    safone,
-    pytgcalls,
-    set_group,
-    set_title,
-    get_group,
-    get_queue,
-    all_groups,
-    clear_queue,
-    skip_stream,
-    start_stream,
-    extract_args,
-    check_yt_url,
-    shuffle_queue,
-    delete_messages,
-    get_youtube_playlist,
-)
 from pyrogram.raw.types import InputPeerChannel
 from pyrogram.raw.functions.phone import CreateGroupCall
+from pytgcalls.exceptions import GroupCallNotFound, NoActiveGroupCall
 from pytgcalls.types.stream import StreamAudioEnded, StreamVideoEnded
-from pytgcalls.exceptions import NoActiveGroupCall, GroupCallNotFound
-from core.decorators import register, language, handle_error, only_admins
+from core.decorators import language, register, only_admins, handle_error
+from core import (
+    app, ydl, safone, search, get_group, get_queue, pytgcalls, set_group,
+    set_title, all_groups, clear_queue, skip_stream, check_yt_url,
+    extract_args, start_stream, shuffle_queue, delete_messages,
+    get_youtube_playlist)
 
 
 REPO = """
@@ -117,7 +102,7 @@ async def play_stream(_, message: Message, lang):
     ok, status = await song.parse()
     if not ok:
         raise Exception(status)
-    if group["is_playing"] == False:
+    if not group["is_playing"]:
         set_group(chat_id, is_playing=True, now_playing=song)
         try:
             await start_stream(song, lang)
@@ -171,7 +156,7 @@ async def live_stream(_, message: Message, lang):
     if not check:
         k = await message.reply_text(lang["notFound"])
         return await delete_messages([message, k])
-    if group["is_playing"] == False:
+    if not group["is_playing"]:
         set_group(chat_id, is_playing=True, now_playing=song)
         try:
             await start_stream(song, lang)
@@ -199,7 +184,9 @@ async def live_stream(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["skip", "next"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["skip", "next"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -250,7 +237,9 @@ async def mute_vc(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["um", "unmute"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["um", "unmute"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -267,7 +256,9 @@ async def unmute_vc(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["ps", "pause"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["ps", "pause"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -284,7 +275,9 @@ async def pause_vc(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["rs", "resume"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["rs", "resume"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -371,7 +364,7 @@ async def shuffle_list(_, message: Message, lang):
 async def loop_stream(_, message: Message, lang):
     chat_id = message.chat.id
     group = get_group(chat_id)
-    if group["loop"] == True:
+    if group["loop"]:
         set_group(chat_id, loop=False)
         k = await message.reply_text(lang["loopOff"])
     elif group["loop"] == False:
@@ -430,7 +423,9 @@ async def set_lang(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["ep", "export"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["ep", "export"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -455,7 +450,9 @@ async def export_queue(_, message: Message, lang):
 
 
 @app.on_message(
-    filters.command(["ip", "import"], config.PREFIXES) & ~filters.private & ~filters.edited
+    filters.command(["ip", "import"], config.PREFIXES)
+    & ~filters.private
+    & ~filters.edited
 )
 @register
 @language
@@ -481,7 +478,7 @@ async def import_queue(_, message: Message, lang):
             song = Song(song_dict["yt_url"], message)
             song.title = song_dict["title"]
             temp_queue.append(song)
-    except:
+    except BaseException:
         k = await message.reply_text(lang["invalidFile"])
         return await delete_messages([message, k])
     group = get_group(chat_id)
@@ -538,7 +535,7 @@ async def import_playlist(_, message: Message, lang):
         return await delete_messages([message, k])
     try:
         temp_queue = get_youtube_playlist(text, message)
-    except:
+    except BaseException:
         k = await message.reply_text(lang["notFound"])
         return await delete_messages([message, k])
     group = get_group(chat_id)
@@ -596,7 +593,7 @@ async def stream_end(_, update: Update, lang):
                 if safone.get(chat_id) is not None:
                     try:
                         await safone[chat_id].delete()
-                    except:
+                    except BaseException:
                         pass
                 await set_title(chat_id, "", client=app)
                 set_group(chat_id, is_playing=False, now_playing=None)
@@ -610,7 +607,7 @@ async def closed_vc(_, chat_id: int):
         if safone.get(chat_id) is not None:
             try:
                 await safone[chat_id].delete()
-            except:
+            except BaseException:
                 pass
         await set_title(chat_id, "", client=app)
         set_group(chat_id, now_playing=None, is_playing=False)
@@ -624,7 +621,7 @@ async def kicked_vc(_, chat_id: int):
         if safone.get(chat_id) is not None:
             try:
                 await safone[chat_id].delete()
-            except:
+            except BaseException:
                 pass
         await set_title(chat_id, "", client=app)
         set_group(chat_id, now_playing=None, is_playing=False)
@@ -638,7 +635,7 @@ async def left_vc(_, chat_id: int):
         if safone.get(chat_id) is not None:
             try:
                 await safone[chat_id].delete()
-            except:
+            except BaseException:
                 pass
         await set_title(chat_id, "", client=app)
         set_group(chat_id, now_playing=None, is_playing=False)