Skip to content

Commit fe6ba2a

Browse files
EverythingSuckzEverythingSuckz
committed
refactor: init files
1 parent 8cbc9cb commit fe6ba2a

4 files changed

Lines changed: 32 additions & 22 deletions

File tree

‎WebStreamer/__init__.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,5 @@
66
from .vars import Var
77
from WebStreamer.bot.clients import StreamBot
88

9-
print("\n")
10-
print("------------------- Initializing Telegram Bot -------------------")
11-
12-
StreamBot.start()
13-
bot_info = StreamBot.get_me()
149
__version__ = 2.2
1510
StartTime = time.time()

‎WebStreamer/__main__.py‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,74 @@
11
# This file is a part of TG-FileStreamBot
22
# Coding : Jyothis Jayanth [@EverythingSuckz]
33

4+
import sys
45
import asyncio
56
import logging
67
from .vars import Var
78
from aiohttp import web
89
from pyrogram import idle
910
from WebStreamer import utils
10-
from WebStreamer import bot_info
11+
from WebStreamer import StreamBot
1112
from WebStreamer.server import web_server
1213
from WebStreamer.bot.clients import initialize_clients
1314

1415

1516
logging.basicConfig(
1617
level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
1718
)
18-
logging.getLogger("pyrogram").setLevel(logging.ERROR)
1919
logging.getLogger("aiohttp").setLevel(logging.ERROR)
20+
logging.getLogger("pyrogram").setLevel(logging.ERROR)
2021
logging.getLogger("aiohttp.web").setLevel(logging.ERROR)
2122

22-
loop = asyncio.get_event_loop()
23+
server = web.AppRunner(web_server())
2324

25+
loop = asyncio.get_event_loop()
2426

2527
async def start_services():
26-
print("----------------------------- DONE -----------------------------")
28+
print()
29+
print("-------------------- Initializing Telegram Bot --------------------")
30+
await StreamBot.start()
31+
bot_info = await StreamBot.get_me()
32+
StreamBot.username = bot_info.username
33+
print("------------------------------ DONE ------------------------------")
2734
print()
2835
print(
29-
"----------------------------- Initializing Clients -----------------------------"
36+
"---------------------- Initializing Clients ----------------------"
3037
)
3138
await initialize_clients()
32-
print("----------------------------- DONE -----------------------------")
39+
print("------------------------------ DONE ------------------------------")
3340
if Var.ON_HEROKU:
3441
print("------------------ Starting Keep Alive Service ------------------")
3542
print()
3643
asyncio.create_task(utils.ping_server())
37-
print("-------------------- Initalizing Web Server --------------------")
38-
app = web.AppRunner(await web_server())
39-
await app.setup()
44+
print("--------------------- Initalizing Web Server ---------------------")
45+
await server.setup()
4046
bind_address = "0.0.0.0" if Var.ON_HEROKU else Var.BIND_ADDRESS
41-
await web.TCPSite(app, bind_address, Var.PORT).start()
42-
print("----------------------------- DONE -----------------------------")
47+
await web.TCPSite(server, bind_address, Var.PORT).start()
48+
print("------------------------------ DONE ------------------------------")
4349
print()
44-
print("----------------------- Service Started -----------------------")
50+
print("------------------------- Service Started -------------------------")
4551
print(" bot =>> {}".format(bot_info.first_name))
4652
if bot_info.dc_id:
4753
print(" DC ID =>> {}".format(str(bot_info.dc_id)))
4854
print(" server ip =>> {}".format(bind_address, Var.PORT))
4955
if Var.ON_HEROKU:
5056
print(" app running on =>> {}".format(Var.FQDN))
51-
print("---------------------------------------------------------------")
57+
print("------------------------------------------------------------------")
5258
await idle()
5359

60+
async def cleanup():
61+
await server.cleanup()
62+
await StreamBot.stop()
5463

5564
if __name__ == "__main__":
5665
try:
5766
loop.run_until_complete(start_services())
5867
except KeyboardInterrupt:
59-
logging.info("----------------------- Service Stopped -----------------------")
68+
pass
69+
except Exception as err:
70+
logging.error(err.with_traceback(None))
71+
finally:
72+
loop.run_until_complete(cleanup())
73+
loop.stop()
74+
print("------------------------ Stopped Services ------------------------")

‎WebStreamer/server/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from .stream_routes import routes
88

99

10-
async def web_server():
10+
def web_server():
1111
web_app = web.Application(client_max_size=30000000)
1212
web_app.add_routes(routes)
1313
return web_app

‎WebStreamer/server/stream_routes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from aiohttp.http_exceptions import BadStatusLine
1212
from WebStreamer.bot import multi_clients, work_loads
1313
from WebStreamer.server.exceptions import FIleNotFound, InvalidHash
14-
from WebStreamer import Var, utils, StartTime, __version__, bot_info
14+
from WebStreamer import Var, utils, StartTime, __version__, StreamBot
1515

1616

1717
routes = web.RouteTableDef()
@@ -22,7 +22,7 @@ async def root_route_handler(_):
2222
{
2323
"server_status": "running",
2424
"uptime": utils.get_readable_time(time.time() - StartTime),
25-
"telegram_bot": "@" + bot_info.username,
25+
"telegram_bot": "@" + StreamBot.username,
2626
"connected_bots": len(multi_clients),
2727
"loads": dict(
2828
("bot" + str(c + 1), l)

0 commit comments

Comments
 (0)