Compare commits

..

No commits in common. "66f1832c21137dbce912ded3ddc1bca5decef6e0" and "da36ea3438336925819989539089e306cf8377af" have entirely different histories.

2 changed files with 136 additions and 154 deletions

View File

@ -298,10 +298,6 @@ namespace PatcherUtils
RaiseProgressChanged(0, fileCountTotal, "Generating deltas..."); RaiseProgressChanged(0, fileCountTotal, "Generating deltas...");
try
{
Parallel.ForEach(targetFiles, Parallel.ForEach(targetFiles,
new ParallelOptions() { MaxDegreeOfParallelism = 5 }, targetFile => new ParallelOptions() { MaxDegreeOfParallelism = 5 }, targetFile =>
{ {
@ -353,11 +349,6 @@ namespace PatcherUtils
RaiseProgressChanged(filesProcessed, fileCountTotal, RaiseProgressChanged(filesProcessed, fileCountTotal,
$"{targetFile.FullName.Replace(TargetFolder, "...")}{extension}", AdditionalInfo.ToArray()); $"{targetFile.FullName.Replace(TargetFolder, "...")}{extension}", AdditionalInfo.ToArray());
}); });
}
catch (Exception ex)
{
PatchLogger.LogException(ex);
}
// remove all queued files that were found in the source files list // remove all queued files that were found in the source files list
PatchLogger.LogInfo(":: Updating Source List ::"); PatchLogger.LogInfo(":: Updating Source List ::");
@ -465,10 +456,7 @@ namespace PatcherUtils
fileCountTotal = deltaFiles.Count; fileCountTotal = deltaFiles.Count;
var patchingTokenSource = new CancellationTokenSource(); var patchingTokenSource = new CancellationTokenSource();
try // foreach (FileInfo deltaFile in deltaDir.GetFiles("*", SearchOption.AllDirectories))
{
Parallel.ForEach(deltaDir.GetFiles("*", SearchOption.AllDirectories).ToList(), Parallel.ForEach(deltaDir.GetFiles("*", SearchOption.AllDirectories).ToList(),
new ParallelOptions() { MaxDegreeOfParallelism = 5, CancellationToken = patchingTokenSource.Token}, new ParallelOptions() { MaxDegreeOfParallelism = 5, CancellationToken = patchingTokenSource.Token},
deltaFile => deltaFile =>
@ -565,15 +553,9 @@ namespace PatcherUtils
++filesProcessed; ++filesProcessed;
RaiseProgressChanged(filesProcessed, fileCountTotal, deltaFile.Name, AdditionalInfo.ToArray()); RaiseProgressChanged(filesProcessed, fileCountTotal, deltaFile.Name, AdditionalInfo.ToArray());
}); });
}
catch (Exception ex)
{
PatchLogger.LogException(ex);
}
if (errorsQueue.Count > 0) if (errorsQueue.Count > 0)
{ {
PatchLogger.LogError($"Error queue entry count: {errorsQueue.Count}");
if (!errorsQueue.TryDequeue(out PatchMessage error)) if (!errorsQueue.TryDequeue(out PatchMessage error))
{ {
return new PatchMessage("Errors occurred during patching, but we couldn't dequeue them :(\n\nThere may be more information in the log", PatcherExitCode.PatchFailed); return new PatchMessage("Errors occurred during patching, but we couldn't dequeue them :(\n\nThere may be more information in the log", PatcherExitCode.PatchFailed);