Fix archive extraction (#9726)

gave92 · web-flow · commit 4203f7fd5af1 · 2022-08-14T23:26:06.000-04:00
* 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
diff --git a/src/Files.Package/nupkgs/SevenZipSharp.1.0.0.nupkg b/src/Files.Package/nupkgs/SevenZipSharp.1.0.0.nupkg
diff --git a/src/Files.Uwp/Filesystem/StorageItems/ZipStorageFile.cs b/src/Files.Uwp/Filesystem/StorageItems/ZipStorageFile.cs
@@ -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();
                     }
diff --git a/src/Files.Uwp/Helpers/ZipHelpers.cs b/src/Files.Uwp/Helpers/ZipHelpers.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)
                         {
diff --git a/src/Files.Uwp/ViewModels/PreviewPaneViewModel.cs b/src/Files.Uwp/ViewModels/PreviewPaneViewModel.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();
diff --git a/src/Files.Uwp/ViewModels/Previews/ArchivePreviewViewModel.cs b/src/Files.Uwp/ViewModels/Previews/ArchivePreviewViewModel.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;

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public override IAsyncOperation<IRandomAccessStream> OpenAsync(FileAccessMode ac`
`128`	`128`	`if (entry.FileName is not null)`
`129`	`129`	`{`
`130`	`130`	`var ms = new MemoryStream();`
`131`		`- await zipFile.ExtractFileAsync(entry.FileName, ms);`
	`131`	`+ await zipFile.ExtractFileAsync(entry.Index, ms);`
`132`	`132`	`ms.Position = 0;`
`133`	`133`	`return new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)`
`134`	`134`	`{`
`@@ -178,7 +178,7 @@ public override IAsyncOperation<IRandomAccessStreamWithContentType> OpenReadAsyn`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`var ms = new MemoryStream();`
`181`		`- await zipFile.ExtractFileAsync(entry.FileName, ms);`
	`181`	`+ await zipFile.ExtractFileAsync(entry.Index, ms);`
`182`	`182`	`ms.Position = 0;`
`183`	`183`	`var nsStream = new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)`
`184`	`184`	`{`
`@@ -221,7 +221,7 @@ public override IAsyncOperation<IInputStream> OpenSequentialReadAsync()`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`var ms = new MemoryStream();`
`224`		`- await zipFile.ExtractFileAsync(entry.FileName, ms);`
	`224`	`+ await zipFile.ExtractFileAsync(entry.Index, ms);`
`225`	`225`	`ms.Position = 0;`
`226`	`226`	`return new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size)`
`227`	`227`	`{`
`@@ -261,7 +261,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin`
`261`	`261`	`if (destFolder is ICreateFileWithStream cwsf)`
`262`	`262`	`{`
`263`	`263`	`var ms = new MemoryStream();`
`264`		`- await zipFile.ExtractFileAsync(entry.FileName, ms);`
	`264`	`+ await zipFile.ExtractFileAsync(entry.Index, ms);`
`265`	`265`	`ms.Position = 0;`
`266`	`266`	`using var inStream = new NonSeekableRandomAccessStreamForRead(ms, (ulong)entry.Size);`
`267`	`267`	`return await cwsf.CreateFileAsync(inStream.AsStreamForRead(), desiredNewName, option.Convert());`
`@@ -270,7 +270,7 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin`
`270`	`270`	`{`
`271`	`271`	`var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());`
`272`	`272`	`using var outStream = await destFile.OpenStreamForWriteAsync();`
`273`		`- await zipFile.ExtractFileAsync(entry.FileName, outStream);`
	`273`	`+ await zipFile.ExtractFileAsync(entry.Index, outStream);`
`274`	`274`	`return destFile;`
`275`	`275`	`}`
`276`	`276`	`});`
`@@ -294,7 +294,7 @@ public override IAsyncAction CopyAndReplaceAsync(IStorageFile fileToReplace)`
`294`	`294`	`using var hDestFile = fileToReplace.CreateSafeFileHandle(FileAccess.ReadWrite);`
`295`	`295`	`using (var outStream = new FileStream(hDestFile, FileAccess.Write))`
`296`	`296`	`{`
`297`		`- await zipFile.ExtractFileAsync(entry.FileName, outStream);`
	`297`	`+ await zipFile.ExtractFileAsync(entry.Index, outStream);`
`298`	`298`	`}`
`299`	`299`	`});`
`300`	`300`	`}`
`@@ -518,7 +518,7 @@ private StreamedFileDataRequestedHandler ZipDataStreamingHandler(string name)`
`518`	`518`	`{`
`519`	`519`	`using (var outStream = request.AsStreamForWrite())`
`520`	`520`	`{`
`521`		`- await zipFile.ExtractFileAsync(entry.FileName, outStream);`
	`521`	`+ await zipFile.ExtractFileAsync(entry.Index, outStream);`
`522`	`522`	`}`
`523`	`523`	`request.Dispose();`
`524`	`524`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,13 @@ public static class ZipHelpers`
`13`	`13`	`{`
`14`	`14`	`public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFolder destinationFolder, IProgress<float> progressDelegate, CancellationToken cancellationToken)`
`15`	`15`	`{`
`16`		`- using (SevenZipExtractor zipFile = await Filesystem.FilesystemTasks.Wrap(async () => new SevenZipExtractor(await archive.OpenStreamForReadAsync())))`
	`16`	`+ using (SevenZipExtractor zipFile = await Filesystem.FilesystemTasks.Wrap(async () =>`
`17`	`17`	`{`
`18`		`- if (zipFile == null \|\| zipFile.ArchiveFileData == null)`
	`18`	`+ var arch = new SevenZipExtractor(await archive.OpenStreamForReadAsync());`
	`19`	`+ return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)`
	`20`	`+ }))`
	`21`	`+ {`
	`22`	`+ if (zipFile == null)`
`19`	`23`	`{`
`20`	`24`	`return;`
`21`	`25`	`}`
`@@ -107,7 +111,7 @@ public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFold`
`107`	`111`	`{`
`108`	`112`	`try`
`109`	`113`	`{`
`110`		`- await zipFile.ExtractFileAsync(entry.FileName, destinationStream);`
	`114`	`+ await zipFile.ExtractFileAsync(entry.Index, destinationStream);`
`111`	`115`	`}`
`112`	`116`	`catch (Exception ex)`
`113`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,17 @@ namespace Files.Uwp.ViewModels.Previews`
`11`	`11`	`{`
`12`	`12`	`public class ArchivePreviewViewModel : BasePreviewModel`
`13`	`13`	`{`
`14`		`- public ArchivePreviewViewModel(ListedItem item) : base(item) {}`
	`14`	`+ public ArchivePreviewViewModel(ListedItem item) : base(item) { }`
`15`	`15`
`16`	`16`	`public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()`
`17`	`17`	`{`
`18`	`18`	`var details = new List<FileProperty>();`
`19`		`- using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () => new SevenZipExtractor(await Item.ItemFile.OpenStreamForReadAsync()));`
`20`		`- if (zipFile == null \|\| zipFile.ArchiveFileData == null)`
	`19`	`+ using SevenZipExtractor zipFile = await FilesystemTasks.Wrap(async () =>`
	`20`	`+ {`
	`21`	`+ var arch = new SevenZipExtractor(await Item.ItemFile.OpenStreamForReadAsync());`
	`22`	`+ return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)`
	`23`	`+ });`
	`24`	`+ if (zipFile == null)`
`21`	`25`	`{`
`22`	`26`	`_ = await base.LoadPreviewAndDetailsAsync(); // Loads the thumbnail preview`
`23`	`27`	`return details;`