Sourcery refactored master branch #1
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -176,8 +176,6 @@ def get_client(): | |
| MIRROR_LOGS.add(int(chats)) | ||
| except: | ||
| logging.warning('Logs Chat Details not provided!') | ||
|
Comment on lines
-179
to
-180
There was a problem hiding this comment. Lines
|
||
| if ospath.exists("link_logs.txt"): | ||
| with open("link_logs.txt", "r+") as f: | ||
| lines = f.readlines() | ||
|
|
@@ -191,8 +189,6 @@ def get_client(): | |
| LINK_LOGS.add(int(chats)) | ||
| except: | ||
| logging.warning('LINK_LOGS Chat id not provided, Proceeding Without it') | ||
| if ospath.exists("logs_chat.txt"): | ||
| with open("logs_chat.txt", "r+") as f: | ||
| lines = f.readlines() | ||
|
|
@@ -213,22 +209,19 @@ def get_client(): | |
| LEECH_LOG.add(int(chats)) | ||
| except: | ||
| logging.warning('Leech Log Channel ID not Provided!') | ||
| try: | ||
| achats = getConfig("LEECH_LOG_ALT") | ||
| achats = achats.split(" ") | ||
| for chats in achats: | ||
| LEECH_LOG_ALT.add(int(chats)) | ||
| except: | ||
| logging.warning('Leech Log alt Channel ID not Provided!') | ||
| try: | ||
| BOT_TOKEN = getConfig('BOT_TOKEN') | ||
| parent_id = getConfig('GDRIVE_FOLDER_ID') | ||
| DOWNLOAD_DIR = getConfig('DOWNLOAD_DIR') | ||
| if not DOWNLOAD_DIR.endswith("/"): | ||
| DOWNLOAD_DIR = f'{DOWNLOAD_DIR}/' | ||
| DOWNLOAD_STATUS_UPDATE_INTERVAL = int(getConfig('DOWNLOAD_STATUS_UPDATE_INTERVAL')) | ||
| OWNER_ID = int(getConfig('OWNER_ID')) | ||
| AUTO_DELETE_MESSAGE_DURATION = int(getConfig('AUTO_DELETE_MESSAGE_DURATION')) | ||
|
|
@@ -267,7 +260,6 @@ def aria2c_init(): | |
| aria2.remove([download], force=True, files=True) | ||
| except Exception as e: | ||
| logging.error(f"Aria2c initializing error: {e}") | ||
|
There was a problem hiding this comment. Function
|
||
|
|
||
| if not ospath.isfile(".restartmsg"): | ||
| sleep(1) | ||
|
|
@@ -306,7 +298,7 @@ def aria2c_init(): | |
| except KeyError: | ||
| MEGA_API_KEY = None | ||
| LOGGER.info("MEGA API KEY NOT AVAILABLE") | ||
| if MEGAREST: | ||
|
Comment on lines
-309
to
+301
There was a problem hiding this comment. Lines
|
||
| # Start megasdkrest binary | ||
| Popen(["megasdkrest", "--apikey", MEGA_API_KEY]) | ||
| sleep(3) # Wait for the mega server to start listening | ||
|
|
@@ -583,15 +575,15 @@ def aria2c_init(): | |
| FSUB = FSUB.lower() == 'true' | ||
| except KeyError: | ||
| FSUB = False | ||
|
|
||
| try: | ||
| FSUB_CHANNEL_ID = int(getConfig('FSUB_CHANNEL_ID')) | ||
| except KeyError: | ||
| FSUB_CHANNEL_ID = "" | ||
|
|
||
| try: | ||
| CHANNEL_USERNAME: str = getConfig('CHANNEL_USERNAME').replace("@", "") | ||
| if not CHANNEL_USERNAME: | ||
| CHANNEL_USERNAME = 'heliosmirror' | ||
| except KeyError: | ||
| logging.warning('CHANNEL_USERNAME not provided') | ||
|
|
@@ -622,20 +614,19 @@ def aria2c_init(): | |
| ACCOUNTS_ZIP_URL = getConfig('ACCOUNTS_ZIP_URL') | ||
| if len(ACCOUNTS_ZIP_URL) == 0: | ||
| raise KeyError | ||
| try: | ||
| res = rget(ACCOUNTS_ZIP_URL) | ||
| if res.status_code == 200: | ||
| with open('accounts.zip', 'wb+') as f: | ||
| f.write(res.content) | ||
| else: | ||
| logging.error(f"Failed to download accounts.zip, link got HTTP response: {res.status_code}") | ||
| except Exception as e: | ||
| logging.error(f"ACCOUNTS_ZIP_URL: {e}") | ||
| raise KeyError | ||
| srun(["unzip", "-q", "-o", "accounts.zip"]) | ||
| srun(["chmod", "-R", "777", "accounts"]) | ||
| osremove("accounts.zip") | ||
| except KeyError: | ||
| pass | ||
| try: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -75,14 +75,13 @@ def start(update, context): | |
| else: | ||
| if BOT_PM: | ||
| message = sendMessage(f'Dear {uname},\n\nIf You Want To Use Me, You Have To Join @{CHANNEL_USERNAME}\n\n<b>NOTE:</b> All The Uploaded Links and Leeched Files By You Will Be Sent Here In Your Private Chat From Now.', context.bot, update) | ||
| else: | ||
| message = sendMarkup( | ||
| f'Dear {uname},\n\nIf You Want To Use Me, You Have To Join @{CHANNEL_USERNAME}\n\n', | ||
| context.bot, update, reply_markup) | ||
|
|
||
| Thread(target=auto_delete_message, args=(context.bot, update.message, message)).start() | ||
| return | ||
|
Comment on lines
-78
to
+84
There was a problem hiding this comment. Function
|
||
| def restart(update, context): | ||
| restart_message = sendMessage("Restarting...", context.bot, update) | ||
| if Interval: | ||
|
|
@@ -287,9 +286,9 @@ def main(): | |
| osremove(".restartmsg") | ||
| elif OWNER_ID: | ||
| try: | ||
| if AUTHORIZED_CHATS: | ||
| text = "<b>Bot Restarted!</b>" | ||
| message = bot.sendMessage(chat_id=OWNER_ID, text=text, parse_mode=ParseMode.HTML) | ||
|
Comment on lines
-290
to
+291
There was a problem hiding this comment. Function
|
||
| for i in AUTHORIZED_CHATS: | ||
| bot.sendMessage(chat_id=i, text=text, parse_mode=ParseMode.HTML) | ||
| except Exception as e: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,8 +53,7 @@ def db_init(self): | |
| def db_load(self): | ||
| # User Data | ||
| self.cur.execute("SELECT * from users") | ||
| if rows := self.cur.fetchall(): | ||
|
There was a problem hiding this comment. Function
This removes the following comments ( why? ): |
||
| for row in rows: | ||
| if row[1] and row[0] not in SUDO_USERS: | ||
| SUDO_USERS.add(row[0]) | ||
|
|
@@ -80,8 +79,7 @@ def db_load(self): | |
| LOGGER.info("Users data has been imported from Database") | ||
| # Rss Data | ||
| self.cur.execute("SELECT * FROM rss") | ||
| if rows := self.cur.fetchall(): | ||
| for row in rows: | ||
| f_lists = [] | ||
| if row[4] is not None: | ||
|
|
@@ -97,9 +95,9 @@ def user_auth(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif not self.user_check(chat_id): | ||
| sql = f'INSERT INTO users (uid, auth) VALUES ({chat_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET auth = TRUE WHERE uid = {chat_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -109,7 +107,7 @@ def user_unauth(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif self.user_check(chat_id): | ||
| sql = f'UPDATE users SET auth = FALSE WHERE uid = {chat_id}' | ||
|
Comment on lines
-112
to
+110
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -120,9 +118,9 @@ def addleech_log(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif not self.user_check(chat_id): | ||
| sql = f'INSERT INTO users (uid, leechlog) VALUES ({chat_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET leechlog = TRUE WHERE uid = {chat_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -132,7 +130,7 @@ def rmleech_log(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif self.user_check(chat_id): | ||
| sql = f'UPDATE users SET leechlog = FALSE WHERE uid = {chat_id}' | ||
|
Comment on lines
-135
to
+133
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -143,9 +141,9 @@ def addleech_log_alt(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif not self.user_check(chat_id): | ||
| sql = f'INSERT INTO users (uid, leechlogalt) VALUES ({chat_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET leechlogalt = TRUE WHERE uid = {chat_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -155,7 +153,7 @@ def rmleech_log_alt(self, chat_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif self.user_check(chat_id): | ||
| sql = f'UPDATE users SET leechlogalt = FALSE WHERE uid = {chat_id}' | ||
|
Comment on lines
-158
to
+156
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -165,9 +163,9 @@ def user_addsudo(self, user_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif not self.user_check(user_id): | ||
| sql = f'INSERT INTO users (uid, sudo) VALUES ({user_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET sudo = TRUE WHERE uid = {user_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -177,19 +175,19 @@ def user_rmsudo(self, user_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif self.user_check(user_id): | ||
| sql = f'UPDATE users SET sudo = FALSE WHERE uid = {user_id}' | ||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
| return 'Successfully removed from Sudo' | ||
|
Comment on lines
-180
to
+182
There was a problem hiding this comment. Function
|
||
|
|
||
| def user_media(self, user_id: int): | ||
| if self.err: | ||
| return | ||
| elif not self.user_check(user_id): | ||
| sql = f'INSERT INTO users (uid, media) VALUES ({user_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET media = TRUE, doc = FALSE WHERE uid = {user_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -198,9 +196,9 @@ def user_doc(self, user_id: int): | |
| if self.err: | ||
| return | ||
| elif not self.user_check(user_id): | ||
| sql = f'INSERT INTO users (uid, doc) VALUES ({user_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET media = FALSE, doc = TRUE WHERE uid = {user_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -210,10 +208,12 @@ def user_save_thumb(self, user_id: int, path): | |
| return | ||
| image = open(path, 'rb+') | ||
| image_bin = image.read() | ||
| sql = ( | ||
| 'UPDATE users SET thumb = %s WHERE uid = %s' | ||
| if self.user_check(user_id) | ||
| else 'INSERT INTO users (thumb, uid) VALUES (%s, %s)' | ||
| ) | ||
|
|
||
|
Comment on lines
-213
to
+216
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql, (image_bin, user_id)) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -222,15 +222,14 @@ def user_rm_thumb(self, user_id: int, path): | |
| if self.err: | ||
| return | ||
| elif self.user_check(user_id): | ||
| sql = f'UPDATE users SET thumb = NULL WHERE uid = {user_id}' | ||
|
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
||
| def user_check(self, uid: int): | ||
| self.cur.execute(f"SELECT * FROM users WHERE uid = {uid}") | ||
| return self.cur.fetchone() | ||
|
Comment on lines
-231
to
+232
There was a problem hiding this comment. Function
|
||
|
|
||
| def rss_add(self, name, link, last, title, filters): | ||
| if self.err: | ||
|
|
@@ -266,9 +265,9 @@ def user_addmod(self, user_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif not self.user_check(user_id): | ||
| sql = f'INSERT INTO users (uid, mod) VALUES ({user_id}, TRUE)' | ||
| else: | ||
| sql = f'UPDATE users SET mod = TRUE WHERE uid = {user_id}' | ||
|
Comment on lines
-269
to
+270
There was a problem hiding this comment. Function
|
||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
|
|
@@ -278,11 +277,11 @@ def user_rmmod(self, user_id: int): | |
| if self.err: | ||
| return "Error in DB connection, check log for details" | ||
| elif self.user_check(user_id): | ||
| sql = f'UPDATE users SET mod = FALSE WHERE uid = {user_id}' | ||
| self.cur.execute(sql) | ||
| self.conn.commit() | ||
| self.disconnect() | ||
| return 'Successfully removed from Moderator' | ||
|
Comment on lines
-281
to
+284
There was a problem hiding this comment. Function
|
||
|
|
||
| if DB_URI is not None: | ||
| DbManger().db_init() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -178,8 +178,8 @@ def split(path, size, file_, dirpath, split_size, start_time=0, i=1, inLoop=Fals | |
| if file_.upper().endswith(VIDEO_SUFFIXES): | ||
| base_name, extension = ospath.splitext(file_) | ||
| split_size = split_size - 2500000 | ||
| while i <= parts: | ||
| parted_name = f"{str(base_name)}.part{str(i).zfill(3)}{str(extension)}" | ||
|
Comment on lines
-181
to
+182
There was a problem hiding this comment. Function
|
||
| out_path = ospath.join(dirpath, parted_name) | ||
| run(["ffmpeg", "-hide_banner", "-loglevel", "error", "-i", | ||
| path, "-ss", str(start_time), "-fs", str(split_size), | ||
|
|
@@ -197,7 +197,7 @@ def split(path, size, file_, dirpath, split_size, start_time=0, i=1, inLoop=Fals | |
| start_time += lpd - 3 | ||
| i = i + 1 | ||
| else: | ||
| out_path = ospath.join(dirpath, f"{file_}.") | ||
| run(["split", "--numeric-suffixes=1", "--suffix-length=3", f"--bytes={split_size}", path, out_path]) | ||
|
|
||
| def get_media_info(path): | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lines
60-60refactored with the following changes:replace-interpolation-with-fstring)