update for v3

To Do --

-- #102 (comment)

-- #61 (comment)

-- #98 (comment)

-- #104 (comment)

-- #84 (comment)

.gitignore

@@ -1,4 +1,16 @@
+# ignore python builds
 __pycache__/
 dist/
 downloads/
-*.log
+*.log
+.spyproject/
+
+
+# ignore doc builds
+.next/
+node_modules/
+
+
+# ignore .env
+
+.env

Uploader/button.py

@@ -25,31 +25,16 @@
 import time
 import shutil
 import asyncio
-import logging
 import subprocess
 
 from pyrogram.types import *
 from datetime import datetime
 
 from Uploader.utitles import *
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
 from Uploader.script import Translation
 from Uploader.functions.ran_text import random_char
 from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-logging.getLogger("pyrogram").setLevel(logging.WARNING)
-
-
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-
 
 async def youtube_dl_call_back(bot, update):
     cb_data = update.data

Uploader/callbacks.py

@@ -22,19 +22,11 @@
 
 import os
 from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
 from Uploader.dl_button import ddl_call_back
 from Uploader.button import youtube_dl_call_back
 from Uploader.script import Translation
 from pyrogram import Client, types
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
-import logging
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
 
 
 @Client.on_callback_query()

Uploader/commands.py

@@ -25,11 +25,6 @@
 from pyrogram.types import Message
 from Uploader.script import Translation
 
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
-
 
 @Client.on_message(
     filters.command("start") & filters.private,

Uploader/dl_button.py

@@ -31,14 +31,14 @@
 from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes, TimeFormatter
 from Uploader.utitles import *
 from Uploader.script import Translation
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
 
+import logging
+
+from config import Config
 logging.basicConfig(level=logging.DEBUG,
                     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
+
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 

Uploader/echo.py

@@ -31,23 +31,21 @@
 from pyrogram.types import Thumbnail
 from pyrogram import Client, filters
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
-
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
 from Uploader.script import Translation
 from Uploader.functions.ran_text import random_char
 from Uploader.functions.display_progress import humanbytes
 from Uploader.functions.display_progress import humanbytes
+from config import Config
+
 
+s2tw = OpenCC('s2tw.json').convert
+
+import logging
 logging.basicConfig(level=logging.DEBUG,
                     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 logger = logging.getLogger(__name__)
-logging.getLogger("pyrogram").setLevel(logging.WARNING)
-
-s2tw = OpenCC('s2tw.json').convert
 
+logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 @Client.on_message(filters.private & filters.regex(pattern=".*http.*"))
 async def echo(bot, update):

Uploader/functions/display_progress.py

@@ -24,10 +24,6 @@
 import time
 import logging
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 
 async def progress_for_pyrogram(

Uploader/functions/help_Nekmo_ffmpeg.py

@@ -25,10 +25,6 @@
 from hachoir.parser import createParser
 from hachoir.metadata import extractMetadata
 import time
-import logging
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
 
 
 async def place_water_mark(input_file, output_file, water_mark_file):

Uploader/functions/help_uploadbot.py

@@ -27,10 +27,6 @@
 
 from Uploader.functions.display_progress import humanbytes
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-
 
 def DetectFileSize(url):
     r = requests.get(url, allow_redirects=True, stream=True)

Uploader/functions/help_ytdl.py

@@ -27,10 +27,6 @@
 
 from urllib.parse import urlparse
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-
 
 def get_file_extension_from_url(url):
     url_path = urlparse(url).path

Uploader/thumbunali.py

@@ -24,10 +24,7 @@
 
 from pyrogram import Client, filters
 
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
+from config import Config
 
 
 @Client.on_message(filters.photo & filters.incoming & filters.private)

Uploader/utitles.py

@@ -26,10 +26,6 @@
 from hachoir.metadata import extractMetadata
 
 
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 
 async def Mdata01(download_directory):

Uploader/youtube.py

@@ -31,12 +31,8 @@
 from pyrogram.types import Message
 from pyrogram import Client, filters
 
-if bool(os.environ.get("WEBHOOK")):
-    from Uploader.config import Config
-else:
-    from sample_config import Config
-
 from Uploader.functions.help_ytdl import get_file_extension_from_url, get_resolution
+from config import Config
 
 YTDL_REGEX = (r"^((?:https?:)?\/\/)")
 s2tw = OpenCC('s2tw.json').convert