Merge pull request #8 from DGP-Studio/feat/corrupted

DGP-Studio · May 14, 2024 · b81ef22 · b81ef22
2 parents e31f23e + 2f6275e
commit b81ef22
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.Runtime.nuspec b/src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.Runtime.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>Snap.Hutao.Deployment.Runtime</id>
-    <version>1.16.0</version>
+    <version>1.16.1</version>
     <authors>DGP Studio</authors>
     <developmentDependency>true</developmentDependency>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.exe b/src/Snap.Hutao.Deployment.Runtime/Snap.Hutao.Deployment.exe
diff --git a/src/Snap.Hutao.Deployment/Invocation.cs b/src/Snap.Hutao.Deployment/Invocation.cs
@@ -1,8 +1,6 @@
 using System;
 using System.CommandLine.Invocation;
 using System.Diagnostics;
-using System.IO;
-using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Windows.Management.Deployment;
@@ -25,19 +23,19 @@ public static async Task RunDeploymentAsync(InvocationContext context)
         ArgumentException.ThrowIfNullOrEmpty(path);
 
         Console.WriteLine($"""
-            Snap Hutao Deployment Tool [1.16.0]
+            Snap Hutao Deployment Tool [1.16.1]
             PackagePath: {path}
             FamilyName: {name}
             ------------------------------------------------------------
             """);
 
         try
         {
-            if (!File.Exists(path))
+            if (!Package.EnsurePackage(path))
             {
                 Console.WriteLine("""
-                    未找到包文件。
-                    Package file not found.
+                    未找到包文件或包文件损坏。
+                    Package file not found or corrupted.
                     """);
 
                 if (isUpdateMode)
@@ -51,7 +49,7 @@ Package file not found.
                         开始下载包文件...
                         Start downloading package...
                         """);
-                    await PackageDownload.DownloadPackageAsync(path).ConfigureAwait(false);
+                    await Package.DownloadPackageAsync(path).ConfigureAwait(false);
                 }
             }
 

diff --git a/src/Snap.Hutao.Deployment/PackageDownload.cs → src/Snap.Hutao.Deployment/Package.cs b/src/Snap.Hutao.Deployment/PackageDownload.cs → src/Snap.Hutao.Deployment/Package.cs
@@ -1,11 +1,37 @@
 using System;
+using System.IO;
+using System.IO.Compression;
 using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Snap.Hutao.Deployment;
 
-internal static class PackageDownload
+internal static class Package
 {
+    public static bool EnsurePackage(string packagePath)
+    {
+        if (!File.Exists(packagePath))
+        {
+            return false;
+        }
+
+        try
+        {
+            using (FileStream packageStream = File.OpenRead(packagePath))
+            {
+                using (new ZipArchive(packageStream, ZipArchiveMode.Read))
+                {
+                    return true;
+                }
+            }
+        }
+        catch (InvalidDataException)
+        {
+            File.Delete(packagePath);
+            return false;
+        }
+    }
+
     public static async Task DownloadPackageAsync(string packagePath)
     {
         using (HttpClient httpClient = new())