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

Merge pull request #164 from ikatson/fix-161

Browse source 
Fix #161
This commit is contained in:
Igor Katson 2024-08-03 11:08:38 +01:00 • committed by GitHub
commit e03adfbdba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/rqbit/src/main.rs
View file

@ -410,12 +410,16 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
let http_api_url = format!("http://{}", opts.http_api_listen_addr); let http_api_url = format!("http://{}", opts.http_api_listen_addr);
let client = http_api_client::HttpApiClient::new(&http_api_url)?; let client = http_api_client::HttpApiClient::new(&http_api_url)?;
let torrent_opts = || AddTorrentOptions { let torrent_opts = |with_output_folder: bool| AddTorrentOptions {
only_files_regex: download_opts.only_files_matching_regex.clone(), only_files_regex: download_opts.only_files_matching_regex.clone(),
overwrite: download_opts.overwrite, overwrite: download_opts.overwrite,
list_only: download_opts.list, list_only: download_opts.list,
force_tracker_interval: opts.force_tracker_interval, force_tracker_interval: opts.force_tracker_interval,
output_folder: download_opts.output_folder.clone(), output_folder: if with_output_folder {
download_opts.output_folder.clone()
} else {
None
},
sub_folder: download_opts.sub_folder.clone(), sub_folder: download_opts.sub_folder.clone(),
initial_peers: download_opts.initial_peers.clone().map(|p| p.0), initial_peers: download_opts.initial_peers.clone().map(|p| p.0),
disable_trackers: download_opts.disable_trackers, disable_trackers: download_opts.disable_trackers,
@ -436,7 +440,7 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
match client match client
.add_torrent( .add_torrent(
AddTorrent::from_cli_argument(torrent_url)?, AddTorrent::from_cli_argument(torrent_url)?,
Some(torrent_opts()), Some(torrent_opts(true)),
) )
.await .await
{ {
@ -495,7 +499,10 @@ async fn async_main(opts: Opts) -> anyhow::Result<()> {
for path in &download_opts.torrent_path { for path in &download_opts.torrent_path {
let handle = match session let handle = match session
.add_torrent(AddTorrent::from_cli_argument(path)?, Some(torrent_opts())) .add_torrent(
AddTorrent::from_cli_argument(path)?,
Some(torrent_opts(false)),
)
.await .await
{ {
Ok(v) => match v { Ok(v) => match v {