Skip to content

remove nofilename transitional code #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonCropp merged 2 commits into from
Feb 18, 2023
Merged

remove nofilename transitional code #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57f86b5
remove nofilename transitional code
SimonCropp Feb 18, 2023
a4f3729
Merge branch 'main' into remove-nofilename-transitional-code
SimonCropp Feb 18, 2023
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
48 changes: 1 addition & 47 deletions src/Verify/IoHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,52 +20,6 @@ public static void DeleteFileIfEmpty(string path)
}
}

public enum RenameConflictResolution
{
NoAction,
Overwrite,
Delete
}

public static void RenameFiles(
string directory,
string pattern,
Func<string, string> rename,
RenameConflictResolution resolution = RenameConflictResolution.NoAction)
{
if (!Directory.Exists(directory))
{
return;
}

foreach (var file in Files(directory, pattern))
{
var newFileName = rename(file);

if (resolution == RenameConflictResolution.Overwrite)
{
File.Replace(file, newFileName, null);
continue;
}

if (!File.Exists(newFileName))
{
File.Move(file, newFileName);
continue;
}

if (resolution == RenameConflictResolution.NoAction)
{
continue;
}

if (resolution == RenameConflictResolution.Delete)
{
DeleteFile(file);
}
}
}

public static void DeleteFiles(string directory, string pattern)
{
if (!Directory.Exists(directory))
Expand All @@ -87,7 +41,7 @@ public static void DeleteFiles(IEnumerable<string> files)
}
}

public static void DeleteFile(string file)
static void DeleteFile(string file)
{
try
{
Expand Down
10 changes: 0 additions & 10 deletions src/Verify/Verifier/InnerVerifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ void InitForDirectoryConvention(Namer namer, string typeAndMethod, string parame
var verifiedDirectory = $"{directoryPrefix}.verified";
var receivedDirectory = $"{directoryPrefix}.received";
IoHelpers.CreateDirectory(verifiedDirectory);
IoHelpers.RenameFiles(
verifiedDirectory,
"nofilename.*",
filePath => filePath.RemoveLast("nofilename"),
IoHelpers.RenameConflictResolution.Delete);
verifiedFiles = IoHelpers.Files(verifiedDirectory, "*");

getFileNames = target =>
Expand All @@ -110,11 +105,6 @@ void InitForDirectoryConvention(Namer namer, string typeAndMethod, string parame
else
{
IoHelpers.CreateDirectory(directoryPrefix);
IoHelpers.RenameFiles(
directoryPrefix,
"nofilename.verified.*",
filePath => filePath.RemoveLast("nofilename"),
IoHelpers.RenameConflictResolution.Delete);
verifiedFiles = IoHelpers.Files(directoryPrefix, "*.verified.*");

getFileNames = target =>
Expand Down