pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2025-04-08 12:50:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: improve container_folder api

Browse source
This commit is contained in:
daimond113 2025-01-01 16:35:59 +01:00
parent d0169976cd
commit 78e58d63fa
No known key found for this signature in database
GPG key ID: 3A8ECE51328B513C
6 changed files with 47 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cli/commands/publish.rs
View file

@ -125,13 +125,11 @@ impl PublishCommand {
.target .target
.kind() .kind()
.packages_folder(id.version_id().target()); .packages_folder(id.version_id().target());
let container_folder = node.container_folder( let container_folder = project
&project .package_dir()
.package_dir() .join(base_folder)
.join(base_folder) .join(PACKAGES_CONTAINER_NAME)
.join(PACKAGES_CONTAINER_NAME), .join(node.container_folder(id));
id,
);
let node = node.clone(); let node = node.clone();
let refreshed_sources = refreshed_sources.clone(); let refreshed_sources = refreshed_sources.clone();

12
src/cli/commands/run.rs
View file

@ -92,13 +92,11 @@ impl RunCommand {
.target .target
.kind() .kind()
.packages_folder(id.version_id().target()); .packages_folder(id.version_id().target());
let container_folder = node.container_folder( let container_folder = project
&project .package_dir()
.package_dir() .join(base_folder)
.join(base_folder) .join(PACKAGES_CONTAINER_NAME)
.join(PACKAGES_CONTAINER_NAME), .join(node.container_folder(&id));
&id,
);
let source = node.pkg_ref.source(); let source = node.pkg_ref.source();
source source

15
src/download.rs
View file

@ -170,15 +170,12 @@ impl Project {
) )
.await?; .await?;
let container_folder = node.container_folder( let container_folder = package_dir
&package_dir .join(
.join( manifest_target_kind.packages_folder(package_id.version_id().target()),
manifest_target_kind )
.packages_folder(package_id.version_id().target()), .join(PACKAGES_CONTAINER_NAME)
) .join(node.container_folder(&package_id));
.join(PACKAGES_CONTAINER_NAME),
&package_id,
);
fs::create_dir_all(&container_folder).await?; fs::create_dir_all(&container_folder).await?;

26
src/graph.rs
View file

@ -11,10 +11,7 @@ use crate::{
}, },
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{ use std::{collections::BTreeMap, path::PathBuf};
collections::BTreeMap,
path::{Path, PathBuf},
};
/// A graph of dependencies /// A graph of dependencies
pub type Graph<Node> = BTreeMap<PackageId, Node>; pub type Graph<Node> = BTreeMap<PackageId, Node>;
@ -47,23 +44,20 @@ impl DependencyGraphNode {
} }
/// Returns the folder to store the contents of the package in /// Returns the folder to store the contents of the package in
pub fn container_folder<P: AsRef<Path>>(&self, path: &P, package_id: &PackageId) -> PathBuf { pub fn container_folder(&self, package_id: &PackageId) -> PathBuf {
let (name, version) = package_id.parts(); let (name, version) = package_id.parts();
if self.pkg_ref.like_wally() { if self.pkg_ref.like_wally() {
return path return PathBuf::from(format!(
.as_ref() "{}_{}@{}",
.join(format!( package_id.name().as_str().0,
"{}_{}@{}", name.as_str().1,
package_id.name().as_str().0, version
name.as_str().1, ))
version .join(name.as_str().1);
))
.join(name.as_str().1);
} }
path.as_ref() PathBuf::from(name.escaped())
.join(name.escaped())
.join(version.to_string()) .join(version.to_string())
.join(name.as_str().1) .join(name.as_str().1)
} }

27
src/linking/mod.rs
View file

@ -91,16 +91,13 @@ impl Project {
return Ok((package_id, vec![])); return Ok((package_id, vec![]));
}; };
let container_folder = node.node.container_folder( let container_folder = project
&project .package_dir()
.package_dir() .join(
.join( manifest_target_kind.packages_folder(package_id.version_id().target()),
manifest_target_kind )
.packages_folder(package_id.version_id().target()), .join(PACKAGES_CONTAINER_NAME)
) .join(node.node.container_folder(&package_id));
.join(PACKAGES_CONTAINER_NAME),
&package_id,
);
let types = if lib_file.as_str() != LINK_LIB_NO_FILE_FOUND { let types = if lib_file.as_str() != LINK_LIB_NO_FILE_FOUND {
let lib_file = lib_file.to_path(&container_folder); let lib_file = lib_file.to_path(&container_folder);
@ -274,9 +271,8 @@ impl Project {
.await?; .await?;
let packages_container_folder = base_folder.join(PACKAGES_CONTAINER_NAME); let packages_container_folder = base_folder.join(PACKAGES_CONTAINER_NAME);
let container_folder = node let container_folder =
.node packages_container_folder.join(node.node.container_folder(&package_id));
.container_folder(&packages_container_folder, &package_id);
if let Some((alias, _, _)) = &node.node.direct { if let Some((alias, _, _)) = &node.node.direct {
project project
@ -320,9 +316,8 @@ impl Project {
.await?; .await?;
let packages_container_folder = base_folder.join(PACKAGES_CONTAINER_NAME); let packages_container_folder = base_folder.join(PACKAGES_CONTAINER_NAME);
let container_folder = dependency_node let container_folder = packages_container_folder
.node .join(dependency_node.node.container_folder(dependency_id));
.container_folder(&packages_container_folder, dependency_id);
let linker_folder = create_and_canonicalize(node_container_folder.join( let linker_folder = create_and_canonicalize(node_container_folder.join(
node.node.base_folder( node.node.base_folder(

22
src/patches.rs
View file

@ -102,18 +102,16 @@ impl Project {
continue; continue;
}; };
let container_folder = node.container_folder( let container_folder = self
&self .package_dir()
.package_dir() .join(
.join( manifest
manifest .target
.target .kind()
.kind() .packages_folder(package_id.version_id().target()),
.packages_folder(package_id.version_id().target()), )
) .join(PACKAGES_CONTAINER_NAME)
.join(PACKAGES_CONTAINER_NAME), .join(node.container_folder(&package_id));
&package_id,
);
let reporter = reporter.clone(); let reporter = reporter.clone();
let span = tracing::info_span!("apply patch", package_id = package_id.to_string()); let span = tracing::info_span!("apply patch", package_id = package_id.to_string());