Skip to content

Commit eb33050

Browse files
committed
1 parent 4920bb2 commit eb33050

38 files changed

+271
-258
lines changed

Diff for: .gitignore

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1+
# ignore python builds
12
__pycache__/
23
dist/
34
downloads/
4-
*.log
5+
*.log
6+
.spyproject/
7+
8+
9+
# ignore doc builds
10+
.next/
11+
node_modules/
12+
13+
14+
# ignore .env
15+
16+
.env

Diff for: .spyproject/config/backups/codestyle.ini.bak

-8
This file was deleted.

Diff for: .spyproject/config/backups/encoding.ini.bak

-6
This file was deleted.

Diff for: .spyproject/config/backups/vcs.ini.bak

-7
This file was deleted.

Diff for: .spyproject/config/backups/workspace.ini.bak

-12
This file was deleted.

Diff for: .spyproject/config/codestyle.ini

-8
This file was deleted.

Diff for: .spyproject/config/defaults/defaults-codestyle-0.2.0.ini

-5
This file was deleted.

Diff for: .spyproject/config/defaults/defaults-encoding-0.2.0.ini

-3
This file was deleted.

Diff for: .spyproject/config/defaults/defaults-vcs-0.2.0.ini

-4
This file was deleted.

Diff for: .spyproject/config/defaults/defaults-workspace-0.2.0.ini

-6
This file was deleted.

Diff for: .spyproject/config/encoding.ini

-6
This file was deleted.

Diff for: .spyproject/config/vcs.ini

-7
This file was deleted.

Diff for: .spyproject/config/workspace.ini

-12
This file was deleted.

Diff for: All-Url-Uploader.session

28 KB
Binary file not shown.

Diff for: All-Url-Uploader.session-journal

16.5 KB
Binary file not shown.

Diff for: Uploader/button.py

-15
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,16 @@
2525
import time
2626
import shutil
2727
import asyncio
28-
import logging
2928
import subprocess
3029

3130
from pyrogram.types import *
3231
from datetime import datetime
3332

3433
from Uploader.utitles import *
35-
if bool(os.environ.get("WEBHOOK")):
36-
from Uploader.config import Config
37-
else:
38-
from sample_config import Config
3934
from Uploader.script import Translation
4035
from Uploader.functions.ran_text import random_char
4136
from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes
4237

