leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move some fields into ManagedTorrentInfo

Browse source
This commit is contained in:
Igor Katson 2024-08-21 16:06:16 +01:00
parent ad7b59ea3c
commit b4512e4809
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/librqbit/src/session.rs
View file

@ -1117,6 +1117,7 @@ impl Session {
let span = error_span!(parent: self.rs(), "torrent", id);
let peer_opts = self.merge_peer_opts(opts.peer_opts);
let minfo = Arc::new(ManagedTorrentInfo {
id,
span,
file_infos,
info,
@ -1127,6 +1128,7 @@ impl Session {
spawner: self.spawner,
peer_id: self.peer_id,
lengths,
storage_factory,
options: ManagedTorrentOptions {
force_tracker_interval: opts.force_tracker_interval,
peer_connect_timeout: peer_opts.connect_timeout,
@ -1141,16 +1143,14 @@ impl Session {
let initializing = Arc::new(TorrentStateInitializing::new(
minfo.clone(),
only_files.clone(),
storage_factory.create_and_init(&minfo)?,
minfo.storage_factory.create_and_init(&minfo)?,
));
let handle = Arc::new(ManagedTorrent {
id,
locked: RwLock::new(ManagedTorrentLocked {
state: ManagedTorrentState::Initializing(initializing),
only_files,
}),
state_change_notify: Notify::new(),
storage_factory,
info: minfo,
session: Arc::downgrade(self),
});
@ -1257,7 +1257,7 @@ impl Session {
_ => None,
})
.map(Ok)
.unwrap_or_else(|| removed.storage_factory.create(removed.info()));
.unwrap_or_else(|| removed.info.storage_factory.create(removed.info()));
match (storage, delete_files) {
(Err(e), true) => return Err(e).context("torrent deleted, but could not delete files"),