Improved uploading speed

AJTimePyro · AJTimePyro · commit 197057307833 · 2021-10-22T18:43:46.000+05:30
diff --git a/app.json b/app.json
@@ -23,6 +23,10 @@
         },
         "API_HASH" : {
             "description" : "Get From https://my.telegram.org"
+        },
+        "MONGO_STR" : {
+            "description" : "Leave it empty.",
+            "required" : false
         }
     },
     "stack" : "heroku-20",
diff --git a/bot/__init__.py b/bot/__init__.py
@@ -3,4 +3,5 @@
 
 """
 URL_Uploader_Bot Source Code
-"""
+"""
+
diff --git a/bot/__main__.py b/bot/__main__.py
@@ -1,10 +1,15 @@
 #!/usr/bin/env python3
 
 
-'''Impoting Libraries, Modules & Credentials'''
+"""Importing"""
+# Importing External Packages
 from telethon import events
 from telethon.sync import TelegramClient
+
+# Importing Inbuilt Packages
 from os import remove
+
+# Importing Developer defined modules & data
 from bot.plugins.downloader import *
 from bot.messages import *
 
@@ -17,42 +22,74 @@
 #Start Handler
 @bot.on(events.NewMessage(pattern = r'/start$'))
 async def start_handler(event):
-    await event.respond(start_msg, parse_mode = 'html')
+    if event.chat_id > 0:
+        if await search_user_in_community(event, bot):
+            await event.respond(start_msg, parse_mode = 'html')
+    return checking_user_in_db(event.sender_id)
 
 #Help Handler
 @bot.on(events.NewMessage(pattern = r'/help$'))
 async def help_handler(event):
-    await event.respond(help_msg, parse_mode = 'html')
+    if event.chat_id > 0:
+        if await search_user_in_community(event, bot):
+            await event.respond(help_msg, parse_mode = 'html')
+    return
+
+#For Owner Only, Sent message to all Bot Users
+@bot.on(events.NewMessage(pattern = r'/broadcast'))
+async def broadcast_handler(event):
+    if event.chat_id > 0:
+        if event.sender_id == dev:
+            try:
+                #Extracting Broadcasting Message
+                message = str(event.message.text).split('/broadcast ')[1]
+            except IndexError:
+                await event.respond(broadcast_failed, parse_mode = 'html')
+            except Exception as e:
+                print(line_number(), e)
+            else:
+                #Getting User`s Id from Database
+                for userid in [document['userid'] for document in collection_user.find()]:
+                    try:
+                        #Sending Message One By One
+                        await bot.send_message(userid, message)
+                    except rpcerrorlist.UserIsBlockedError:
+                        #User Blocked the bot
+                        collection_user.delete_one({'userid' : userid})
+                    except Exception as e:
+                        print(line_number(), e)
+    return
 
 @bot.on(events.NewMessage)
 async def upload_handler(event):
+    if event.chat_id > 0:
 
-    message_info = event.message
-
-    if str(type(message_info.entities[0])) == "<class 'telethon.tl.types.MessageEntityUrl'>":
-        if task() == "Running":
-            await event.respond(task_ongoing, parse_mode = 'html')
-        else:
-            url = message_info.text
-            downloader = await Downloader.start(event, url, bot)
-            filename = downloader.filename
-
-            if filename:    #Sending file to user
-                msg = downloader.n_msg
-                message = event.message
-                userid = event.sender_id
-                try:
-                    await bot.send_file(userid , file = filename, reply_to = message)
-                except Exception as e:
-                    await bot.delete_messages(None, msg)
-                    await bot.send_message(userid, unsuccessful_upload, reply_to = message)
-                    print(line_number(), e)
+        message_info = event.message
+        if str(type(message_info.entities[0])) == "<class 'telethon.tl.types.MessageEntityUrl'>":
+            if await search_user_in_community(event, bot):
+                if task() == "Running":
+                    await event.respond(task_ongoing, parse_mode = 'html')
                 else:
-                    await bot.delete_messages(None, msg)
-                finally:
-                    remove(filename)
-            task("No Task")
-    return None
+                    url = message_info.text
+                    downloader = await Downloader.start(event, url, bot)
+                    filename = downloader.filename
+
+                    if filename:    #Sending file to user
+                        msg = downloader.n_msg
+                        message = event.message
+                        userid = event.sender_id
+                        try:
+                            await bot.send_file(userid , file = filename, reply_to = message)
+                        except Exception as e:
+                            await bot.delete_messages(None, msg)
+                            await bot.send_message(userid, unsuccessful_upload, reply_to = message)
+                            print(line_number(), e)
+                        else:
+                            await bot.delete_messages(None, msg)
+                        finally:
+                            remove(filename)
+                    task("No Task")
+    return
 
 
 '''Bot is Started to run all time'''
diff --git a/bot/credentials.py b/bot/credentials.py
@@ -1,14 +1,24 @@
 #!/usr/bin/env python3
 
 
-'''Credentials'''
+# Importing Inbuilt Packages
+import os
 
 
-import os
+'''Credentials'''
+dev = 1972357814
 
+downloadFolder = '/app/download/'
+# downloadFolder = 'D:\Projects\Public\MegaUploaderbot\download\\'
 
 bot_token = os.environ["BOT_TOKEN"]
 
 api_id = os.environ["API_ID"]
 
 api_hash = os.environ["API_HASH"]
+
+try:
+    connection_string = os.environ["MONGO_STR"]
+except KeyError:
+    connection_string = None
+
diff --git a/bot/messages.py b/bot/messages.py
@@ -10,6 +10,10 @@
 
 start_msg = f"<b>Hi, I am URL_UploaderBot Created by @AJPyroVerse and My Developer is @AJTimePyro.</b>\n{help_msg}"
 
+not_joined_community = f"<b>To use this bot, you need to Join our Channel and Group.</b>{common_text}"
+
+broadcast_failed = "<b>Broadcasting Message can`t be empty</b>"
+
 task_ongoing = "<u>One Task is already going on, So Please Try Again Later.</u>"
 
 processing_url = "<i>Please wait while I am Processing File</i>"
@@ -22,4 +26,5 @@
 
 file_limit = f"Send only those whose size is less than 400mb.{common_text}"
 
-youtube_url = "<b>Currently I do not support youtube videos.</b>"
+youtube_url = "<b>Currently I do not support youtube videos.</b>"
+
diff --git a/bot/plugins/downloader.py b/bot/plugins/downloader.py
@@ -1,13 +1,21 @@
 #!/usr/bin/env python3
 
 
-'''Impoting Libraries, Modules & Credentials'''
-from os import listdir, linesep
-from subprocess import Popen, PIPE
+
+"""Importing"""
+# Importing External Packages
+from pySmartDL import SmartDL
+
+# Importing Inbuilt Packages
+from time import sleep
+from os import remove
 from re import match
+
+# Importing Developer defined modules & data
 from bot.messages import *
 from bot.plugins.funcs import *
 
+
 class Downloader:
 
     def __init__(self, event, url, bot):
@@ -32,38 +40,35 @@ async def url_downloader(self, event, process_msg, bot, url):
         if len_file == 'Valid':
             msg = await bot.edit_message(process_msg, starting_to_download, parse_mode = 'html')
             userid = event.sender_id
-            files_before = listdir()
 
-            #Downloading File From Url
-            process = Popen(['wget', url], stderr=PIPE)
-            started = False
-            for line in process.stderr:
-                line = line.decode("utf-8", "replace")
-                print(line)
-                if started:
-                    splited = line.split()
-                    if len(splited) == 9:
-                        completed = splited[0]
-                        if completed.endswith('K'):
-                            completed = str(round(int(completed[:len(completed)-1])/1024, 2))+'M'
-                        percentage = splited[6]
-                        speed = splited[7]
-                        remaining = splited[8]
-                        msg = await bot.edit_message(msg, f"<b>Downloading... !! Keep patience...\n📊Percentage: {percentage}\n✅Completed: {completed+'B'}\n🚀Speed: {speed}B/s\n⌚️Remaining Time: {remaining}</b>", parse_mode = 'html')
-                elif line == linesep:
-                    started = True
+            downObj = SmartDL(self.url, dest = downloadFolder)
+            downObj.start(blocking = False)
+            while not downObj.isFinished():
+                progress_bar = downObj.get_progress_bar().replace('#', '■').replace('-', '□')
+                completed = downObj.get_dl_size(human=True)
+                speed = downObj.get_speed(human=True)
+                remaining = downObj.get_eta(human=True)
+                percentage = int(downObj.get_progress()*100)
+                msg = await self.bot.edit_message(msg, f"<b>Downloading... !! Keep patience...\n {progress_bar}\n📊Percentage: {percentage}\n✅Completed: {completed}\n🚀Speed: {speed}\n⌚️Remaining Time: {remaining}</b>", parse_mode = 'html')
+                sleep(1)
+            try:
+                filename = downObj.get_dest()
+            except Exception as e:
+                await self.bot.send_message(dev, f'In urlDL.py {line_number()} {e}')
+            if downObj.isSuccessful():
+                n_msg = await self.bot.edit_message(msg, uploading_msg, parse_mode = 'html')
+                self.n_msg, self.filename = n_msg, filename
+                return True
             else:
-                files_after = listdir()
+                task("No Task")
                 try:
-                    filename = str([i for i in files_after if i not in files_before][0])
-                except IndexError:  #When File Not Downloaded
-                    task("No Task")
-                    await bot.delete_messages(None, msg)
-                    await bot.send_message(userid, unsuccessful_upload, parse_mode = 'html')
-                else:
-                    n_msg = await bot.edit_message(msg, uploading_msg, parse_mode = 'html')
-                    self.n_msg, self.filename = n_msg, filename
-                    return True
+                    remove(f'{downloadFolder}{filename}')
+                except Exception as e:
+                    await self.bot.send_message(dev, f'In urlDL.py {line_number()} {e}')
+                    await self.bot.delete_messages(None, msg)
+                    await self.bot.send_message(userid, unsuccessful_upload, parse_mode = 'html')
+                    for e in downObj.get_errors():
+                        await self.bot.send_message(dev, f'In urlDL.py {line_number()} {str(e)}')
         elif len_file == 'Not Valid':
             await bot.edit_message(process_msg, unsuccessful_upload, parse_mode = 'html')
         else:
diff --git a/bot/plugins/funcs.py b/bot/plugins/funcs.py
@@ -1,17 +1,60 @@
-'''Impoting Libraries and Modules'''
-from bot.credentials import *
+#!/usr/bin/env python3
+
+
+"""Importing"""
+# Importing External Packages
+from telethon import Button
+from telethon.tl.functions.channels import GetParticipantRequest
+from telethon.errors import rpcerrorlist
+from pymongo import MongoClient
+from requests import head
+
+# Importing Inbuilt Packages
 from inspect import currentframe
 from os import path
-from requests import head
 import __main__
 
+# Importing Developer defined modules & data
+from bot.credentials import *
+from bot.messages import not_joined_community
+
+
+'''Connecting To Database'''
+mongo_client = MongoClient(connection_string)
+db_member_detail = mongo_client['AJPyroVerseMember']
+collection_member = db_member_detail['memberlist']
+db_user = mongo_client['URL_Uploader']
+collection_user = db_user['members']
+
 
 '''Defining Some Functions'''
+#Checking User whether he joined channel and group or not joined.
+async def search_user_in_community(event, bot):
+    try:
+        await bot(GetParticipantRequest("@AJPyroVerse", event.sender_id))
+        await bot(GetParticipantRequest("@AJPyroVerseGroup", event.sender_id))
+    except rpcerrorlist.UserNotParticipantError:
+        await event.respond(not_joined_community, parse_mode = 'html', buttons = [Button.url('Join our Channel.','https://t.me/AJPyroVerse'), Button.url('Join our Group.','https://t.me/AJPyroVerseGroup')])
+        return
+    except Exception as e:
+        print(line_number(), e)
+    else:
+        return True
+
 #Function to find error in which file and in which line
 def line_number():
     cf = currentframe()
     return f'In File {path.basename(__main__.__file__)} at line {cf.f_back.f_lineno}'
 
+#Finding user in database, if not found then adding him
+def checking_user_in_db(userid):
+    if connection_string:
+        document = {'userid' : userid}
+        if collection_user.find_one(document):
+            return True
+        collection_user.insert_one(document)
+    return
+
 #it will check the length of file
 async def length_of_file(url):
     try:
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,5 @@ telethon
 cryptg
 dnspython
 pymongo
-requests
+requests
+pySmartDL

-Original file line number
+Diff line change
 """
 URL_Uploader_Bot Source Code
 -"""
 +"""
++