From bd2de6910b9fcb5cd821ef528af88c6aedff3316 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Fri, 9 Sep 2022 20:19:19 -0300 Subject: [PATCH] save resume data on stop, remove/replace deprecated calls --- lbry/torrent/session.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lbry/torrent/session.py b/lbry/torrent/session.py index 1bdc479787..a2e8e9ef88 100644 --- a/lbry/torrent/session.py +++ b/lbry/torrent/session.py @@ -59,6 +59,7 @@ def largest_file_index(self): return index def stop_tasks(self): + self._handle.save_resume_data() while self.tasks: self.tasks.pop().cancel() @@ -152,13 +153,13 @@ def __init__(self, loop, executor): async def add_fake_torrent(self): tmpdir = mkdtemp() - info, btih = _create_fake_torrent(tmpdir) + info = _create_fake_torrent(tmpdir) flags = libtorrent.add_torrent_params_flags_t.flag_seed_mode handle = self._session.add_torrent({ 'ti': info, 'save_path': tmpdir, 'flags': flags }) - self._handles[btih] = TorrentHandle(self._loop, self._executor, handle) - return btih + self._handles[str(info.info_hash())] = TorrentHandle(self._loop, self._executor, handle) + return str(info.info_hash()) async def bind(self, interface: str = '0.0.0.0', port: int = 10889): settings = { @@ -172,14 +173,12 @@ async def bind(self, interface: str = '0.0.0.0', port: int = 10889): self.tasks.append(self._loop.create_task(self.process_alerts())) def stop(self): + while self._handles: + self._handles.popitem()[1].stop_tasks() while self.tasks: self.tasks.pop().cancel() self._session.save_state() self._session.pause() - self._session.stop_dht() - self._session.stop_lsd() - self._session.stop_natpmp() - self._session.stop_upnp() self._session = None def _pop_alerts(self): @@ -271,9 +270,7 @@ def _create_fake_torrent(tmpdir): file_storage.add_file('tmp', size) t = libtorrent.create_torrent(file_storage, 0, 4 * 1024 * 1024) libtorrent.set_piece_hashes(t, tmpdir) - info = libtorrent.torrent_info(t.generate()) - btih = sha1(info.metadata()).hexdigest() - return info, btih + return libtorrent.torrent_info(t.generate()) async def main():