Fixed extracting auto update

TekkaGB · Jun 28, 2022 · e15e39d · e15e39d
1 parent 467b910
commit e15e39d
Showing 1 changed file with 20 additions and 27 deletions.
diff --git a/Unverum/ZipExtractor.cs b/Unverum/ZipExtractor.cs
@@ -20,45 +20,38 @@ public class ZipExtractor : IPackageExtractor
         {
             try
             {
-                if (Path.GetExtension(sourceFilePath).Equals(".7z", StringComparison.InvariantCultureIgnoreCase))
+                using (var archive = SevenZipArchive.Open(sourceFilePath))
                 {
-                    using (var archive = SevenZipArchive.Open(sourceFilePath))
+                    var reader = archive.ExtractAllEntries();
+                    while (reader.MoveToNextEntry())
                     {
-                        var reader = archive.ExtractAllEntries();
-                        while (reader.MoveToNextEntry())
-                        {
-                            if (!reader.Entry.IsDirectory)
-                                reader.WriteEntryToDirectory(destDirPath, new ExtractionOptions()
-                                {
-                                    ExtractFullPath = true,
-                                    Overwrite = true
-                                });
-                        }
+                        if (!reader.Entry.IsDirectory)
+                            reader.WriteEntryToDirectory(destDirPath, new ExtractionOptions()
+                            {
+                                ExtractFullPath = true,
+                                Overwrite = true
+                            });
                     }
                 }
-                else
+            }
+            catch
+            {
+                using (Stream stream = File.OpenRead(sourceFilePath))
+                using (var reader = ReaderFactory.Open(stream))
                 {
-                    using (Stream stream = File.OpenRead(sourceFilePath))
-                    using (var reader = ReaderFactory.Open(stream))
+                    while (reader.MoveToNextEntry())
                     {
-                        while (reader.MoveToNextEntry())
+                        if (!reader.Entry.IsDirectory)
                         {
-                            if (!reader.Entry.IsDirectory)
+                            reader.WriteEntryToDirectory(destDirPath, new ExtractionOptions()
                             {
-                                reader.WriteEntryToDirectory(destDirPath, new ExtractionOptions()
-                                {
-                                    ExtractFullPath = true,
-                                    Overwrite = true
-                                });
-                            }
+                                ExtractFullPath = true,
+                                Overwrite = true
+                            });
                         }
                     }
                 }
             }
-            catch
-            {
-                Global.logger.WriteLine("Failed to extract update", LoggerType.Error);
-            }
             File.Delete(@$"{sourceFilePath}");
             // Move the folders to the right place
             string parentPath = Directory.GetParent(destDirPath).FullName;