Updater 内置 7za 以支持 7z 更新包

NetchUpdater/NetchUpdater.csproj

@@ -40,4 +40,20 @@
         <Reference Include="System.IO.Compression.FileSystem" />
         <Reference Include="System.Xml" />
     </ItemGroup>
+    
+    <ItemGroup>
+      <EmbeddedResource Update="Properties\Resources.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
+    </ItemGroup>
+    
+    <ItemGroup>
+      <Compile Update="Properties\Resources.Designer.cs">
+        <DesignTime>True</DesignTime>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>Resources.resx</DependentUpon>
+      </Compile>
+    </ItemGroup>
+    
 </Project>

NetchUpdater/Program.cs

@@ -1,23 +1,39 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
+using NetchUpdater.Properties;
 
 namespace NetchUpdater
 {
     internal class Program
     {
+        static string UpdaterFullName;
+        static string UpdaterDirectory;
+        static string UpdaterFriendlyName;
+        static Process CurrentProcess;
+
+        static Program()
+        {
+            CurrentProcess = Process.GetCurrentProcess();
+            UpdaterFullName = CurrentProcess.MainModule.FileName;
+            UpdaterDirectory = Path.GetDirectoryName(UpdaterFullName);
+            UpdaterFriendlyName = Path.GetFileName(UpdaterFullName);
+        }
+
         public static void Main(string[] args)
         {
             var result = false;
+
             try
             {
-                var currentProcess = Process.GetCurrentProcess();
-                if (currentProcess.MainModule == null)
+                #region Check Arguments
+
+                if (CurrentProcess.MainModule == null)
                 {
                     Console.WriteLine("Current Process MainModule is null");
                     return;
@@ -36,52 +52,60 @@ namespace NetchUpdater
                     return;
                 }
 
-                // arg1 zipFile
-                string zipFile;
-                if (!File.Exists(zipFile = Path.GetFullPath(args[1])))
+                var updateExtracted = true;
+                // arg1 update File/Directory
+                var updatePath = Path.GetFullPath(args[1]);
+                if (File.Exists(updatePath))
                 {
-                    Console.WriteLine("arg1 Zip file Not found");
+                    updateExtracted = false;
+                }
+                else if (!Directory.Exists(updatePath))
+                {
+                    Console.WriteLine("arg1 update file/directory Not found");
                     return;
                 }
 
                 // arg2 target Directory
-                string targetDir;
-                if (!File.Exists(Path.Combine(targetDir = Path.GetFullPath(args[2]), "Netch.exe")))
+                string targetPath;
+                if (!File.Exists(Path.Combine(targetPath = Path.GetFullPath(args[2]), "Netch.exe")))
                 {
                     Console.Write("arg2 Netch Directory doesn't seems right");
                     return;
                 }
 
-                // check updater directory
-                var updaterFullName = currentProcess.MainModule.FileName;
-                var updaterDirectory = Path.GetDirectoryName(updaterFullName);
-                var updaterFriendlyName = Path.GetFileName(updaterFullName);
+                #region if under target Directory,then rerun in temp directory
 
-                if (File.Exists(Path.Combine(updaterDirectory, "Netch.exe")))
+                if (UpdaterDirectory.StartsWith(targetPath))
                 {
                     // Updater 在目标目录下
                     // 将程序复制到临时目录，传递参数
                     var tempPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
-                    var newUpdaterPath = Path.Combine(tempPath, updaterFriendlyName);
+                    var newUpdaterPath = Path.Combine(tempPath, UpdaterFriendlyName);
                     Directory.CreateDirectory(tempPath);
-                    File.Copy(updaterFullName, newUpdaterPath);
+                    File.Copy(UpdaterFullName, newUpdaterPath);
                     Process.Start(new ProcessStartInfo
                     {
                         FileName = newUpdaterPath,
-                        Arguments = $"{args[0]} {args[1]} {args[2]}",
+                        Arguments = $"{port} {updatePath} {targetPath}",
+                        WorkingDirectory = tempPath,
                         UseShellExecute = false
                     });
                     result = true;
                     return;
                 }
 
-                /*if (!Debugger.IsAttached)
+                #endregion
+
+                #endregion
+
+                /*while (!Debugger.IsAttached)
                 {
                     Console.WriteLine("Waiting Attach");
                     Thread.Sleep(1000);
                 }*/
 
-                // Let Netch Exit
+                #region Send Netch Exit command
+
                 Process[] _;
                 if ((_ = Process.GetProcessesByName("Netch")).Any())
                 {
@@ -111,25 +135,48 @@ namespace NetchUpdater
                     }
                 }
 
-                Thread.Sleep(500);
+                #endregion
 
-                // Extract ZIP
-                Console.WriteLine("Extract Zip");
-                ExtractToDirectory(zipFile, targetDir, true);
+                var counter = 0;
+                while (!TestFileFree(Path.Combine(targetPath, "Netch.exe")))
+                {
+                    // wait 5 sec
+                    if (counter > 25)
+                    {
+                        Console.WriteLine("Waiting Netch exit timeout");
+                        return;
+                    }
+
+                    Thread.Sleep(200);
+                    counter++;
+                }
+
+                #region Update
+
+                if (!updateExtracted)
+                    Extract(updatePath, targetPath, true);
+                else
+                    MoveDirectory(updatePath, targetPath, true);
+
+                #endregion
+
+                #region Finished Update,Start Netch
 
-                // Start Netch
                 Console.WriteLine("Start Netch");
                 Process.Start(new ProcessStartInfo
                 {
-                    FileName = Path.Combine(targetDir, "Netch.exe"),
+                    FileName = Path.Combine(targetPath, "Netch.exe"),
                     UseShellExecute = true,
                 });
+
+                #endregion
+
                 result = true;
             }
             catch (Exception e)
             {
                 if (e is InvalidDataException)
-                    Console.WriteLine("Zip file Broken");
+                    Console.WriteLine("Archive file Broken");
                 Console.WriteLine(e.ToString());
             }
             finally
@@ -142,30 +189,101 @@ namespace NetchUpdater
             }
         }
 
