Minor changes

Signed-off-by: anasty17 <[email protected]>

Author: anasty17

aria.sh aria-nox.sh

@@ -6,4 +6,5 @@ aria2c --allow-overwrite=true --auto-file-renaming=true --bt-enable-lpd=true --b
        --min-split-size=10M --follow-torrent=mem --check-certificate=false --optimize-concurrent-downloads=true \
        --http-accept-gzip=true --max-file-not-found=0 --max-tries=20  --peer-id-prefix=-qB4520- --reuse-uri=true \
        --content-disposition-default-utf8=true --user-agent=Wget/1.12 --peer-agent=qBittorrent/4.5.2 --quiet=true \
-       --summary-interval=0 --max-upload-limit=1K
+       --summary-interval=0 --max-upload-limit=1K
+qbittorrent-nox -d --profile="$(pwd)"

bot/__init__.py

@@ -45,8 +45,6 @@
 
 LOGGER = getLogger(__name__)
 
-aria2 = ariaAPI(ariaClient(host="http://localhost", port=6800, secret=""))
-
 load_dotenv("config.env", override=True)
 
 Intervals = {"status": {}, "qb": "", "jd": ""}
@@ -139,6 +137,14 @@
 else:
     config_dict = {}
 
+if not ospath.exists(".netrc"):
+    with open(".netrc", "w"):
+        pass
+run(
+    "chmod 600 .netrc && cp .netrc /root/.netrc && chmod +x aria-nox.sh && ./aria-nox.sh",
+    shell=True,
+)
+
 OWNER_ID = environ.get("OWNER_ID", "")
 if len(OWNER_ID) == 0:
     log_error("OWNER_ID variable is missing! Exiting now")
@@ -436,14 +442,6 @@
         shell=True,
     )
 
-run(["qbittorrent-nox", "-d", f"--profile={getcwd()}"])
-if not ospath.exists(".netrc"):
-    with open(".netrc", "w"):
-        pass
-run(
-    "chmod 600 .netrc && cp .netrc /root/.netrc && chmod +x aria.sh && ./aria.sh",
-    shell=True,
-)
 if ospath.exists("accounts.zip"):
     if ospath.exists("accounts"):
         run(["rm", "-rf", "accounts"])
@@ -454,7 +452,7 @@
     config_dict["USE_SERVICE_ACCOUNTS"] = False
 
 
-def get_client():
+def get_qb_client():
     return qbClient(
         host="localhost",
         port=8090,
@@ -479,20 +477,6 @@ def get_client():
     "server-stat-of",
 ]
 
