Merge pull request #79 from SayanthD/staging

might fix #49

Author: SpEcHiDe

Procfile

@@ -1 +1 @@
-worker: python3 bot.py
+worker: python3 -m anydlbot

README.md

@@ -22,15 +22,15 @@ virtualenv -p python3 VENV
 . ./VENV/bin/activate
 pip install -r requirements.txt
 # <Create config.py with variables as given below>
-python bot.py
+python3 -m anydlbot
 ```
 
 An example `config.py` file could be:
 
 **Not All of the variables are mandatory**
 
 ```python3
-from sample_config import Config
+from anydlbot.sample_config import Config
 
 class Development(Config):
   APP_ID = 6

anydlbot/__init__.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# (c) Shrimadhav U K
+
+import os
+
+# the secret configuration specific things
+if bool(os.environ.get("ENV", False)):
+    from anydlbot.sample_config import Config
+else:
+    from anydlbot.config import Config
+
+
+# TODO: is there a better way?
+TG_BOT_TOKEN = Config.TG_BOT_TOKEN
+APP_ID = Config.APP_ID
+API_HASH = Config.API_HASH
+AUTH_USERS = Config.AUTH_USERS
+DOWNLOAD_LOCATION = Config.DOWNLOAD_LOCATION
+MAX_FILE_SIZE = Config.MAX_FILE_SIZE
+TG_MAX_FILE_SIZE = Config.TG_MAX_FILE_SIZE
+CHUNK_SIZE = Config.CHUNK_SIZE
+DEF_THUMB_NAIL_VID_S = Config.DEF_THUMB_NAIL_VID_S
+MAX_MESSAGE_LENGTH = Config.MAX_MESSAGE_LENGTH
+PROCESS_MAX_TIMEOUT = Config.PROCESS_MAX_TIMEOUT
+HTTP_PROXY = Config.HTTP_PROXY
+FINISHED_PROGRESS_STR = Config.FINISHED_PROGRESS_STR
+UN_FINISHED_PROGRESS_STR = Config.UN_FINISHED_PROGRESS_STR

bot.py anydlbot/__main__.py

@@ -11,31 +11,30 @@
 LOGGER = logging.getLogger(__name__)
 
 import os
+from anydlbot import(
+        APP_ID,
+        API_HASH,
+        TG_BOT_TOKEN,
+        DOWNLOAD_LOCATION
+)
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
-
-import pyrogram
+from pyrogram import Client
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 
 if __name__ == "__main__" :
     # create download directory, if not exist
-    if not os.path.isdir(Config.DOWNLOAD_LOCATION):
-        os.makedirs(Config.DOWNLOAD_LOCATION)
+    if not os.path.isdir(DOWNLOAD_LOCATION):
+        os.makedirs(DOWNLOAD_LOCATION)
     plugins = dict(
-        root="plugins"
+        root="anydlbot/plugins"
     )
