Skip to content

Commit

Permalink
DYN-6901 Pm - removed dyf files deletion (DynamoDS#15374)
Browse files Browse the repository at this point in the history 
Co-authored-by: Aaron (Qilong) <[email protected]>
  • Loading branch information
@dnenov @QilongTang
dnenov and QilongTang authored Jul 24, 2024
1 parent fdd424a commit 6b3be86
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 25 deletions.
13 changes: 6 additions & 7 deletions src/DynamoPackages/PackageDirectoryBuilder.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public IDirectoryInfo BuildDirectory(Package package, string packagesDirectory,
WritePackageHeader(package, rootDir);
RemoveUnselectedFiles(contentFiles, rootDir);
CopyFilesIntoPackageDirectory(contentFiles, markdownFiles, dyfDir, binDir, extraDir, docDir);
RemoveDyfFiles(contentFiles, dyfDir);

//RemoveDyfFiles(contentFiles, dyfDir); // Commenting this out for now to allow for unforeseen issues to manifest
RemapCustomNodeFilePaths(contentFiles, dyfDir.FullName);

return rootDir;
Expand All @@ -88,7 +87,7 @@ public IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirec

RemoveUnselectedFiles(contentFiles.SelectMany(files => files).ToList(), rootDir);
CopyFilesIntoRetainedPackageDirectory(contentFiles, markdownFiles, roots, rootDir, out dyfFiles);
RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles);
//RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); // Commenting this out for now to allow for unforeseen issues to manifest
RemapRetainCustomNodeFilePaths(contentFiles.SelectMany(files => files).ToList(), dyfFiles);

WritePackageHeader(package, rootDir);
Expand Down Expand Up @@ -117,7 +116,7 @@ public IDirectoryInfo BuildRetainDirectory(Package package, string packagesDirec

RemoveUnselectedFiles(contentFiles.SelectMany(files => files).ToList(), rootDir);
CopyFilesIntoRetainedPackageDirectory(contentFiles, markdownFiles, sourcePackageDir, rootDir, out dyfFiles);
RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles);
//RemoveRetainDyfFiles(contentFiles.SelectMany(files => files).ToList(), dyfFiles); // Commenting this out for now to allow for unforeseen issues to manifest
RemapRetainCustomNodeFilePaths(contentFiles.SelectMany(files => files).ToList(), dyfFiles);

WritePackageHeader(package, rootDir);
Expand Down Expand Up @@ -167,7 +166,7 @@ private void RemapRetainCustomNodeFilePaths(IEnumerable<string> filePaths, List<
Path.GetFileName(x).Equals(Path.GetFileName(func), StringComparison.OrdinalIgnoreCase));
}

pathRemapper.SetPath(func, remapLocation);
pathRemapper.SetPath(func, remapLocation);
}
}

Expand Down Expand Up @@ -336,7 +335,7 @@ internal void CopyFilesIntoRetainedPackageDirectory(IEnumerable<IEnumerable<stri

if (!Directory.Exists(Path.GetDirectoryName(destPath)))
{
Directory.CreateDirectory(Path.GetDirectoryName(destPath));
Directory.CreateDirectory(Path.GetDirectoryName(destPath));
}

fileSystem.CopyFile(file, destPath);
Expand Down Expand Up @@ -371,7 +370,7 @@ private static string RemoveFirstFolder(string path)
var parts = path.Split(new string[] { "\\" }, StringSplitOptions.RemoveEmptyEntries);

if (parts.Length > 1) return "\\" + String.Join("\\", parts, 1, parts.Length - 1);

return "\\" + parts[0];
}

Expand Down
30 changes: 12 additions & 18 deletions test/Libraries/PackageManagerTests/PackageDirectoryBuilderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void BuildPackageDirectory_DoesExpectedNumberOfOperations()

Assert.AreEqual(5, fs.DirectoriesCreated.Count());
Assert.AreEqual(2, fs.CopiedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count());
Assert.AreEqual(1, fs.NewFilesWritten.Count());
}

Expand All @@ -53,7 +53,7 @@ public void BuildRetainPackageDirectory_DoesExpectedNumberOfOperations()

Assert.AreEqual(1, fs.DirectoriesCreated.Count());
Assert.AreEqual(2, fs.CopiedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count());
Assert.AreEqual(1, fs.NewFilesWritten.Count());
}

