From 681e93a066ddb859932d43648d72ea710b931558 Mon Sep 17 00:00:00 2001
From: pcmid <plzcmid@gmail.com>
Date: Mon, 25 Oct 2021 22:00:47 +0800
Subject: [PATCH] Update: add sub_folder in AddTorrentOptions

---
 crates/librqbit/src/http_api.rs        | 2 ++
 crates/librqbit/src/http_api_client.rs | 1 +
 crates/librqbit/src/session.rs         | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/crates/librqbit/src/http_api.rs b/crates/librqbit/src/http_api.rs
index 6ba2eba..58fdfe3 100644
--- a/crates/librqbit/src/http_api.rs
+++ b/crates/librqbit/src/http_api.rs
@@ -276,6 +276,7 @@ fn json_or_404<T: Serialize>(idx: usize, v: Option<T>) -> warp::reply::Response
 pub struct TorrentAddQueryParams {
     pub overwrite: Option<bool>,
     pub output_folder: Option<String>,
+    pub sub_folder: Option<String>,
     pub only_files_regex: Option<String>,
     pub list_only: Option<bool>,
 }
@@ -362,6 +363,7 @@ impl HttpApi {
                             overwrite: params.overwrite.unwrap_or(false),
                             only_files_regex: params.only_files_regex,
                             output_folder: params.output_folder,
+                            sub_folder: params.sub_folder,
                             list_only: params.list_only.unwrap_or(false),
                             ..Default::default()
                         };
diff --git a/crates/librqbit/src/http_api_client.rs b/crates/librqbit/src/http_api_client.rs
index 569e2f4..01339d6 100644
--- a/crates/librqbit/src/http_api_client.rs
+++ b/crates/librqbit/src/http_api_client.rs
@@ -76,6 +76,7 @@ impl HttpApiClient {
             overwrite: Some(opts.overwrite),
             only_files_regex: opts.only_files_regex,
             output_folder: opts.output_folder,
+            sub_folder: opts.sub_folder,
             list_only: Some(opts.list_only),
         };
         let qs = serde_urlencoded::to_string(&params).unwrap();
diff --git a/crates/librqbit/src/session.rs b/crates/librqbit/src/session.rs
index da9705b..6f51da9 100644
--- a/crates/librqbit/src/session.rs
+++ b/crates/librqbit/src/session.rs
@@ -124,6 +124,7 @@ pub struct AddTorrentOptions {
     pub overwrite: bool,
     pub list_only: bool,
     pub output_folder: Option<String>,
+    pub sub_folder: Option<String>,
     pub peer_opts: Option<PeerConnectionOptions>,
     pub force_tracker_interval: Option<Duration>,
 }
@@ -318,10 +319,12 @@ impl Session {
             }));
         }
 
+        let sub_folder = opts.sub_folder.map(PathBuf::from).unwrap_or_default();
         let output_folder = opts
             .output_folder
             .map(PathBuf::from)
-            .unwrap_or_else(|| self.output_folder.clone());
+            .unwrap_or_else(|| self.output_folder.clone())
+            .join(sub_folder.as_path());
 
         let managed_torrent = ManagedTorrent {
             info_hash,