自动更新时只清理exe，dll，config

huoyaoyuan · Nov 30, 2017 · b148efd · b148efd
1 parent 7c78bd0
commit b148efd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/AdmiralRoom/App.xaml.cs b/AdmiralRoom/App.xaml.cs
@@ -23,13 +23,6 @@ protected override void OnStartup(StartupEventArgs e)
                 if (file.Name.EndsWith(".xml.old"))
                     file.MoveTo(file.FullName.Replace(".old", ""));
                 else file.Delete();
-            foreach (var folder in rootfolder.GetDirectories())
-                if (!Updater.Updater.ProtectedFolders.Contains(folder.Name.ToLowerInvariant()))
-                    try
-                    {
-                        folder.Delete();
-                    }
-                    catch { }
 
             Win32Helper.SetIEEmulation(11001);
             Win32Helper.SetGPURendering(true);

diff --git a/AdmiralRoom/Updater/Updater.cs b/AdmiralRoom/Updater/Updater.cs
@@ -83,7 +83,6 @@ private Updater()
         }
         public Timer Timer { get; } = new Timer(3600 * 12 * 1000);
         public static Updater Instance { get; } = new Updater();
-        public static readonly string[] ProtectedFolders = { "logs", "information", "modules", "sound" };
         private Uri updateurl;
         private string downloadfilename;
 
@@ -208,13 +207,10 @@ public Task UpdateFileAsync() => Task.Factory.StartNew(() =>
         {
             Environment.CurrentDirectory = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
             var rootfolder = new DirectoryInfo(".");
-            foreach (var file in rootfolder.GetFiles())
-                if (!file.Name.EndsWith(".xml") && file.Name != downloadfilename)
-                    file.MoveTo(file.FullName + ".old");
-            foreach (var folder in rootfolder.GetDirectories())
-                if (!ProtectedFolders.Contains(folder.Name.ToLowerInvariant()))
-                    foreach (var file in folder.GetFiles())
-                        file.MoveTo(file.FullName + ".old");
+            foreach (var file in rootfolder.GetFiles("*.exe", SearchOption.AllDirectories)
+                                           .Concat(rootfolder.GetFiles("*.dll", SearchOption.AllDirectories))
+                                           .Concat(rootfolder.GetFiles("*.config", SearchOption.AllDirectories)))
+                file.MoveTo(file.FullName + ".old");
             using (var zip = ZipFile.OpenRead(downloadfilename))
                 foreach (var entry in zip.Entries)
                 {