Fix archive extraction (#9726)

* Handle invalid/psw archives (1665013614u)

* Fix crash on extracting archives

* Show archive info in preview pane

* Call extract with entry index

* Update SevenZipSharp

* Update SevenZipSharp

Author: gave92

src/Files.Package/nupkgs/SevenZipSharp.1.0.0.nupkg

@@ -128,7 +128,7 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac
                     if (entry.FileName is not null)
                     {
                         var ms = new MemoryStream();
-                        await zipFile.ExtractFileAsync(entry.FileName, ms);
+                        await zipFile.ExtractFileAsync(entry.Index, ms);
                         ms.Position = 0;
                         return new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)
                         {
@@ -178,7 +178,7 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn
                 }
 
                 var ms = new MemoryStream();
-                await zipFile.ExtractFileAsync(entry.FileName, ms);
+                await zipFile.ExtractFileAsync(entry.Index, ms);
                 ms.Position = 0;
                 var nsStream = new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)
                 {
@@ -221,7 +221,7 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()
                 }
 
                 var ms = new MemoryStream();
-                await zipFile.ExtractFileAsync(entry.FileName, ms);
+                await zipFile.ExtractFileAsync(entry.Index, ms);
                 ms.Position = 0;
                 return new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)
                 {
@@ -261,7 +261,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
                 if (destFolder is ICreateFileWithStream cwsf)
                 {
                     var ms = new MemoryStream();
-                    await zipFile.ExtractFileAsync(entry.FileName, ms);
+                    await zipFile.ExtractFileAsync(entry.Index, ms);
                     ms.Position = 0;
                     using var inStream = new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size);
                     return await cwsf.CreateFileAsync(inStream.AsStreamForRead(), desiredNewName, option.Convert());
@@ -270,7 +270,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
                 {
                     var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
                     using var outStream = await destFile.OpenStreamForWriteAsync();
-                    await zipFile.ExtractFileAsync(entry.FileName, outStream);
+                    await zipFile.ExtractFileAsync(entry.Index, outStream);
                     return destFile;
                 }
             });
@@ -294,7 +294,7 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)
                 using var hDestFile = fileToReplace.CreateSafeFileHandle(FileAccess.ReadWrite);
                 using (var outStream = new FileStream(hDestFile, FileAccess.Write))
                 {
-                    await zipFile.ExtractFileAsync(entry.FileName, outStream);
+                    await zipFile.ExtractFileAsync(entry.Index, outStream);
                 }
             });
         }
@@ -518,7 +518,7 @@ private StreamedFileDataRequestedHandler ZipDataStreamingHandler(string name)
                     {
                         using (var outStream = request.AsStreamForWrite())
                         {
-                            await zipFile.ExtractFileAsync(entry.FileName, outStream);
+                            await zipFile.ExtractFileAsync(entry.Index, outStream);
                         }
                         request.Dispose();
                     }

src/Files.Uwp/Filesystem/StorageItems/ZipStorageFile.cs

@@ -13,9 +13,13 @@ public static class ZipHelpers
     {
         public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFolder destinationFolder, IProgress<float> progressDelegate, CancellationToken cancellationToken)
         {
-            using (SevenZipExtractor zipFile = await Filesystem.FilesystemTasks.Wrap(async () => new SevenZipExtractor(await archive.OpenStreamForReadAsync())))
+            using (SevenZipExtractor zipFile = await Filesystem.FilesystemTasks.Wrap(async () =>
             {
-                if (zipFile == null || zipFile.ArchiveFileData == null)
+                var arch = new SevenZipExtractor(await archive.OpenStreamForReadAsync());
+                return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)
+            }))
+            {
+                if (zipFile == null)
                 {
                     return;
                 }
@@ -107,7 +111,7 @@ public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFold
                     {
                         try
                         {
-                            await zipFile.ExtractFileAsync(entry.FileName, destinationStream);
+                            await zipFile.ExtractFileAsync(entry.Index, destinationStream);
                         }
                         catch (Exception ex)
                         {

src/Files.Uwp/Helpers/ZipHelpers.cs

@@ -5,6 +5,7 @@
 using Files.Shared.Cloud;
 using Files.Shared.EventArguments;
 using Files.Uwp.Filesystem;
+using Files.Uwp.Helpers;
 using Files.Uwp.UserControls.FilePreviews;
 using Files.Uwp.ViewModels.Previews;
 using System;
@@ -134,7 +135,7 @@ private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, b
                 return new BasicPreview(model);
             }
 
-            if (item.IsZipItem)
+            if (FileExtensionHelpers.IsBrowsableZipFile(item.FileExtension, out _))
             {
                 var model = new ArchivePreviewViewModel(item);
                 await model.LoadAsync();

src/Files.Uwp/ViewModels/PreviewPaneViewModel.cs

@@ -11,13 +11,17 @@ namespace Files.Uwp.ViewModels.Previews
 {
     public class ArchivePreviewViewModel : BasePreviewModel
     {
-        public ArchivePreviewViewModel(ListedItem item) : base(item) {}
+        public ArchivePreviewViewModel(ListedItem item) : base(item) { }
 
         public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
         {
             var details = new List<FileProperty>();
-            using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () => new SevenZipExtractor(await Item.ItemFile.OpenStreamForReadAsync()));
-            if (zipFile == null || zipFile.ArchiveFileData == null)
+            using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () =>
+            {
+                var arch = new SevenZipExtractor(await Item.ItemFile.OpenStreamForReadAsync());
+                return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)
+            });
+            if (zipFile == null)
             {
                 _ = await base.LoadPreviewAndDetailsAsync(); // Loads the thumbnail preview
                 return details;