-        private static void ExtractToDirectory(string archiveFileName, string destinationDirectoryName, bool overwrite)
+        private static void Extract(string archiveFileName, string destDirName, bool overwrite)
         {
+            archiveFileName = Path.GetFullPath(archiveFileName);
+            destDirName = Path.GetFullPath(destDirName);
+
+            if (!File.Exists("7za.exe"))
+                File.WriteAllBytes("7za.exe", Resources._7za);
+
+            var argument = new StringBuilder();
+            argument.Append($" x {archiveFileName} -o{destDirName} ");
+            if (overwrite)
+                argument.Append(" -y ");
+
+            Process.Start(new ProcessStartInfo
+            {
+                UseShellExecute = false,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                FileName = Path.GetFullPath("7za.exe"),
+                Arguments = argument.ToString()
+            })?.WaitForExit();
+        }
+
+        private static void MoveDirectory(string sourceDirName, string destDirName, bool overwrite)
+        {
+            sourceDirName = Path.GetFullPath(sourceDirName);
+            destDirName = Path.GetFullPath(destDirName);
             if (!overwrite)
             {
-                ZipFile.ExtractToDirectory(archiveFileName, destinationDirectoryName);
+                Directory.Move(sourceDirName, destDirName);
             }
             else
             {
-                using (var archive = ZipFile.OpenRead(archiveFileName))
+                var DirStack = new Stack<string>();
+                DirStack.Push(sourceDirName);
+
+                while (DirStack.Count > 0)
                 {
-                    foreach (var file in archive.Entries)
+                    var DirInfo = new DirectoryInfo(DirStack.Pop());
+                    try
                     {
-                        Console.WriteLine(file.FullName);
-                        var completeFileName = Path.Combine(destinationDirectoryName, file.FullName);
-                        var directory = Path.GetDirectoryName(completeFileName);
+                        foreach (var DirChildInfo in DirInfo.GetDirectories())
+                        {
+                            try
+                            {
+                                var destPath = DirChildInfo.ToString().Replace(sourceDirName, destDirName);
+                                if (!Directory.Exists(destPath))
+                                {
+                                    Directory.CreateDirectory(destPath);
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                Console.WriteLine($"Create {DirChildInfo} Folder Error: {e.Message}");
+                            }
 
-                        if (!Directory.Exists(directory) && !string.IsNullOrEmpty(directory))
-                            Directory.CreateDirectory(directory);
+                            DirStack.Push(DirChildInfo.FullName);
+                        }
 
-                        if (file.Name != "")
-                            file.ExtractToFile(completeFileName, true);
+                        foreach (var FileChildInfo in DirInfo.GetFiles())
+                        {
+                            try
+                            {
+                                var destPath = FileChildInfo.ToString().Replace(sourceDirName, destDirName);
+                                if (File.Exists(destPath))
+                                {
+                                    File.Delete(destPath);
+                                }
+
+                                FileChildInfo.MoveTo(destDirName);
+                            }
+                            catch (Exception e)
+                            {
+                                Console.WriteLine($"Move {FileChildInfo} Error: {e.Message}");
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine($"ERROR:{e.Message}");
                     }
                 }
             }
         }
+
+        private static bool TestFileFree(string FileName)
+        {
+            try
+            {
+                File.Move(FileName, FileName);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
     }
 }

NetchUpdater/Properties/Resources.Designer.cs

@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace NetchUpdater.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NetchUpdater.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] _7za {
+            get {
+                object obj = ResourceManager.GetObject("7za", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+    }
+}

NetchUpdater/Properties/Resources.resx

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="7za" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\7za.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>