-    app = pyrogram.Client(
+    app = Client(
         "AnyDLBot",
-        bot_token=Config.TG_BOT_TOKEN,
-        api_id=Config.APP_ID,
-        api_hash=Config.API_HASH,
+        bot_token=TG_BOT_TOKEN,
+        api_id=APP_ID,
+        api_hash=API_HASH,
         plugins=plugins
     )
     app.set_parse_mode("html")
-    Config.AUTH_USERS.add(7351948)
     app.run()

helper_funcs/display_progress.py anydlbot/helper_funcs/display_progress.py

@@ -14,11 +14,10 @@
 import os
 import time
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
+from anydlbot import(
+        FINISHED_PROGRESS_STR,
+        UN_FINISHED_PROGRESS_STR
+)
 
 # the Strings used for this "thing"
 from translation import Translation
@@ -45,8 +44,8 @@ async def progress_for_pyrogram(
         estimated_total_time = TimeFormatter(milliseconds=estimated_total_time)
 
         progress = "[{0}{1}] \nP: {2}%\n".format(
-            ''.join([Config.FINISHED_PROGRESS_STR for i in range(math.floor(percentage / 5))]),
-            ''.join([Config.UN_FINISHED_PROGRESS_STR for i in range(20 - math.floor(percentage / 5))]),
+            ''.join([FINISHED_PROGRESS_STR for i in range(math.floor(percentage / 5))]),
+            ''.join([UN_FINISHED_PROGRESS_STR for i in range(20 - math.floor(percentage / 5))]),
             round(percentage, 2))
 
         tmp = progress + "{0} of {1}\nSpeed: {2}/s\nETA: {3}\n".format(

helper_funcs/help_Nekmo_ffmpeg.py anydlbot/helper_funcs/help_Nekmo_ffmpeg.py

@@ -12,24 +12,20 @@
 
 import os
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
+from anydlbot import AUTH_USERS
 
 
-import pyrogram
+from pyrogram import Client
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 
-from plugins.youtube_dl_button import youtube_dl_call_back
-from plugins.dl_button import ddl_call_back
+from anydlbot.plugins.youtube_dl_button import youtube_dl_call_back
+from anydlbot.plugins.dl_button import ddl_call_back
 
 
-@pyrogram.Client.on_callback_query()
+@Client.on_callback_query()
 async def button(bot, update):
-    if update.from_user.id not in Config.AUTH_USERS:
+    if update.from_user.id not in AUTH_USERS:
         await update.message.delete()
         return
     # LOGGER.info(update)

helper_funcs/help_uploadbot.py anydlbot/helper_funcs/help_uploadbot.py

@@ -14,30 +14,32 @@
 from PIL import Image
 import time
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
+from anydlbot import(
+        AUTH_USERS,
+        DOWNLOAD_LOCATION
+)
 
 # the Strings used for this "thing"
 from translation import Translation
 
-import pyrogram
+from pyrogram import(
+        Client,
+        Filters
+)
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
 
-@pyrogram.Client.on_message(pyrogram.Filters.photo)
+@Client.on_message(Filters.photo)
 async def save_photo(bot, update):
-    if update.from_user.id not in Config.AUTH_USERS:
+    if update.from_user.id not in AUTH_USERS:
         await bot.delete_messages(
             chat_id=update.chat.id,
             message_ids=update.message_id,
             revoke=True
         )
         return
     # received single photo
-    download_location = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
+    download_location = DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
     await bot.download_media(
         message=update,
         file_name=download_location
@@ -49,16 +51,16 @@ async def save_photo(bot, update):
     )
 
 
-@pyrogram.Client.on_message(pyrogram.Filters.command(["deletethumbnail"]))
+@Client.on_message(Filters.command(["deletethumbnail"]))
 async def delete_thumbnail(bot, update):
-    if update.from_user.id not in Config.AUTH_USERS:
+    if update.from_user.id not in AUTH_USERS:
         await bot.delete_messages(
             chat_id=update.chat.id,
             message_ids=update.message_id,
             revoke=True
         )
         return
-    download_location = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id)
+    download_location = DOWNLOAD_LOCATION + "/" + str(update.from_user.id)
     try:
         os.remove(download_location + ".jpg")
         # os.remove(download_location + ".json")

plugins/cb_buttons.py anydlbot/plugins/cb_buttons.py

@@ -19,19 +19,20 @@
 import time
 from datetime import datetime
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
+from anydlbot import(
+        DOWNLOAD_LOCATION,
+        TG_MAX_FILE_SIZE,
+        PROCESS_MAX_TIMEOUT,
+        CHUNK_SIZE
+)
 
 # the Strings used for this "thing"
 from translation import Translation
 
 import pyrogram
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
-from helper_funcs.display_progress import progress_for_pyrogram, humanbytes, TimeFormatter
+from anydlbot.helper_funcs.display_progress import progress_for_pyrogram, humanbytes, TimeFormatter
 from hachoir.metadata import extractMetadata
 from hachoir.parser import createParser
 # https://stackoverflow.com/a/37631799/4723940
@@ -43,7 +44,7 @@ async def ddl_call_back(bot, update):
     cb_data = update.data
     # youtube_dl extractors
     tg_send_type, youtube_dl_format, youtube_dl_ext = cb_data.split("=")
-    thumb_image_path = Config.DOWNLOAD_LOCATION + \
+    thumb_image_path = DOWNLOAD_LOCATION + \
         "/" + str(update.from_user.id) + ".jpg"
     youtube_dl_url = update.message.reply_to_message.text
     custom_file_name = os.path.basename(youtube_dl_url)
@@ -82,7 +83,7 @@ async def ddl_call_back(bot, update):
         chat_id=update.message.chat.id,
         message_id=update.message.message_id
     )
-    tmp_directory_for_each_user = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id)
+    tmp_directory_for_each_user = DOWNLOAD_LOCATION + "/" + str(update.from_user.id)
     if not os.path.isdir(tmp_directory_for_each_user):
         os.makedirs(tmp_directory_for_each_user)
     download_directory = tmp_directory_for_each_user + "/" + custom_file_name
