pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-05-04 10:33:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: simplify and improve logic

Browse source
This commit is contained in:
Stefanuk12 2025-04-25 19:16:19 +01:00
parent 59442c783f
commit 13f078cf62
No known key found for this signature in database
GPG key ID: 7E19B1E4C83A2A35
1 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/download_and_link.rs
View file

@ -15,9 +15,10 @@ use crate::{
}; };
use fs_err::tokio as fs; use fs_err::tokio as fs;
use futures::TryStreamExt as _; use futures::TryStreamExt as _;
use std::{ use std::{
borrow::Cow, borrow::Cow,
collections::HashMap, collections::{HashMap, VecDeque},
convert::Infallible, convert::Infallible,
future::{self, Future}, future::{self, Future},
num::NonZeroUsize, num::NonZeroUsize,
@ -188,13 +189,6 @@ impl Clone for DownloadAndLinkOptions {
} }
} }
fn get_parent<'a>(
graph: &'a std::collections::BTreeMap<PackageId, DependencyGraphNode>,
key: &PackageId,
) -> Option<(&'a PackageId, &'a DependencyGraphNode)> {
graph.iter().find(|(_, v)| v.dependencies.contains_key(key))
}
impl Project { impl Project {
/// Downloads a graph of dependencies and links them in the correct order /// Downloads a graph of dependencies and links them in the correct order
#[instrument(skip_all, fields(install_dependencies = debug(options.install_dependencies_mode)), level = "debug")] #[instrument(skip_all, fields(install_dependencies = debug(options.install_dependencies_mode)), level = "debug")]
@ -259,43 +253,29 @@ impl Project {
let graph_to_download = if force { let graph_to_download = if force {
Cow::Borrowed(graph) Cow::Borrowed(graph)
} else { } else {
let mut tasks = graph let mut queue = graph
.iter() .iter()
.filter_map(|(id, node)| { .filter(|(_id, node)| node.direct.is_some() && install_dependencies_mode.fits(node.resolved_ty))
let id = id.clone(); .collect::<VecDeque<_>>();
let node = node.clone();
let mut correct_deps = DependencyGraph::new();
while let Some((id, node)) = queue.pop_front() {
correct_deps.insert(id.clone(), node.clone());
node.dependencies
.iter()
.filter_map(|(id, _alias)| graph.get(&id).map(|node| (id, node)))
.for_each(|x| queue.push_back(x));
}
let mut tasks = correct_deps
.into_iter()
.map(|(id, node)| {
let container_folder = let container_folder =
node.container_folder_from_project(&id, self, manifest.target.kind()); node.container_folder_from_project(&id, self, manifest.target.kind());
async fn make_fut( async move {
id: PackageId, return (id, node, fs::metadata(&container_folder).await.is_ok());
node: DependencyGraphNode,
container_folder: PathBuf,
) -> (PackageId, DependencyGraphNode, bool) {
(id, node, fs::metadata(&container_folder).await.is_ok())
} }
if node.direct.is_some() && install_dependencies_mode.fits(&node.resolved_ty) {
return Some(make_fut(id, node, container_folder));
}
// not a direct dependency, check if its parent is and matches the install mode
// TODO: optimise this maybe. many iterations through the graph can add up if the graph's big
let mut current_parent = &id;
while let Some((parent_id, parent_node)) =
get_parent(&graph, current_parent)
{
if parent_node.direct.is_some()
&& install_dependencies_mode.fits(&parent_node.resolved_ty)
{
return Some(make_fut(id, node, container_folder));
}
current_parent = parent_id;
}
None
}) })
.collect::<JoinSet<_>>(); .collect::<JoinSet<_>>();
@ -479,7 +459,6 @@ impl Project {
.map_err(errors::DownloadAndLinkError::Hook)?; .map_err(errors::DownloadAndLinkError::Hook)?;
} }
if install_dependencies_mode != InstallDependenciesMode::All || !force { if install_dependencies_mode != InstallDependenciesMode::All || !force {
self.remove_unused(&graph).await?; self.remove_unused(&graph).await?;
} }