-qb_client = get_client()
-if not qbit_options:
-    qbit_options = dict(qb_client.app_preferences())
-    del qbit_options["listen_port"]
-    for k in list(qbit_options.keys()):
-        if k.startswith("rss"):
-            del qbit_options[k]
-else:
-    qb_opt = {**qbit_options}
-    for k, v in list(qb_opt.items()):
-        if v in ["", "*"]:
-            del qb_opt[k]
-    qb_client.app_set_preferences(qb_opt)
-
 log_info("Creating client from BOT_TOKEN")
 bot = tgClient(
     "bot",
@@ -507,6 +491,20 @@ def get_client():
 
 scheduler = AsyncIOScheduler(timezone=str(get_localzone()), event_loop=bot_loop)
 
+if not qbit_options:
+    qbit_options = dict(get_qb_client().app_preferences())
+    del qbit_options["listen_port"]
+    for k in list(qbit_options.keys()):
+        if k.startswith("rss"):
+            del qbit_options[k]
+else:
+    qb_opt = {**qbit_options}
+    for k, v in list(qb_opt.items()):
+        if v in ["", "*"]:
+            del qb_opt[k]
+    get_qb_client().app_set_preferences(qb_opt)
+
+aria2 = ariaAPI(ariaClient(host="http://localhost", port=6800, secret=""))
 if not aria2_options:
     aria2_options = aria2.client.get_global_option()
 else:

bot/helper/ext_utils/files_utils.py

@@ -7,7 +7,7 @@
 from subprocess import run as srun
 from sys import exit as sexit
 
-from bot import aria2, LOGGER, DOWNLOAD_DIR, get_client
+from bot import aria2, LOGGER, DOWNLOAD_DIR, get_qb_client
 from bot.helper.ext_utils.bot_utils import sync_to_async, cmd_exec
 from .exceptions import NotSupportedExtractionArchive
 
@@ -91,7 +91,7 @@ async def clean_download(path):
 
 def clean_all():
     aria2.remove_all(True)
-    get_client().torrents_delete(torrent_hashes="all")
+    get_qb_client().torrents_delete(torrent_hashes="all")
     try:
         rmtree(DOWNLOAD_DIR)
     except:
@@ -103,7 +103,7 @@ def exit_clean_up(signal, frame):
     try:
         LOGGER.info("Please wait, while we clean up and stop the running downloads")
         clean_all()
-        srun(["pkill", "-9", "-f", "gunicorn|aria2c|qbittorrent-nox|ffmpeg"])
+        srun(["pkill", "-9", "-f", "gunicorn|aria2c|qbittorrent-nox|ffmpeg|java"])
         sexit(0)
     except KeyboardInterrupt:
         LOGGER.warning("Force Exiting before the cleanup finishes!")

bot/helper/listeners/qbit_listener.py

@@ -6,7 +6,7 @@
     task_dict,
     task_dict_lock,
     Intervals,
-    get_client,
+    get_qb_client,
     config_dict,
     QbTorrents,
     qb_listener_lock,
@@ -88,7 +88,7 @@ async def _onDownloadComplete(tor):
                 except:
                     pass
     await task.listener.onDownloadComplete()
-    client = await sync_to_async(get_client)
+    client = await sync_to_async(get_qb_client)
     if task.listener.seed:
         async with task_dict_lock:
             if task.listener.mid in task_dict:
@@ -112,7 +112,7 @@ async def _onDownloadComplete(tor):
 
 
 async def _qb_listener():
-    client = await sync_to_async(get_client)
+    client = await sync_to_async(get_qb_client)
     while True:
         async with qb_listener_lock:
             try:
@@ -193,7 +193,7 @@ async def _qb_listener():
                         await sleep(0.5)
             except Exception as e:
                 LOGGER.error(str(e))
-                client = await sync_to_async(get_client)
+                client = await sync_to_async(get_qb_client)
         await sleep(3)
 
 

bot/helper/mirror_utils/download_utils/qbit_download.py

@@ -4,7 +4,7 @@
 from bot import (
     task_dict,
     task_dict_lock,
-    get_client,
+    get_qb_client,
     LOGGER,
     config_dict,
     non_queued_dl,
@@ -40,7 +40,7 @@ def _get_hash_file(fpath):
 
 
 async def add_qb_torrent(listener, path, ratio, seed_time):
-    client = await sync_to_async(get_client)
+    client = await sync_to_async(get_qb_client)
     ADD_TIME = time()
     try:
         url = listener.link

bot/helper/mirror_utils/status_utils/qbit_status.py

@@ -1,6 +1,6 @@
 from asyncio import sleep
 
-from bot import LOGGER, get_client, QbTorrents, qb_listener_lock
+from bot import LOGGER, get_qb_client, QbTorrents, qb_listener_lock
 from bot.helper.ext_utils.bot_utils import sync_to_async
 from bot.helper.ext_utils.status_utils import (
     MirrorStatus,
@@ -19,7 +19,7 @@ def get_download(client, tag, old_info=None):
 
 class QbittorrentStatus:
     def __init__(self, listener, seeding=False, queued=False):
-        self.client = get_client()
+        self.client = get_qb_client()
         self.queued = queued
         self.seeding = seeding
         self.listener = listener

bot/modules/bot_settings.py

@@ -26,7 +26,7 @@
     IS_PREMIUM_USER,
     task_dict,
     qbit_options,
-    get_client,
+    get_qb_client,
     LOGGER,
     bot,
 )
@@ -298,7 +298,7 @@ async def edit_qbit(_, message, pre_message, key):
         value = float(value)
     elif value.isdigit():
         value = int(value)
-    await sync_to_async(get_client().app_set_preferences, {key: value})
+    await sync_to_async(get_qb_client().app_set_preferences, {key: value})
     qbit_options[key] = value
     await update_buttons(pre_message, "qbit")
     await deleteMessage(message)
@@ -558,7 +558,7 @@ async def edit_bot_settings(client, query):
             await DbManager().update_aria2(data[2], "")
     elif data[1] == "emptyqbit":
         await query.answer()
-        await sync_to_async(get_client().app_set_preferences, {data[2]: value})
+        await sync_to_async(get_qb_client().app_set_preferences, {data[2]: value})
         qbit_options[data[2]] = ""
         await update_buttons(message, "qbit")
         if DATABASE_URL:

bot/modules/torrent_search.py

@@ -4,7 +4,7 @@
 from pyrogram.handlers import MessageHandler, CallbackQueryHandler
 from urllib.parse import quote
 
-from bot import bot, LOGGER, config_dict, get_client
+from bot import bot, LOGGER, config_dict, get_qb_client
 from bot.helper.ext_utils.bot_utils import sync_to_async, new_task
 from bot.helper.ext_utils.status_utils import get_readable_file_size
 from bot.helper.ext_utils.telegraph_helper import telegraph
@@ -19,7 +19,7 @@
 
 
 async def initiate_search_tools():
-    qbclient = await sync_to_async(get_client)
+    qbclient = await sync_to_async(get_qb_client)
     qb_plugins = await sync_to_async(qbclient.search_plugins)
     if SEARCH_PLUGINS := config_dict["SEARCH_PLUGINS"]:
         globals()["PLUGINS"] = []
@@ -100,7 +100,7 @@ async def _search(key, site, message, method):
             return
     else:
         LOGGER.info(f"PLUGINS Searching: {key} from {site}")
-        client = await sync_to_async(get_client)
+        client = await sync_to_async(get_qb_client)
         search = await sync_to_async(
             client.search_start, pattern=key, plugins=site, category="all"
         )
@@ -224,7 +224,7 @@ def _api_buttons(user_id, method):
 async def _plugin_buttons(user_id):
     buttons = ButtonMaker()
     if not PLUGINS:
-        qbclient = await sync_to_async(get_client)
+        qbclient = await sync_to_async(get_qb_client)
         pl = await sync_to_async(qbclient.search_plugins)
         for name in pl:
             PLUGINS.append(name["name"])