minor changes

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

Author: anasty17

bot/helper/listeners/aria2_listener.py

@@ -1,8 +1,7 @@
 from contextlib import suppress
 from aiofiles.os import remove, path as aiopath
-from asyncio import sleep
+from asyncio import sleep, TimeoutError
 from time import time
-from aioaria2.exceptions import Aria2rpcException
 from aiohttp.client_exceptions import ClientError
 
 from ... import task_dict_lock, task_dict, LOGGER, intervals
@@ -62,7 +61,7 @@ async def _on_download_complete(api, data):
         gid = data["params"][0]["gid"]
         download = await api.tellStatus(gid)
         options = await api.getOption(gid)
-    except (Aria2rpcException, ClientError) as e:
+    except (TimeoutError, ClientError) as e:
         LOGGER.error(f"onDownloadComplete: {e}")
         return
     if options.get("follow-torrent", "") == "false":
@@ -120,14 +119,14 @@ async def _on_bt_download_complete(api, data):
         if task.listener.seed:
             try:
                 await api.changeOption(gid, {"max-upload-limit": "0"})
-            except (Aria2rpcException, ClientError) as e:
+            except (TimeoutError, ClientError) as e:
                 LOGGER.error(
                     f"{e} You are not able to seed because you added global option seed-time=0 without adding specific seed_time for this torrent GID: {gid}"
                 )
         else:
             try:
                 await api.forcePause(gid)
-            except (Aria2rpcException, ClientError) as e:
+            except (TimeoutError, ClientError) as e:
                 LOGGER.error(f"onBtDownloadComplete: {e} GID: {gid}")
         await task.listener.on_download_complete()
         if intervals["stopAll"]:
@@ -174,7 +173,7 @@ async def _on_download_error(api, data):
     await sleep(1)
     LOGGER.info(f"onDownloadError: {gid}")
     error = "None"
-    with suppress(Aria2rpcException, ClientError):
+    with suppress(TimeoutError, ClientError):
         download = await api.tellStatus(gid)
         options = await api.getOption(gid)
         error = download.get("errorMessage", "")

bot/helper/listeners/direct_listener.py

@@ -1,5 +1,4 @@
-from asyncio import sleep
-from aioaria2.exceptions import Aria2rpcException
+from asyncio import sleep, TimeoutError
 from aiohttp.client_exceptions import ClientError
 
 from ... import LOGGER
@@ -41,7 +40,7 @@ async def download(self, contents):
                 gid = await TorrentManager.aria2.addUri(
                     uris=[content["url"]], options=self._a2c_opt, position=0
                 )
-            except (Aria2rpcException, ClientError) as e:
+            except (TimeoutError, ClientError) as e:
                 self._failed += 1
                 LOGGER.error(f"Unable to download {filename} due to: {e}")
                 continue

bot/helper/listeners/qbit_listener.py

@@ -1,7 +1,7 @@
 from aiofiles.os import remove, path as aiopath
-from asyncio import sleep
+from asyncio import sleep, TimeoutError
 from time import time
