From a6aaf1d137eb0ae7d2944ebbdf619a1e203d8702 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Mon, 10 Jun 2019 04:10:19 -0500 Subject: [PATCH] Minor change in backup process that makes it not store zero-size files --- IPA.Injector/Backups/BackupUnit.cs | 5 +++-- IPA/Patcher/BackupUnit.cs | 29 ++++++++++++----------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/IPA.Injector/Backups/BackupUnit.cs b/IPA.Injector/Backups/BackupUnit.cs index d168ffe1..fc99ebde 100644 --- a/IPA.Injector/Backups/BackupUnit.cs +++ b/IPA.Injector/Backups/BackupUnit.cs @@ -35,7 +35,7 @@ namespace IPA.Injector.Backups if (unit._manifestFile.Exists) { var manifest = File.ReadAllText(unit._manifestFile.FullName); - foreach (var line in manifest.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var line in manifest.Split(new[] { Environment.NewLine, "\n", "\r" }, StringSplitOptions.RemoveEmptyEntries)) unit._files.Add(line); } else @@ -81,7 +81,8 @@ namespace IPA.Injector.Backups else { // Make empty file - backupPath.Create().Close(); + //backupPath.Create().Close(); + // do not do this because it can cause problems } if (_files.Contains(relativePath)) return; diff --git a/IPA/Patcher/BackupUnit.cs b/IPA/Patcher/BackupUnit.cs index 7ac7b437..614e11ea 100644 --- a/IPA/Patcher/BackupUnit.cs +++ b/IPA/Patcher/BackupUnit.cs @@ -93,7 +93,8 @@ namespace IPA.Patcher else { // Make empty file - backupPath.Create().Close(); + //backupPath.Create().Close(); + // don't do this bc its dumb } if (!File.Exists(_manifestFile.FullName)) @@ -118,25 +119,19 @@ namespace IPA.Patcher var backupFile = new FileInfo(Path.Combine(_backupPath.FullName, relativePath)); var target = new FileInfo(Path.Combine(_context.ProjectRoot, relativePath)); - if (backupFile.Exists) + if (backupFile.Exists && backupFile.Length > 0) { - if (backupFile.Length > 0) - { - Console.WriteLine(" {0} => {1}", backupFile.FullName, target.FullName); - target.Directory?.Create(); - backupFile.CopyTo(target.FullName, true); - } - else + Console.WriteLine(" {0} => {1}", backupFile.FullName, target.FullName); + target.Directory?.Create(); + backupFile.CopyTo(target.FullName, true); + } + else + { + Console.WriteLine(" x {0}", target.FullName); + if(target.Exists) { - Console.WriteLine(" x {0}", target.FullName); - if(target.Exists) - { - target.Delete(); - } + target.Delete(); } - } else - { - Console.Error.WriteLine("Backup not found!"); } } }