YGGverse/aquatic-crawler
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic-crawler.git synced 2026-04-01 17:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use semantic var names, apply minor optimizations

Browse source
This commit is contained in:
yggverse 2025-08-08 17:55:45 +03:00
parent eea10011ed
commit c3bb7c8b4c
2 changed files with 54 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.rs
View file

@ -119,7 +119,10 @@ async fn main() -> Result<()> {
)), )),
// the destination folder to preload files match `preload_regex` // the destination folder to preload files match `preload_regex`
// * e.g. images for audio albums // * e.g. images for audio albums
output_folder: preload.tmp(&i, true)?.to_str().map(|s| s.to_string()), output_folder: preload
.tmp_dir(&i, true)?
.to_str()
.map(|s| s.to_string()),
..Default::default() ..Default::default()
}), }),
), ),

85
src/preload.rs
View file

@ -40,49 +40,43 @@ impl Preload {
torrent_bytes: Vec<u8>, torrent_bytes: Vec<u8>,
persist_files: Option<HashSet<PathBuf>>, persist_files: Option<HashSet<PathBuf>>,
) -> Result<()> { ) -> Result<()> {
// persist preload files // persist preloaded files
let mut d = PathBuf::from(&self.root); let permanent_dir = self.permanent_dir(info_hash, true)?;
d.push(info_hash);
if d.exists() {
// clean previous data
fs::remove_dir_all(&d)?;
log::debug!("clean previous data `{}`", d.to_string_lossy())
}
// init temporary path without creating the dir (delegate to `librqbit`) // init temporary path without creating the dir (delegate to `librqbit`)
let tmp_dir = self.tmp(info_hash, false)?; let tmp_dir = self.tmp_dir(info_hash, false)?;
if let Some(f) = persist_files { if let Some(files) = persist_files {
let r = d.components().count(); // count root offset once let components_count = permanent_dir.components().count(); // count root offset once
for p in f { for file in files {
// build the absolute path for the relative torrent file // build the absolute path for the relative torrent filename
let o = { let tmp_file = {
let mut t = PathBuf::from(&tmp_dir); let mut p = PathBuf::from(&tmp_dir);
t.push(p); p.push(file);
t.canonicalize()? p.canonicalize()?
}; };
// make sure preload path is referring to the expected location // make sure preload path is referring to the expected location
if !o.starts_with(&self.root) || o.is_dir() { if !tmp_file.starts_with(&self.root) || tmp_file.is_dir() {
bail!("unexpected canonical path `{}`", o.to_string_lossy()) bail!("unexpected canonical path `{}`", tmp_file.to_string_lossy())
} }
// build new permanent path /root/info-hash // build new permanent path /root/info-hash
let mut n = PathBuf::from(&d); let mut permanent_file = PathBuf::from(&permanent_dir);
for component in o.components().skip(r) { for component in tmp_file.components().skip(components_count) {
n.push(component) permanent_file.push(component)
} }
// make sure segments count is same to continue // make sure segments count is same to continue
if o.components().count() != n.components().count() { if tmp_file.components().count() != permanent_file.components().count() {
bail!( bail!(
"unexpected components count: `{}` > `{}`", "unexpected components count: `{}` > `{}`",
o.to_string_lossy(), tmp_file.to_string_lossy(),
n.to_string_lossy(), permanent_file.to_string_lossy(),
) )
} }
// move `persist_files` from temporary to permanent location // move `persist_files` from temporary to permanent location
fs::create_dir_all(n.parent().unwrap())?; fs::create_dir_all(permanent_file.parent().unwrap())?;
fs::rename(&o, &n)?; fs::rename(&tmp_file, &permanent_file)?;
log::debug!( log::debug!(
"persist tmp file `{}` to `{}`", "persist tmp file `{}` to `{}`",
o.to_string_lossy(), tmp_file.to_string_lossy(),
n.to_string_lossy() permanent_file.to_string_lossy()
); );
} }
} }
@ -92,17 +86,20 @@ impl Preload {
log::debug!("clean tmp data `{}`", tmp_dir.to_string_lossy()) log::debug!("clean tmp data `{}`", tmp_dir.to_string_lossy())
} }
// persist torrent bytes to file (on previous operations success) // persist torrent bytes to file (on previous operations success)
let t = self.torrent(info_hash); let torrent_file = self.torrent(info_hash);
fs::write(&t, torrent_bytes)?; fs::write(&torrent_file, torrent_bytes)?;
log::debug!("persist torrent bytes for `{}`", t.to_string_lossy()); log::debug!(
"persist torrent bytes for `{}`",
torrent_file.to_string_lossy()
);
Ok(()) Ok(())
} }
// Getters // Actions
/// Get absolute path to the temporary directory /// Build the absolute path to the temporary directory
/// * optionally creates directory if not exists /// * optionally creates directory if not exists
pub fn tmp(&self, info_hash: &str, is_create: bool) -> Result<PathBuf> { pub fn tmp_dir(&self, info_hash: &str, is_create: bool) -> Result<PathBuf> {
let mut p = PathBuf::from(&self.root); let mut p = PathBuf::from(&self.root);
p.push(tmp_component(info_hash)); p.push(tmp_component(info_hash));
if p.is_file() { if p.is_file() {
@ -115,6 +112,24 @@ impl Preload {
Ok(p) Ok(p)
} }
/// Build the absolute path to the permanent directory
/// * optionally removes directory with its content
fn permanent_dir(&self, info_hash: &str, is_clear: bool) -> Result<PathBuf> {
let mut p = PathBuf::from(&self.root);
p.push(info_hash);
if p.is_file() {
bail!("permanent directory `{}` is file", p.to_string_lossy())
}
if is_clear && p.exists() {
// clean previous data
fs::remove_dir_all(&p)?;
log::debug!("clean previous data `{}`", p.to_string_lossy())
}
Ok(p)
}
// Getters
/// Get root location for `Self` /// Get root location for `Self`
pub fn root(&self) -> &PathBuf { pub fn root(&self) -> &PathBuf {
&self.root &self.root