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

Add API to add a torrent

Browse source
This commit is contained in:
Igor Katson 2021-10-10 09:57:21 +01:00
parent 6e9e79a02e
commit 64900e1fd4
3 changed files with 86 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,6 @@ use crate::{
pub struct Session {
peer_id: Id20,
dht: Option<Dht>,
http_api: Option<HttpApi>,
peer_opts: PeerConnectionOptions,
spawner: BlockingSpawner,
output_folder: PathBuf,
@ -95,8 +94,6 @@ pub struct SessionOptions {
pub disable_dht: bool,
pub disable_dht_persistence: bool,
pub dht_config: Option<PersistentDhtConfig>,
pub disable_http_api: bool,
pub http_api_listen_addr: Option<SocketAddr>,
pub peer_id: Option<Id20>,
pub peer_opts: Option<PeerConnectionOptions>,
}
@ -124,29 +121,17 @@ impl Session {
};
let peer_opts = opts.peer_opts.unwrap_or_default();
let http_api = if opts.disable_http_api {
None
} else {
let http_api_listen_addr = opts
.http_api_listen_addr
.unwrap_or_else(|| "127.0.0.1:3001".parse().unwrap());
let http_api = HttpApi::new(dht.clone());
spawn("HTTP API", {
let http_api = http_api.clone();
async move { http_api.make_http_api_and_run(http_api_listen_addr).await }
});
Some(http_api)
};
Ok(Self {
peer_id,
dht,
http_api,
peer_opts,
spawner,
output_folder,
})
}
pub fn get_dht(&self) -> Option<Dht> {
self.dht.clone()
}
pub async fn add_torrent(
&self,
url: String,
@ -303,16 +288,7 @@ impl Session {
builder.peer_connect_timeout(t);
}
// let http_api = HttpApi::new(self.dht.clone());
// spawn("HTTP API", {
// let http_api = http_api.clone();
// async move { http_api.make_http_api_and_run(http_api_listen_addr).await }
// });
let handle = builder.start_manager()?;
if let Some(http_api) = self.http_api.as_ref() {
http_api.add_mgr(handle.clone());
}
for url in trackers {
handle.add_tracker(url);