Skip to content
Closed
Changes from all commits
Commits
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
25 changes: 24 additions & 1 deletion crates/pm/src/util/cloner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,15 @@ async fn validate_directory(src: &Path, dst: &Path) -> Result<bool> {

// find the first non built subdirectory
pub async fn find_real_src<P: AsRef<Path>>(src: P) -> Option<PathBuf> {
let mut read_dir = fs::read_dir(src.as_ref()).await.ok()?;
let src = src.as_ref();
let package_dir = src.join("package");
if let Ok(metadata) = fs::metadata(&package_dir).await
&& metadata.is_dir()
{
return Some(package_dir);
}

let mut read_dir = fs::read_dir(src).await.ok()?;
while let Some(entry) = read_dir.next_entry().await.ok()? {
if let Ok(metadata) = entry.metadata().await
&& metadata.is_dir()
Expand Down Expand Up @@ -648,6 +656,21 @@ mod tests {
Ok(())
}

#[tokio::test]
async fn test_find_real_src_prefers_package_dir() -> Result<()> {
let temp = TempDir::new()?;
let dir = temp.path().join("test_dir");
fs::create_dir(&dir).await?;

let package_dir = dir.join("package");
let other_dir = dir.join("zzz");
fs::create_dir(&other_dir).await?;
fs::create_dir(&package_dir).await?;

assert_eq!(find_real_src(&dir).await.unwrap(), package_dir);
Ok(())
}

#[tokio::test]
async fn test_clone_without_find_real() -> Result<()> {
let temp = TempDir::new()?;
Expand Down
Loading