-from aioqbt.exc import APIError
+from aiohttp.client_exceptions import ClientError
 
 from ... import (
     task_dict,
@@ -184,7 +184,7 @@ async def _qb_listener():
                         qb_torrents[tag]["seeding"] = False
                         await _on_seed_finish(tor_info)
                         await sleep(0.5)
-            except APIError as e:
+            except (ClientError, TimeoutError) as e:
                 LOGGER.error(str(e))
         await sleep(3)
 

bot/helper/mirror_leech_utils/download_utils/aria2_download.py

@@ -1,8 +1,8 @@
 from aiofiles.os import remove, path as aiopath
 from aiofiles import open as aiopen
 from base64 import b64encode
-from aioaria2.exceptions import Aria2rpcException
 from aiohttp.client_exceptions import ClientError
+from asyncio import TimeoutError
 
 from .... import task_dict_lock, task_dict, LOGGER
 from ....core.config_manager import Config
@@ -45,7 +45,7 @@ async def add_aria2_download(listener, dpath, header, ratio, seed_time):
             gid = await TorrentManager.aria2.addUri(
                 uris=[listener.link], options=a2c_opt
             )
-    except (Aria2rpcException, ClientError) as e:
+    except (TimeoutError, ClientError) as e:
         LOGGER.info(f"Aria2c Download Error: {e}")
         await listener.on_download_error(f"{e}")
         return

bot/helper/mirror_leech_utils/download_utils/qbit_download.py

@@ -1,8 +1,8 @@
 from aiofiles.os import remove, path as aiopath
 from aiofiles import open as aiopen
-from asyncio import sleep
+from asyncio import sleep, TimeoutError
 from aioqbt.api import AddFormBuilder
-from aioqbt.exc import APIError
+from aiohttp.client_exceptions import ClientError
 
 from .... import (
     task_dict,
@@ -60,7 +60,7 @@ async def add_qb_torrent(listener, path, ratio, seed_time):
             form = form.seeding_time_limit(int(seed_time))
         try:
             await TorrentManager.qbittorrent.torrents.add(form.build())
-        except APIError as e:
+        except (ClientError, TimeoutError) as e:
             LOGGER.error(
                 f"{e}. {listener.mid}. Already added torrent or unsupported link/file type!"
             )
@@ -139,7 +139,7 @@ async def add_qb_torrent(listener, path, ratio, seed_time):
                 )
             await on_download_start(f"{listener.mid}")
             await TorrentManager.qbittorrent.torrents.start([ext_hash])
-    except APIError as e:
+    except (ClientError, TimeoutError) as e:
         if f"{listener.mid}" in qb_torrents:
             del qb_torrents[f"{listener.mid}"]
         await listener.on_download_error(f"{e}")

web/wserver.py

@@ -71,14 +71,14 @@ async def re_verify(paused, resumed, hash_id):
                 await qbittorrent.torrents.file_prio(
                     hash=hash_id, id=paused, priority=0
                 )
-            except ClientError as e:
+            except (ClientError, TimeoutError) as e:
                 LOGGER.error(f"{e} Errored in reverification paused!")
         if resumed:
             try:
                 await qbittorrent.torrents.file_prio(
                     hash=hash_id, id=resumed, priority=1
                 )
-            except ClientError as e:
+            except (ClientError, TimeoutError) as e:
                 LOGGER.error(f"{e} Errored in reverification resumed!")
         k += 1
         if k > 5:
@@ -184,7 +184,7 @@ async def handle_torrent(request: Request):
                 op = await aria2.getOption(gid)
                 fpath = f"{op['dir']}/"
                 content = make_tree(res, "aria2", fpath)
-        except (Exception, ClientError) as e:
+        except (ClientError, TimeoutError) as e:
             LOGGER.error(str(e))
             content = {
                 "files": [],
@@ -203,7 +203,7 @@ async def handle_rename(gid, data):
             await qbittorrent.torrents.rename_file(hash=gid, **data)
         else:
             await qbittorrent.torrents.rename_folder(hash=gid, **data)
-    except ClientError as e:
+    except (ClientError, TimeoutError) as e:
         LOGGER.error(f"{e} Errored in renaming")
 
 
@@ -218,14 +218,14 @@ async def set_qbittorrent(gid, selected_files, unselected_files):
             await qbittorrent.torrents.file_prio(
                 hash=gid, id=unselected_files, priority=0
             )
-        except ClientError as e:
+        except (ClientError, TimeoutError) as e:
             LOGGER.error(f"{e} Errored in paused")
     if selected_files:
         try:
             await qbittorrent.torrents.file_prio(
                 hash=gid, id=selected_files, priority=1
             )
-        except ClientError as e:
+        except (ClientError, TimeoutError) as e:
             LOGGER.error(f"{e} Errored in resumed")
     await sleep(0.5)
     if not await re_verify(unselected_files, selected_files, gid):