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

Added destination_fodler to TorrentDetailsResponse (#263)

Browse source 
* Added destination folder to torrent detail response.

* clean up changes not needed

* cleaned up launch.json and renamed to destination_folder to output_folder
This commit is contained in:
Mark Mendoza 2024-10-29 02:50:21 -07:00 • committed by GitHub
parent 588e6cdd77
commit fb6822ca41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/librqbit/src/api.rs
View file

@ -208,7 +208,9 @@ impl Api {
let handle = self.mgr_handle(idx)?; let handle = self.mgr_handle(idx)?;
let info_hash = handle.shared().info_hash; let info_hash = handle.shared().info_hash;
let only_files = handle.only_files(); let only_files = handle.only_files();
make_torrent_details(&info_hash, &handle.shared().info, only_files.as_deref()) let output_folder = handle.shared().options.output_folder.to_string_lossy().into_owned().to_string();
make_torrent_details(&info_hash, &handle.shared().info, only_files.as_deref(), output_folder)
} }
pub fn api_session_stats(&self) -> SessionStatsSnapshot { pub fn api_session_stats(&self) -> SessionStatsSnapshot {
@ -341,6 +343,7 @@ impl Api {
&handle.info_hash(), &handle.info_hash(),
&handle.shared().info, &handle.shared().info,
handle.only_files().as_deref(), handle.only_files().as_deref(),
handle.shared().options.output_folder.to_string_lossy().into_owned(),
) )
.context("error making torrent details")?; .context("error making torrent details")?;
ApiAddTorrentResponse { ApiAddTorrentResponse {
@ -366,14 +369,15 @@ impl Api {
id: None, id: None,
output_folder: output_folder.to_string_lossy().into_owned(), output_folder: output_folder.to_string_lossy().into_owned(),
seen_peers: Some(seen_peers), seen_peers: Some(seen_peers),
details: make_torrent_details(&info_hash, &info, only_files.as_deref()) details: make_torrent_details(&info_hash, &info, only_files.as_deref(), output_folder.to_string_lossy().into_owned().to_string())
.context("error making torrent details")?, .context("error making torrent details")?,
}, },
AddTorrentResponse::Added(id, handle) => { AddTorrentResponse::Added(id, handle) => {
let details = make_torrent_details( let details = make_torrent_details(
&handle.info_hash(), &handle.info_hash(),
&handle.shared().info, &handle.shared().info,
handle.only_files().as_deref(), handle.only_files().as_deref(),
handle.shared().options.output_folder.to_string_lossy().into_owned(),
) )
.context("error making torrent details")?; .context("error making torrent details")?;
ApiAddTorrentResponse { ApiAddTorrentResponse {
@ -454,6 +458,7 @@ pub struct TorrentDetailsResponse {
pub info_hash: String, pub info_hash: String,
pub name: Option<String>, pub name: Option<String>,
pub files: Vec<TorrentDetailsResponseFile>, pub files: Vec<TorrentDetailsResponseFile>,
pub output_folder: String,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@ -468,6 +473,7 @@ fn make_torrent_details(
info_hash: &Id20, info_hash: &Id20,
info: &TorrentMetaV1Info<ByteBufOwned>, info: &TorrentMetaV1Info<ByteBufOwned>,
only_files: Option<&[usize]>, only_files: Option<&[usize]>,
output_folder: String,
) -> Result<TorrentDetailsResponse> { ) -> Result<TorrentDetailsResponse> {
let files = info let files = info
.iter_filenames_and_lengths() .iter_filenames_and_lengths()
@ -495,6 +501,7 @@ fn make_torrent_details(
info_hash: info_hash.as_string(), info_hash: info_hash.as_string(),
name: info.name.as_ref().map(|b| b.to_string()), name: info.name.as_ref().map(|b| b.to_string()),
files, files,
output_folder,
}) })
} }