diff --git a/Pilz.Updating.Client/General.cs b/Pilz.Updating.Client/General.cs deleted file mode 100644 index 6139efe..0000000 --- a/Pilz.Updating.Client/General.cs +++ /dev/null @@ -1,46 +0,0 @@ -namespace Pilz.Updating.Client; - -internal static class General -{ - public static void CopyFiles(DirectoryInfo sourceDir, DirectoryInfo destinationDir) - { - if (!destinationDir.Exists) - destinationDir.Create(); - - foreach (FileInfo sFile in sourceDir.EnumerateFiles("*", SearchOption.TopDirectoryOnly)) - { - var dFile = new FileInfo(Path.Combine(destinationDir.FullName, sFile.Name)); - var triesLeft = 1; - - while (triesLeft > 0) - { - triesLeft--; - - try - { - sFile.CopyTo(dFile.FullName, true); - } - catch (IOException) - { - if (triesLeft == 0 && File.Exists(dFile.FullName)) - { - var oldFile = dFile.FullName + ".old"; - File.Delete(oldFile); - File.Move(dFile.FullName, oldFile, true); - File.Delete(oldFile); - triesLeft++; - } - } - catch (Exception) - { - } - } - } - - foreach (DirectoryInfo sDir in sourceDir.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)) - { - var dDir = destinationDir.CreateSubdirectory(sDir.Name); - CopyFiles(sDir, dDir); - } - } -} diff --git a/Pilz.Updating.Client/Utils.cs b/Pilz.Updating.Client/Utils.cs index acbfdb8..32b46d5 100644 --- a/Pilz.Updating.Client/Utils.cs +++ b/Pilz.Updating.Client/Utils.cs @@ -2,4 +2,45 @@ public static class Utils { + public static void CopyFiles(DirectoryInfo sourceDir, DirectoryInfo destinationDir) + { + if (!destinationDir.Exists) + destinationDir.Create(); + + foreach (FileInfo sFile in sourceDir.EnumerateFiles("*", SearchOption.TopDirectoryOnly)) + { + var dFile = new FileInfo(Path.Combine(destinationDir.FullName, sFile.Name)); + var triesLeft = 1; + + while (triesLeft > 0) + { + triesLeft--; + + try + { + sFile.CopyTo(dFile.FullName, true); + } + catch (IOException) + { + if (triesLeft == 0 && File.Exists(dFile.FullName)) + { + var oldFile = dFile.FullName + ".old"; + File.Delete(oldFile); + File.Move(dFile.FullName, oldFile, true); + File.Delete(oldFile); + triesLeft++; + } + } + catch (Exception) + { + } + } + } + + foreach (DirectoryInfo sDir in sourceDir.EnumerateDirectories("*", SearchOption.TopDirectoryOnly)) + { + var dDir = destinationDir.CreateSubdirectory(sDir.Name); + CopyFiles(sDir, dDir); + } + } }