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

Propagate sub-folder argument to command line

Browse source
This commit is contained in:
Igor Katson 2021-10-26 10:21:02 +01:00
parent 4170bf3574
commit 37af0a4afb
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -324,7 +324,7 @@ impl Session {
.output_folder
.map(PathBuf::from)
.unwrap_or_else(|| self.output_folder.clone())
.join(sub_folder.as_path());
.join(sub_folder);
let managed_torrent = ManagedTorrent {
info_hash,

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

@ -101,9 +101,17 @@ struct DownloadOpts {
torrent_path: Vec<String>,
/// The output folder to write to. If not exists, it will be created.
/// If not specified, would use the server's output folder. If there's no server
/// running, this is required.
#[clap(short = 'o', long)]
output_folder: Option<String>,
/// The sub folder within output folder to write to. Useful when you have
/// a server running with output_folder configured, and don't want to specify
/// the full path every time.
#[clap(short = 's', long)]
sub_folder: Option<String>,
/// If set, only the file whose filename matching this regex will
/// be downloaded
#[clap(short = 'r', long = "filename-re")]
@ -268,6 +276,7 @@ async fn async_main(opts: Opts, spawner: BlockingSpawner) -> anyhow::Result<()>
list_only: download_opts.list,
force_tracker_interval: opts.force_tracker_interval.map(|d| d.0),
output_folder: download_opts.output_folder.clone(),
sub_folder: download_opts.sub_folder.clone(),
..Default::default()
};
let connect_to_existing = match client.validate_rqbit_server().await {