43-
logging.basicConfig(level=logging.DEBUG,
44-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
45-
logger = logging.getLogger(__name__)
46-
logging.getLogger("pyrogram").setLevel(logging.WARNING)
47-
48-
49-
logging.basicConfig(level=logging.DEBUG,
50-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
51-
logger = logging.getLogger(__name__)
52-
5338

5439
async def youtube_dl_call_back(bot, update):
5540
cb_data = update.data

Diff for: Uploader/callbacks.py

-8
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,11 @@
2222

2323
import os
2424
from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes
25-
if bool(os.environ.get("WEBHOOK")):
26-
from Uploader.config import Config
27-
else:
28-
from sample_config import Config
2925
from Uploader.dl_button import ddl_call_back
3026
from Uploader.button import youtube_dl_call_back
3127
from Uploader.script import Translation
3228
from pyrogram import Client, types
3329
from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
34-
import logging
35-
logging.basicConfig(level=logging.DEBUG,
36-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
37-
logger = logging.getLogger(__name__)
3830

3931

4032
@Client.on_callback_query()

Diff for: Uploader/commands.py

-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
from pyrogram.types import Message
2626
from Uploader.script import Translation
2727

28-
if bool(os.environ.get("WEBHOOK")):
29-
from Uploader.config import Config
30-
else:
31-
from sample_config import Config
32-
3328

3429
@Client.on_message(
3530
filters.command("start") & filters.private,

Diff for: Uploader/config.py

-72
This file was deleted.

Diff for: Uploader/dl_button.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
from Uploader.functions.display_progress import progress_for_pyrogram, humanbytes, TimeFormatter
3232
from Uploader.utitles import *
3333
from Uploader.script import Translation
34-
if bool(os.environ.get("WEBHOOK")):
35-
from Uploader.config import Config
36-
else:
37-
from sample_config import Config
3834

35+
import logging
36+
37+
from config import Config
3938
logging.basicConfig(level=logging.DEBUG,
4039
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
4140
logger = logging.getLogger(__name__)
41+
4242
logging.getLogger("pyrogram").setLevel(logging.WARNING)
4343

4444

Diff for: Uploader/echo.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,21 @@
3131
from pyrogram.types import Thumbnail
3232
from pyrogram import Client, filters
3333
from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
34-
35-
if bool(os.environ.get("WEBHOOK")):
36-
from Uploader.config import Config
37-
else:
38-
from sample_config import Config
3934
from Uploader.script import Translation
4035
from Uploader.functions.ran_text import random_char
4136
from Uploader.functions.display_progress import humanbytes
4237
from Uploader.functions.display_progress import humanbytes
38+
from config import Config
39+
4340

41+
s2tw = OpenCC('s2tw.json').convert
42+
43+
import logging
4444
logging.basicConfig(level=logging.DEBUG,
4545
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
4646
logger = logging.getLogger(__name__)
47-
logging.getLogger("pyrogram").setLevel(logging.WARNING)
48-
49-
s2tw = OpenCC('s2tw.json').convert
5047

48+
logging.getLogger("pyrogram").setLevel(logging.WARNING)
5149

5250
@Client.on_message(filters.private & filters.regex(pattern=".*http.*"))
5351
async def echo(bot, update):

Diff for: Uploader/functions/display_progress.py

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
import time
2525
import logging
2626

27-
logging.basicConfig(level=logging.DEBUG,
28-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
29-
logger = logging.getLogger(__name__)
30-
logging.getLogger("pyrogram").setLevel(logging.WARNING)
3127

3228

3329
async def progress_for_pyrogram(

Diff for: Uploader/functions/help_Nekmo_ffmpeg.py

-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
from hachoir.parser import createParser
2626
from hachoir.metadata import extractMetadata
2727
import time
28-
import logging
29-
logging.basicConfig(level=logging.DEBUG,
30-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
31-
logger = logging.getLogger(__name__)
3228

3329

3430
async def place_water_mark(input_file, output_file, water_mark_file):

Diff for: Uploader/functions/help_uploadbot.py

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727

2828
from Uploader.functions.display_progress import humanbytes
2929

30-
logging.basicConfig(level=logging.DEBUG,
31-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
32-
logger = logging.getLogger(__name__)
33-
3430

3531
def DetectFileSize(url):
3632
r = requests.get(url, allow_redirects=True, stream=True)

Diff for: Uploader/functions/help_ytdl.py

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727

2828
from urllib.parse import urlparse
2929

30-
logging.basicConfig(level=logging.DEBUG,
31-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
32-
logger = logging.getLogger(__name__)
33-
3430

3531
def get_file_extension_from_url(url):
3632
url_path = urlparse(url).path

Diff for: Uploader/thumbunali.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424

2525
from pyrogram import Client, filters
2626

27-
if bool(os.environ.get("WEBHOOK")):
28-
from Uploader.config import Config
29-
else:
30-
from sample_config import Config
27+
from config import Config
3128

3229

3330
@Client.on_message(filters.photo & filters.incoming & filters.private)

Diff for: Uploader/utitles.py

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
from hachoir.metadata import extractMetadata
2727

2828

29-
logging.basicConfig(level=logging.DEBUG,
30-
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
31-
logger = logging.getLogger(__name__)
32-
logging.getLogger("pyrogram").setLevel(logging.WARNING)
3329

3430

3531
async def Mdata01(download_directory):

Diff for: Uploader/youtube.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@
3131
from pyrogram.types import Message
3232
from pyrogram import Client, filters
3333

34-
if bool(os.environ.get("WEBHOOK")):
35-
from Uploader.config import Config
36-
else:
37-
from sample_config import Config
38-
3934
from Uploader.functions.help_ytdl import get_file_extension_from_url, get_resolution
35+
from config import Config
4036

4137
YTDL_REGEX = (r"^((?:https?:)?\/\/)")
4238
s2tw = OpenCC('s2tw.json').convert

0 commit comments

Comments
 (0)