Skip to content

Refactor collector and input #1823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2025
Merged

Refactor collector and input #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lychee-lib/src/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ impl Collector {
client: self.client,
};

let extractor = Extractor::new(
self.use_html5ever,
self.include_verbatim,
self.include_wikilinks,
);

stream::iter(inputs)
.par_then_unordered(None, move |input| {
let default_base = global_base.clone();
Expand Down Expand Up @@ -279,11 +285,6 @@ impl Collector {
let basic_auth_extractor = self.basic_auth_extractor.clone();
async move {
let content = content?;
let extractor = Extractor::new(
self.use_html5ever,
self.include_verbatim,
self.include_wikilinks,
);
let uris: Vec<RawUri> = extractor.extract(&content);
let requests = request::create(
uris,
Expand Down
104 changes: 50 additions & 54 deletions lychee-lib/src/types/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ impl Input {
///
/// # Errors
///
/// Returns an error if the contents can not be retrieved
/// because of an underlying I/O error (e.g. an error while making a
/// network request or retrieving the contents from the file system)
/// Returns an error if the contents can not be retrieved because of an
/// underlying I/O error (e.g. an error while making a network request or
/// retrieving the contents from the file system)
pub fn get_contents(
self,
skip_missing: bool,
Expand All @@ -345,75 +345,71 @@ impl Input {
excluded_paths: PathExcludes,
) -> impl Stream<Item = Result<InputContent>> {
try_stream! {
// Handle special cases first
match self.source {
InputSource::RemoteUrl(url) => {
let content = resolver.url_contents(*url).await;
match content {
match resolver.url_contents(*url).await {
Err(_) if skip_missing => (),
Err(e) => Err(e)?,
Ok(content) => yield content,
}
return;
},
InputSource::Stdin => {
let content = Self::stdin_content(self.file_type_hint).await?;
yield content;
yield Self::stdin_content(self.file_type_hint).await?;
return;
},
InputSource::String(ref s) => {
let content = Self::string_content(s, self.file_type_hint);
yield content;
yield Self::string_content(s, self.file_type_hint);
return;
},
_ => {}
}

// Handle FsPath and FsGlob sources
// We can use `get_input_sources` to get the input sources, which will handle
// filtering by file extensions and exclusions
let mut sources_stream = Box::pin(self.get_input_sources(file_extensions, skip_hidden, skip_gitignored, &excluded_paths));

while let Some(source_result) = sources_stream.next().await {
match source_result {
Ok(source) => {
match source {
InputSource::FsPath(path) => {
// Process the actual file path
let content = Self::path_content(&path).await;
match content {
Err(_) if skip_missing => (),
Err(e) if matches!(&e, ErrorKind::ReadFileInput(io_err, _) if io_err.kind() == std::io::ErrorKind::InvalidData) => {
// If the file contains invalid UTF-8 (e.g. binary), we skip it
log::warn!("Skipping file with invalid UTF-8 content: {}", path.display());
InputSource::FsGlob { .. } | InputSource::FsPath(..) => {
// Handle FsPath and FsGlob sources
// We can use `get_input_sources` to get the input sources, which will handle
// filtering by file extensions and exclusions
let mut sources_stream = Box::pin(self.get_input_sources(file_extensions, skip_hidden, skip_gitignored, &excluded_paths));

while let Some(source_result) = sources_stream.next().await {
match source_result {
Ok(source) => {
match source {
InputSource::RemoteUrl(url) => {
let content = resolver.url_contents(*url).await;
match content {
Err(_) if skip_missing => (),
Err(e) => Err(e)?,
Ok(content) => yield content,
}
},
Err(e) => Err(e)?,
Ok(content) => yield content,
}
},
InputSource::RemoteUrl(url) => {
let content = resolver.url_contents(*url).await;
match content {
Err(_) if skip_missing => (),
Err(e) => Err(e)?,
Ok(content) => yield content,
InputSource::Stdin => {
let content = Self::stdin_content(self.file_type_hint).await?;
yield content;
},
InputSource::String(s) => {
let content = Self::string_content(&s, self.file_type_hint);
yield content;
},
InputSource::FsPath(path) => {
// Process the actual file path
let content = Self::path_content(&path).await;
match content {
Err(_) if skip_missing => (),
Err(e) if matches!(&e, ErrorKind::ReadFileInput(io_err, _) if io_err.kind() == std::io::ErrorKind::InvalidData) => {
// If the file contains invalid UTF-8 (e.g. binary), we skip it
log::warn!("Skipping file with invalid UTF-8 content: {}", path.display());
},
Err(e) => Err(e)?,
Ok(content) => yield content,
}
},
InputSource::FsGlob { .. } => {
unreachable!("This shouldn't happen as `get_input_sources` expands the glob patterns");
}
}
},
InputSource::Stdin => {
let content = Self::stdin_content(self.file_type_hint).await?;
yield content;
},
InputSource::String(s) => {
let content = Self::string_content(&s, self.file_type_hint);
yield content;
},
InputSource::FsGlob { .. } => {
unreachable!("This shouldn't happen as `get_input_sources` expands the glob patterns");
}
Err(e) => Err(e)?,
}
},
Err(e) => Err(e)?,
}
}
},
}
}
}
Expand Down
Loading