@@ -113,14 +114,14 @@ async def ddl_call_back(bot, update):
             chat_id=update.message.chat.id,
             message_id=update.message.message_id
         )
-        file_size = Config.TG_MAX_FILE_SIZE + 1
+        file_size = TG_MAX_FILE_SIZE + 1
         try:
             file_size = os.stat(download_directory).st_size
         except FileNotFoundError as exc:
             download_directory = os.path.splitext(download_directory)[0] + "." + "mkv"
             # https://stackoverflow.com/a/678242/4723940
             file_size = os.stat(download_directory).st_size
-        if file_size > Config.TG_MAX_FILE_SIZE:
+        if file_size > TG_MAX_FILE_SIZE:
             await bot.edit_message_text(
                 chat_id=update.message.chat.id,
                 text=Translation.RCHD_TG_API_LIMIT,
@@ -261,7 +262,7 @@ async def ddl_call_back(bot, update):
 async def download_coroutine(bot, session, url, file_name, chat_id, message_id, start):
     downloaded = 0
     display_message = ""
-    async with session.get(url, timeout=Config.PROCESS_MAX_TIMEOUT) as response:
+    async with session.get(url, timeout=PROCESS_MAX_TIMEOUT) as response:
         total_length = int(response.headers["Content-Length"])
         content_type = response.headers["Content-Type"]
         if "text" in content_type and total_length < 500:
@@ -275,11 +276,11 @@ async def download_coroutine(bot, session, url, file_name, chat_id, message_id,
         )
         with open(file_name, "wb") as f_handle:
             while True:
-                chunk = await response.content.read(Config.CHUNK_SIZE)
+                chunk = await response.content.read(CHUNK_SIZE)
                 if not chunk:
                     break
                 f_handle.write(chunk)
-                downloaded += Config.CHUNK_SIZE
+                downloaded += CHUNK_SIZE
                 now = time.time()
                 diff = now - start
                 if round(diff % 5.00) == 0 or downloaded == total_length:

plugins/custom_thumbnail.py anydlbot/plugins/custom_thumbnail.py

@@ -13,29 +13,31 @@
 import os
 import time
 
-# the secret configuration specific things
-if bool(os.environ.get("ENV", False)):
-    from sample_config import Config
-else:
-    from config import Config
+from anydlbot import(
+        AUTH_USERS,
+        DOWNLOAD_LOCATION
+)
 
 # the Strings used for this "thing"
 from translation import Translation
 
-import pyrogram
+from pyrogram import(
+        Client,
+        Filters
+)
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
 
-from helper_funcs.display_progress import progress_for_pyrogram
+from anydlbot.helper_funcs.display_progress import progress_for_pyrogram
 
 
-@pyrogram.Client.on_message(pyrogram.Filters.sticker)
+@Client.on_message(Filters.sticker)
 async def DownloadStickersBot(bot, update):
-    if update.from_user.id not in Config.AUTH_USERS:
+    if update.from_user.id not in AUTH_USERS:
         await update.delete()
         return
 
     LOGGER.info(update.from_user)
-    download_location = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + "_DownloadStickersBot_" + str(update.from_user.id) + ".png"
+    download_location = DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + "_DownloadStickersBot_" + str(update.from_user.id) + ".png"
     a = await bot.send_message(
         chat_id=update.chat.id,
         text=Translation.DOWNLOAD_START,