YGGverse/aquatic-crawler
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic-crawler.git synced 2026-03-31 17:15:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

optimize duplicated lines

Browse source
This commit is contained in:
yggverse 2025-08-08 02:21:20 +03:00
parent e88a3e9f50
commit c8ba44f508
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/preload.rs
View file

@ -39,9 +39,7 @@ impl Preload {
torrent_bytes: Vec<u8>, torrent_bytes: Vec<u8>,
persist_files: Option<HashSet<PathBuf>>, persist_files: Option<HashSet<PathBuf>>,
) -> Result<()> { ) -> Result<()> {
if !is_info_hash(info_hash) { validate_info_hash(info_hash)?;
bail!("Invalid info-hash `{info_hash}`")
}
// persist torrent bytes to file // persist torrent bytes to file
let t = self.torrent(info_hash); let t = self.torrent(info_hash);
fs::write(&t, torrent_bytes)?; fs::write(&t, torrent_bytes)?;
@ -98,9 +96,7 @@ impl Preload {
/// * creates new temporary directory if not exists /// * creates new temporary directory if not exists
pub fn tmp(&self, info_hash: &str, is_create: bool) -> Result<PathBuf> { pub fn tmp(&self, info_hash: &str, is_create: bool) -> Result<PathBuf> {
if !is_info_hash(info_hash) { validate_info_hash(info_hash)?;
bail!("Invalid info-hash `{info_hash}`")
}
let mut p = PathBuf::from(&self.root); let mut p = PathBuf::from(&self.root);
p.push(tmp(info_hash)); p.push(tmp(info_hash));
if p.is_file() { if p.is_file() {
@ -117,9 +113,7 @@ impl Preload {
} }
pub fn contains_torrent(&self, info_hash: &str) -> Result<bool> { pub fn contains_torrent(&self, info_hash: &str) -> Result<bool> {
if !is_info_hash(info_hash) { validate_info_hash(info_hash)?;
bail!("Invalid info-hash `{info_hash}`")
}
Ok(fs::exists(self.torrent(info_hash))?) Ok(fs::exists(self.torrent(info_hash))?)
} }
@ -130,8 +124,12 @@ impl Preload {
} }
} }
fn is_info_hash(value: &str) -> bool { fn validate_info_hash(value: &str) -> Result<()> {
value.len() == 40 && value.chars().all(|c| c.is_ascii_hexdigit()) if value.len() == 40 && value.chars().all(|c| c.is_ascii_hexdigit()) {
Ok(())
} else {
bail!("Invalid info-hash value `{value}`")
}
} }
fn tmp(info_hash: &str) -> String { fn tmp(info_hash: &str) -> String {