Expand Down Expand Up @@ -278,7 +278,7 @@ public void BuildPackageDirectory_CopiesTheOriginalFiles()
var dyfDir = Path.Combine(pkgsDir, pkg.Name, PackageDirectoryBuilder.CustomNodeDirectoryName);

Assert.AreEqual(2, fs.CopiedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count()); // no longer deletes the original dyf files
Assert.AreEqual(0, fs.DeletedDirectories.Count());

Assert.IsTrue(fs.CopiedFiles.Any(x => ComparePaths(x.Item2, Path.Combine(dyfDir, "file1.dyf"))));
Expand All @@ -304,7 +304,7 @@ public void BuildPackageRetainDirectory_CopiesTheOriginalFiles()
var dyfDir2 = Path.Combine(pkgsDir, pkg.Name, Path.GetFileName(Path.GetDirectoryName(files[1].First())));

Assert.AreEqual(2, fs.CopiedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count()); // no longer deletes the original dyf files
Assert.AreEqual(0, fs.DeletedDirectories.Count());

Assert.IsTrue(fs.CopiedFiles.Any(x => ComparePaths(x.Item2, Path.Combine(dyfDir1, "file1.dyf"))));
Expand Down Expand Up @@ -381,13 +381,10 @@ public void BuildPackageDirectory_DeletesTheOriginalFiles()

db.BuildDirectory(pkg, pkgsDir, files, Enumerable.Empty<string>());

// The original files are moved
// The original files are moved but DYF files are not deleted

Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedDirectories.Count());

Assert.Contains(files[0], fs.DeletedFiles.ToList());
Assert.Contains(files[1], fs.DeletedFiles.ToList());
}

[Test]
Expand All @@ -406,13 +403,10 @@ public void BuildRetainPackageDirectory_DeletesTheOriginalFiles()

db.BuildRetainDirectory(pkg, pkgsDir, roots, files, Enumerable.Empty<string>());

// The original files are moved
// The original files are moved but DYF files are not deleted

Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedDirectories.Count());

Assert.Contains(files[0].First(), fs.DeletedFiles.ToList());
Assert.Contains(files[1].First(), fs.DeletedFiles.ToList());
}

[Test]
Expand All @@ -439,7 +433,7 @@ public void BuildPackageDirectory_DoesNotIncludeUnselectedFiles()

Assert.AreEqual(5, fs.DirectoriesCreated.Count());
Assert.AreEqual(4, fs.CopiedFiles.Count());
Assert.AreEqual(3, fs.DeletedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(2, fs.DeletedDirectories.Count());
Assert.AreEqual(1, fs.NewFilesWritten.Count());
}
Expand Down Expand Up @@ -471,7 +465,7 @@ public void BuildRetainPackageDirectory_DoesNotIncludeUnselectedFiles()

Assert.AreEqual(1, fs.DirectoriesCreated.Count());
Assert.AreEqual(4, fs.CopiedFiles.Count());
Assert.AreEqual(3, fs.DeletedFiles.Count());
Assert.AreEqual(2, fs.DeletedFiles.Count());
Assert.AreEqual(2, fs.DeletedDirectories.Count());
Assert.AreEqual(1, fs.NewFilesWritten.Count());
}
Expand Down Expand Up @@ -556,7 +550,7 @@ public void CopyFilesIntoPackageDirectory_DoesNotMoveFilesAlreadyWithinDirectory
[Test]
public void BuildPackageDirectory_DeletesOriginalDyfFiles()
{
// This tests asserts that the initial custom definition files will be deleted in the build process
// This tests asserts that the initial custom definition files won't be deleted in the build process
var files = new[] { @"C:\pkg\file1.dyf", @"C:\pkg\file2.DYF" };
var pkg = new Package(@"C:\pkg", "Foo", "0.1.0", "MIT");

Expand All @@ -572,7 +566,7 @@ public void BuildPackageDirectory_DeletesOriginalDyfFiles()
var dyfDir = Path.Combine(pkgsDir, pkg.Name, PackageDirectoryBuilder.CustomNodeDirectoryName);

Assert.AreEqual(files.Length, fs.CopiedFiles.Count());
Assert.AreEqual(files.Length, fs.DeletedFiles.Count());
Assert.AreEqual(0, fs.DeletedFiles.Count());
}

#endregion
Expand Down

0 comments on commit 6b3be86

Please sign in to comment.