From 090ae756e76fd3649da553cd1ab5bab9671d3f2f Mon Sep 17 00:00:00 2001
From: drew2a <for.drew@gmail.com>
Date: Tue, 11 Jul 2023 16:32:57 +0200
Subject: [PATCH] Add switch for the `wait_for_status`

---
 .../components/libtorrent/download_manager/download.py    | 8 ++++++--
 .../libtorrent/download_manager/download_manager.py       | 2 +-
 src/tribler/core/utilities/async_force_switch.py          | 7 ++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/tribler/core/components/libtorrent/download_manager/download.py b/src/tribler/core/components/libtorrent/download_manager/download.py
index baa84466fd9..73a3123928b 100644
--- a/src/tribler/core/components/libtorrent/download_manager/download.py
+++ b/src/tribler/core/components/libtorrent/download_manager/download.py
@@ -26,6 +26,7 @@
 from tribler.core.components.libtorrent.utils.torrent_utils import check_handle, get_info_from_handle, require_handle
 from tribler.core.components.reporter.exception_handler import NoCrashException
 from tribler.core.exceptions import SaveResumeDataError
+from tribler.core.utilities.async_force_switch import switch
 from tribler.core.utilities.notifier import Notifier
 from tribler.core.utilities.osutils import fix_filebasename
 from tribler.core.utilities.path_util import Path
@@ -138,6 +139,7 @@ def wait_for_alert(self, success_type: str, success_getter: Getter = None,
 
     async def wait_for_status(self, *status):
         while self.get_state().get_status() not in status:
+            await switch()
             await self.wait_for_alert('state_changed_alert')
 
     def get_def(self) -> TorrentDef:
@@ -147,10 +149,12 @@ def get_handle(self) -> Awaitable[lt.torrent_handle]:
         """
         Returns a deferred that fires with a valid libtorrent download handle.
         """
-        if self.handle and self.handle.is_valid():
+        if self.handle:
+            # This block could be safely omitted because `self.future_added` does the same thing.
+            # However, it is used in tests, therefore it is better to keep it for now.
             return succeed(self.handle)
 
-        return self.wait_for_alert('add_torrent_alert', lambda a: a.handle)
+        return self.future_added
 
     def get_atp(self) -> Dict:
         save_path = self.config.get_dest_dir()
diff --git a/src/tribler/core/components/libtorrent/download_manager/download_manager.py b/src/tribler/core/components/libtorrent/download_manager/download_manager.py
index d150bc092e5..e0e7e2deac3 100644
--- a/src/tribler/core/components/libtorrent/download_manager/download_manager.py
+++ b/src/tribler/core/components/libtorrent/download_manager/download_manager.py
@@ -327,7 +327,7 @@ def create_session(self, hops=0, store_listen_port=True):
                 ltsession.add_dht_router(*router)
             ltsession.start_lsd()
 
-        self._logger.debug("Started libtorrent session for %d hops on port %d", hops, ltsession.listen_port())
+        self._logger.info(f"Started libtorrent session for {hops} hops on port {ltsession.listen_port()}")
         self.lt_session_shutdown_ready[hops] = False
 
         return ltsession
diff --git a/src/tribler/core/utilities/async_force_switch.py b/src/tribler/core/utilities/async_force_switch.py
index 07be4eae700..30522669aa2 100644
--- a/src/tribler/core/utilities/async_force_switch.py
+++ b/src/tribler/core/utilities/async_force_switch.py
@@ -2,6 +2,11 @@
 import functools
 
 
+async def switch():
+    """ Coroutine that yields control to the event loop."""
+    await asyncio.sleep(0)
+
+
 def force_switch(func):
     """Decorator for forced coroutine switch. The switch will occur before calling the function.
 
@@ -11,7 +16,7 @@ def force_switch(func):
 
     @functools.wraps(func)
     async def wrapper(*args, **kwargs):
-        await asyncio.sleep(0)
+        await switch()
         return await func(*args, **kwargs)
 
     return wrapper