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 librqbit Id20 impl to validate info-hash bytes, require valid type for public methods

Browse source
This commit is contained in:
yggverse 2025-08-08 04:10:43 +03:00
parent d61af4b970
commit 704a2e5c29
4 changed files with 24 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main.rs
View file

@ -89,18 +89,18 @@ async fn main() -> Result<()> {
}
} {
// convert to string once
let i = i.to_string();
let is = i.as_string();
if preload.contains_torrent(&i)? {
continue;
}
log::debug!("Index `{i}`...");
log::debug!("Index `{is}`...");
// run the crawler in single thread for performance reasons,
// use `timeout` argument option to skip the dead connections.
match time::timeout(
Duration::from_secs(config.add_torrent_timeout),
session.add_torrent(
AddTorrent::from_url(magnet(
&i,
&is,
if config.tracker.is_empty() {
None
} else {
@ -143,20 +143,20 @@ async fn main() -> Result<()> {
.is_some_and(|limit| only_files.len() + 1 > limit)
{
log::debug!(
"file count limit reached, skip `{id}` for `{i}`"
"file count limit reached, skip `{id}` for `{is}`"
);
break;
}
if preload.max_filesize.is_some_and(|limit| info.len > limit) {
log::debug!(
"file size limit reached, skip `{id}` for `{i}`"
"file size limit reached, skip `{id}` for `{is}`"
);
continue;
}
if preload.regex.as_ref().is_some_and(|r| {
!r.is_match(&info.relative_filename.to_string_lossy())
}) {
log::debug!("regex filter, skip `{id}` for `{i}`");
log::debug!("regex filter, skip `{id}` for `{is}`");
continue;
}
assert!(keep_files.insert(info.relative_filename.clone()));
@ -175,12 +175,12 @@ async fn main() -> Result<()> {
session
.delete(librqbit::api::TorrentIdOrHash::Id(id), false)
.await?;
log::debug!("torrent `{i}` indexed.")
log::debug!("torrent `{is}` indexed.")
}
Ok(_) => panic!(),
Err(e) => log::debug!("Failed to resolve `{i}`: `{e}`."),
Err(e) => log::debug!("Failed to resolve `{is}`: `{e}`."),
},
Err(e) => log::debug!("failed to resolve `{i}`: `{e}`"),
Err(e) => log::debug!("failed to resolve `{is}`: `{e}`"),
}
}
}
@ -200,11 +200,7 @@ async fn main() -> Result<()> {
/// Build magnet URI
fn magnet(info_hash: &str, trackers: Option<&Vec<Url>>) -> String {
let mut m = if info_hash.len() == 40 {
format!("magnet:?xt=urn:btih:{info_hash}")
} else {
todo!("infohash v2 is not supported by librqbit")
};
let mut m = format!("magnet:?xt=urn:btih:{info_hash}");
if let Some(t) = trackers {
for tracker in t {
m.push_str("&tr=");