Skip to content

Commit

Permalink
fix(npm): Fix check-name in error message
Browse files Browse the repository at this point in the history
(the rest is formatting changes)
  • Loading branch information
ja-he committed Mar 23, 2024
1 parent 7f4cb20 commit b216054
Showing 1 changed file with 37 additions and 37 deletions.
74 changes: 37 additions & 37 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,48 +425,48 @@ fn MainContent() -> impl IntoView {

set_active_expensive_check(None);
}),
purl_data::PurlType::Npm => {
spawn_local(async move {
set_active_expensive_check(Some(CheckType::Npm));
purl_data::PurlType::Npm => spawn_local(async move {
set_active_expensive_check(Some(CheckType::Npm));

match purl_eval_npm::get_package(&n).await {
Ok(Some(package)) => {
set_eval_name(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::Verified,
explanation: "found on NPM".to_string(),
});
if let Some(version) = v {
if package
.versions
.iter()
.any(|(version_as_key, _)| *version_as_key == version)
{
set_eval_version(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::Verified,
explanation: "found on NPM".to_string(),
});
} else {
set_eval_version(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::AtLeastValid,
explanation: "not found on NPM".to_string(),
});
}
match purl_eval_npm::get_package(&n).await {
Ok(Some(package)) => {
set_eval_name(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::Verified,
explanation: "found on NPM".to_string(),
});
if let Some(version) = v {
if package
.versions
.iter()
.any(|(version_as_key, _)| *version_as_key == version)
{
set_eval_version(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::Verified,
explanation: "found on NPM".to_string(),
});
} else {
set_eval_version(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::AtLeastValid,
explanation: "not found on NPM".to_string(),
});
}
}
Ok(None) => {
set_eval_name(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::AtLeastValid,
explanation: "did not find this package on NPM".to_string(),
});
}
Err(e) => {
log::warn!("an unexpected error occurred checking for a GitHub repository ({e})");
}
}
Ok(None) => {
set_eval_name(purl_eval::EvalResult {
level: purl_eval::EvalResultLevel::AtLeastValid,
explanation: "did not find this package on NPM".to_string(),
});
}
Err(e) => {
log::warn!(
"an unexpected error occurred checking for an NPM project ({e})"
);
}
}

set_active_expensive_check(None);
})
}
set_active_expensive_check(None);
}),
_ => {}
}
});
Expand Down

0 comments on commit b216054

Please sign in to comment.