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

Default subfolder for multi-file torrents

Browse source
This commit is contained in:
Igor Katson 2023-12-03 10:18:34 +00:00
parent ca66a70bc1
commit fc62653727
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use std::{
use anyhow::{bail, Context}; use anyhow::{bail, Context};
use bencode::{bencode_serialize_to_writer, BencodeDeserializer}; use bencode::{bencode_serialize_to_writer, BencodeDeserializer};
use buffers::ByteString; use buffers::{ByteBufT, ByteString};
use dht::{Dht, DhtBuilder, Id20, PersistentDht, PersistentDhtConfig, RequestPeersStream}; use dht::{Dht, DhtBuilder, Id20, PersistentDht, PersistentDhtConfig, RequestPeersStream};
use librqbit_core::{ use librqbit_core::{
directories::get_configuration_directory, directories::get_configuration_directory,
@ -655,12 +655,38 @@ impl Session {
let only_files = get_only_files(opts.only_files, opts.only_files_regex, opts.list_only)?; let only_files = get_only_files(opts.only_files, opts.only_files_regex, opts.list_only)?;
let sub_folder = opts.sub_folder.map(PathBuf::from).unwrap_or_default(); let get_default_subfolder = || {
let output_folder = opts let files = info
.output_folder .iter_filenames_and_lengths()?
.map(PathBuf::from) .map(|(f, l)| Ok((f.to_pathbuf()?, l)))
.unwrap_or_else(|| self.output_folder.clone()) .collect::<anyhow::Result<Vec<(PathBuf, u64)>>>()?;
.join(sub_folder); if files.len() < 2 {
return Ok(None);
}
if let Some(name) = &info.name {
let s = std::str::from_utf8(name.as_slice())
.context("invalid UTF-8 in torrent name")?;
return Ok(Some(PathBuf::from(s)));
};
// Let the subfolder name be the longest filename
let longest = files
.iter()
.max_by_key(|(_, l)| l)
.unwrap()
.0
.file_stem()
.context("can't determine longest filename")?;
Ok::<_, anyhow::Error>(Some(PathBuf::from(longest)))
};
let output_folder = match (opts.output_folder, opts.sub_folder) {
(None, None) => self
.output_folder
.join(get_default_subfolder()?.unwrap_or_default()),
(Some(o), None) => PathBuf::from(o),
(Some(_), Some(_)) => bail!("you can't provide both output_folder and sub_folder"),
(None, Some(s)) => self.output_folder.join(s),
};
if opts.list_only { if opts.list_only {
return Ok(AddTorrentResponse::ListOnly(ListOnlyResponse { return Ok(AddTorrentResponse::ListOnly(ListOnlyResponse {