Upgrade SharpCompress to 0.47.4 and migrate extractor APIs to new OpenReader/OpenArchive surface (#205)

Copilot · gfs · web-flow · commit 8a14f2840bf4 · 2026-05-11T12:18:44.000-07:00
* Initial plan * Upgrade SharpCompress to 0.47.4 and migrate breaking API calls Agent-Logs-Url: https://github.com/microsoft/RecursiveExtractor/sessions/4a1fc24b-3c85-4d07-ae1d-e352607abda7 Co-authored-by: gfs <98900+gfs@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: gfs <98900+gfs@users.noreply.github.com>
diff --git a/RecursiveExtractor/Extractors/AceExtractor.cs b/RecursiveExtractor/Extractors/AceExtractor.cs
@@ -29,11 +29,11 @@ public AceExtractor(Extractor context)
         ///<inheritdoc />
         public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            AceReader? aceReader = null;
+            IReader? aceReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                aceReader = AceReader.Open(fileEntry.Content, new ReaderOptions()
+                aceReader = AceReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
@@ -100,11 +100,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
         ///<inheritdoc />
         public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            AceReader? aceReader = null;
+            IReader? aceReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                aceReader = AceReader.Open(fileEntry.Content, new ReaderOptions()
+                aceReader = AceReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
diff --git a/RecursiveExtractor/Extractors/ArcExtractor.cs b/RecursiveExtractor/Extractors/ArcExtractor.cs
@@ -29,11 +29,11 @@ public ArcExtractor(Extractor context)
         ///<inheritdoc />
         public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            ArcReader? arcReader = null;
+            IReader? arcReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                arcReader = ArcReader.Open(fileEntry.Content, new ReaderOptions()
+                arcReader = ArcReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
@@ -103,11 +103,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
         ///<inheritdoc />
         public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            ArcReader? arcReader = null;
+            IReader? arcReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                arcReader = ArcReader.Open(fileEntry.Content, new ReaderOptions()
+                arcReader = ArcReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
diff --git a/RecursiveExtractor/Extractors/ArjExtractor.cs b/RecursiveExtractor/Extractors/ArjExtractor.cs
@@ -29,11 +29,11 @@ public ArjExtractor(Extractor context)
         ///<inheritdoc />
         public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            ArjReader? arjReader = null;
+            IReader? arjReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                arjReader = ArjReader.Open(fileEntry.Content, new ReaderOptions()
+                arjReader = ArjReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
@@ -100,11 +100,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
         ///<inheritdoc />
         public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            ArjReader? arjReader = null;
+            IReader? arjReader = null;
             try
             {
                 fileEntry.Content.Position = 0;
-                arjReader = ArjReader.Open(fileEntry.Content, new ReaderOptions()
+                arjReader = ArjReader.OpenReader(fileEntry.Content, new ReaderOptions()
                 {
                     LeaveStreamOpen = true
                 });
diff --git a/RecursiveExtractor/Extractors/BZip2Extractor.cs b/RecursiveExtractor/Extractors/BZip2Extractor.cs
@@ -40,7 +40,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
         var failed = false;
         try
         {
-            using var bzipStream = new BZip2Stream(fileEntry.Content, CompressionMode.Decompress, false);
+            using var bzipStream = BZip2Stream.Create(fileEntry.Content, CompressionMode.Decompress, false, leaveOpen: false);
             await bzipStream.CopyToAsync(fs);
         }
             catch (Exception e)
@@ -99,7 +99,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
 
             try
             {
-                using var bzipStream = new BZip2Stream(fileEntry.Content, CompressionMode.Decompress, false);
+                using var bzipStream = BZip2Stream.Create(fileEntry.Content, CompressionMode.Decompress, false, leaveOpen: false);
                 bzipStream.CopyTo(fs);
             }
             catch (Exception e)
@@ -139,4 +139,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
             }
         }
     }
-}
+}
diff --git a/RecursiveExtractor/Extractors/RarExtractor.cs b/RecursiveExtractor/Extractors/RarExtractor.cs
@@ -31,7 +31,7 @@ public RarExtractor(Extractor context)
 
             try
             {
-                rarArchive = RarArchive.Open(fileEntry.Content);
+                rarArchive = (RarArchive)RarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { LeaveStreamOpen = true });
                 // Test for invalid archives. This will throw invalidformatexception
                 var t = rarArchive.IsSolid;
                 if (rarArchive.Entries.Any(x => x.IsEncrypted))
@@ -66,7 +66,7 @@ public RarExtractor(Extractor context)
                         try
                         {
                             fileEntry.Content.Position = 0;
-                            rarArchive = RarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LookForHeader = true });
+                            rarArchive = (RarArchive)RarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LookForHeader = true, LeaveStreamOpen = true });
                             var byt = new byte[1];
                             var encryptedEntry = rarArchive.Entries.FirstOrDefault(x => x is { IsEncrypted: true, Size: > 0 });
                             // Justification for !: Because we use FirstOrDefault encryptedEntry may be null, but we have a catch below for it
@@ -197,4 +197,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
             }
         }
     }
-}
+}
diff --git a/RecursiveExtractor/Extractors/SevenZipExtractor.cs b/RecursiveExtractor/Extractors/SevenZipExtractor.cs
@@ -83,7 +83,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
             var needsPassword = false;
             try
             {
-                sevenZipArchive = SevenZipArchive.Open(fileEntry.Content);
+                sevenZipArchive = (SevenZipArchive)SevenZipArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { LeaveStreamOpen = true });
                 if (sevenZipArchive.Entries.Where(x => !x.IsDirectory).Any(x => x.IsEncrypted))
                 {
                     needsPassword = true;
@@ -114,7 +114,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
                         try
                         {
                             fileEntry.Content.Position = 0;
-                            sevenZipArchive = SevenZipArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password });
+                            sevenZipArchive = (SevenZipArchive)SevenZipArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LeaveStreamOpen = true });
                             // When filenames are encrypted we can't access the size of individual files
                             // But if we can accesss the total uncompressed size we have the right password
                             try
@@ -197,4 +197,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
             }
         }
     }
-}
+}
diff --git a/RecursiveExtractor/Extractors/TarExtractor.cs b/RecursiveExtractor/Extractors/TarExtractor.cs
@@ -29,7 +29,7 @@ public TarExtractor(Extractor context)
         ///<inheritdoc />
         public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            using TarArchive archive = TarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()
+            using TarArchive archive = (TarArchive)TarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()
             {
                 LeaveStreamOpen = true
             });
@@ -103,7 +103,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
         ///<inheritdoc />
         public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)
         {
-            using TarArchive archive = TarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()
+            using TarArchive archive = (TarArchive)TarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()
             {
                 LeaveStreamOpen = true
             });
@@ -224,4 +224,4 @@ internal TarEntryCollectionEnumerator(ICollection<TarArchiveEntry> entries, stri
             }
         }
     }
-}
+}
diff --git a/RecursiveExtractor/Extractors/ZipExtractor.cs b/RecursiveExtractor/Extractors/ZipExtractor.cs
@@ -37,7 +37,7 @@ public ZipExtractor(Extractor context)
                     {
                         // Create a new archive instance with the password to test it
                         fileEntry.Content.Position = 0;
-                        using var testArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions() 
+                        using var testArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions() 
                         { 
                             Password = password,
                             LeaveStreamOpen = true
@@ -73,7 +73,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
             try
             {
                 fileEntry.Content.Position = 0;
-                zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions() 
+                zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions() 
                 { 
                     LeaveStreamOpen = true 
                 });
@@ -104,7 +104,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
                         // Recreate archive with password
                         zipArchive.Dispose();
                         fileEntry.Content.Position = 0;
-                        zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions() 
+                        zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions() 
                         { 
                             Password = foundPassword,
                             LeaveStreamOpen = true 
@@ -199,7 +199,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
             try
             {
                 fileEntry.Content.Position = 0;
-                zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions() 
+                zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions() 
                 { 
                     LeaveStreamOpen = true 
                 });
@@ -230,7 +230,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
                         // Recreate archive with password
                         zipArchive.Dispose();
                         fileEntry.Content.Position = 0;
-                        zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions() 
+                        zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions() 
                         { 
                             Password = foundPassword,
                             LeaveStreamOpen = true 
@@ -329,7 +329,7 @@ private async IAsyncEnumerable<FileEntry> YieldNonIndexedEntriesAsync(
             IReader? forwardReader = null;
             try
             {
-                forwardReader = ReaderFactory.Open(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });
+                forwardReader = ReaderFactory.OpenReader(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });
             }
             catch (Exception ex)
             {
@@ -413,7 +413,7 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(
             IReader? forwardReader = null;
             try
             {
-                forwardReader = ReaderFactory.Open(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });
+                forwardReader = ReaderFactory.OpenReader(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });
             }
             catch (Exception ex)
             {
diff --git a/RecursiveExtractor/RecursiveExtractor.csproj b/RecursiveExtractor/RecursiveExtractor.csproj
@@ -48,7 +48,7 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="NLog" Version="6.0.3" />
-    <PackageReference Include="SharpCompress" Version="0.44.5" />
+    <PackageReference Include="SharpCompress" Version="0.47.4" />
     <PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.6" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public AceExtractor(Extractor context)`
`29`	`29`	`///<inheritdoc />`
`30`	`30`	`public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`31`	`31`	`{`
`32`		`- AceReader? aceReader = null;`
	`32`	`+ IReader? aceReader = null;`
`33`	`33`	`try`
`34`	`34`	`{`
`35`	`35`	`fileEntry.Content.Position = 0;`
`36`		`- aceReader = AceReader.Open(fileEntry.Content, new ReaderOptions()`
	`36`	`+ aceReader = AceReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`37`	`37`	`{`
`38`	`38`	`LeaveStreamOpen = true`
`39`	`39`	`});`
`@@ -100,11 +100,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`100`	`100`	`///<inheritdoc />`
`101`	`101`	`public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`102`	`102`	`{`
`103`		`- AceReader? aceReader = null;`
	`103`	`+ IReader? aceReader = null;`
`104`	`104`	`try`
`105`	`105`	`{`
`106`	`106`	`fileEntry.Content.Position = 0;`
`107`		`- aceReader = AceReader.Open(fileEntry.Content, new ReaderOptions()`
	`107`	`+ aceReader = AceReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`108`	`108`	`{`
`109`	`109`	`LeaveStreamOpen = true`
`110`	`110`	`});`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public ArcExtractor(Extractor context)`
`29`	`29`	`///<inheritdoc />`
`30`	`30`	`public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`31`	`31`	`{`
`32`		`- ArcReader? arcReader = null;`
	`32`	`+ IReader? arcReader = null;`
`33`	`33`	`try`
`34`	`34`	`{`
`35`	`35`	`fileEntry.Content.Position = 0;`
`36`		`- arcReader = ArcReader.Open(fileEntry.Content, new ReaderOptions()`
	`36`	`+ arcReader = ArcReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`37`	`37`	`{`
`38`	`38`	`LeaveStreamOpen = true`
`39`	`39`	`});`
`@@ -103,11 +103,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`103`	`103`	`///<inheritdoc />`
`104`	`104`	`public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`105`	`105`	`{`
`106`		`- ArcReader? arcReader = null;`
	`106`	`+ IReader? arcReader = null;`
`107`	`107`	`try`
`108`	`108`	`{`
`109`	`109`	`fileEntry.Content.Position = 0;`
`110`		`- arcReader = ArcReader.Open(fileEntry.Content, new ReaderOptions()`
	`110`	`+ arcReader = ArcReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`111`	`111`	`{`
`112`	`112`	`LeaveStreamOpen = true`
`113`	`113`	`});`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public ArjExtractor(Extractor context)`
`29`	`29`	`///<inheritdoc />`
`30`	`30`	`public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`31`	`31`	`{`
`32`		`- ArjReader? arjReader = null;`
	`32`	`+ IReader? arjReader = null;`
`33`	`33`	`try`
`34`	`34`	`{`
`35`	`35`	`fileEntry.Content.Position = 0;`
`36`		`- arjReader = ArjReader.Open(fileEntry.Content, new ReaderOptions()`
	`36`	`+ arjReader = ArjReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`37`	`37`	`{`
`38`	`38`	`LeaveStreamOpen = true`
`39`	`39`	`});`
`@@ -100,11 +100,11 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`100`	`100`	`///<inheritdoc />`
`101`	`101`	`public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`102`	`102`	`{`
`103`		`- ArjReader? arjReader = null;`
	`103`	`+ IReader? arjReader = null;`
`104`	`104`	`try`
`105`	`105`	`{`
`106`	`106`	`fileEntry.Content.Position = 0;`
`107`		`- arjReader = ArjReader.Open(fileEntry.Content, new ReaderOptions()`
	`107`	`+ arjReader = ArjReader.OpenReader(fileEntry.Content, new ReaderOptions()`
`108`	`108`	`{`
`109`	`109`	`LeaveStreamOpen = true`
`110`	`110`	`});`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`40`	`40`	`var failed = false;`
`41`	`41`	`try`
`42`	`42`	`{`
`43`		`- using var bzipStream = new BZip2Stream(fileEntry.Content, CompressionMode.Decompress, false);`
	`43`	`+ using var bzipStream = BZip2Stream.Create(fileEntry.Content, CompressionMode.Decompress, false, leaveOpen: false);`
`44`	`44`	`await bzipStream.CopyToAsync(fs);`
`45`	`45`	`}`
`46`	`46`	`catch (Exception e)`
`@@ -99,7 +99,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`99`	`99`
`100`	`100`	`try`
`101`	`101`	`{`
`102`		`- using var bzipStream = new BZip2Stream(fileEntry.Content, CompressionMode.Decompress, false);`
	`102`	`+ using var bzipStream = BZip2Stream.Create(fileEntry.Content, CompressionMode.Decompress, false, leaveOpen: false);`
`103`	`103`	`bzipStream.CopyTo(fs);`
`104`	`104`	`}`
`105`	`105`	`catch (Exception e)`
`@@ -139,4 +139,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`-}`
	`142`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public RarExtractor(Extractor context)`
`31`	`31`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- rarArchive = RarArchive.Open(fileEntry.Content);`
	`34`	`+ rarArchive = (RarArchive)RarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { LeaveStreamOpen = true });`
`35`	`35`	`// Test for invalid archives. This will throw invalidformatexception`
`36`	`36`	`var t = rarArchive.IsSolid;`
`37`	`37`	`if (rarArchive.Entries.Any(x => x.IsEncrypted))`
`@@ -66,7 +66,7 @@ public RarExtractor(Extractor context)`
`66`	`66`	`try`
`67`	`67`	`{`
`68`	`68`	`fileEntry.Content.Position = 0;`
`69`		`- rarArchive = RarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LookForHeader = true });`
	`69`	`+ rarArchive = (RarArchive)RarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LookForHeader = true, LeaveStreamOpen = true });`
`70`	`70`	`var byt = new byte[1];`
`71`	`71`	`var encryptedEntry = rarArchive.Entries.FirstOrDefault(x => x is { IsEncrypted: true, Size: > 0 });`
`72`	`72`	`// Justification for !: Because we use FirstOrDefault encryptedEntry may be null, but we have a catch below for it`
`@@ -197,4 +197,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`83`	`83`	`var needsPassword = false;`
`84`	`84`	`try`
`85`	`85`	`{`
`86`		`- sevenZipArchive = SevenZipArchive.Open(fileEntry.Content);`
	`86`	`+ sevenZipArchive = (SevenZipArchive)SevenZipArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { LeaveStreamOpen = true });`
`87`	`87`	`if (sevenZipArchive.Entries.Where(x => !x.IsDirectory).Any(x => x.IsEncrypted))`
`88`	`88`	`{`
`89`	`89`	`needsPassword = true;`
`@@ -114,7 +114,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`114`	`114`	`try`
`115`	`115`	`{`
`116`	`116`	`fileEntry.Content.Position = 0;`
`117`		`- sevenZipArchive = SevenZipArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password });`
	`117`	`+ sevenZipArchive = (SevenZipArchive)SevenZipArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions() { Password = password, LeaveStreamOpen = true });`
`118`	`118`	`// When filenames are encrypted we can't access the size of individual files`
`119`	`119`	`// But if we can accesss the total uncompressed size we have the right password`
`120`	`120`	`try`
`@@ -197,4 +197,4 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`197`	`197`	`}`
`198`	`198`	`}`
`199`	`199`	`}`
`200`		`-}`
	`200`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public TarExtractor(Extractor context)`
`29`	`29`	`///<inheritdoc />`
`30`	`30`	`public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`31`	`31`	`{`
`32`		`- using TarArchive archive = TarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()`
	`32`	`+ using TarArchive archive = (TarArchive)TarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()`
`33`	`33`	`{`
`34`	`34`	`LeaveStreamOpen = true`
`35`	`35`	`});`
`@@ -103,7 +103,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`103`	`103`	`///<inheritdoc />`
`104`	`104`	`public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions options, ResourceGovernor governor, bool topLevel = true)`
`105`	`105`	`{`
`106`		`- using TarArchive archive = TarArchive.Open(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()`
	`106`	`+ using TarArchive archive = (TarArchive)TarArchive.OpenArchive(fileEntry.Content, new SharpCompress.Readers.ReaderOptions()`
`107`	`107`	`{`
`108`	`108`	`LeaveStreamOpen = true`
`109`	`109`	`});`
`@@ -224,4 +224,4 @@ internal TarEntryCollectionEnumerator(ICollection<TarArchiveEntry> entries, stri`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`	`}`
`227`		`-}`
	`227`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public ZipExtractor(Extractor context)`
`37`	`37`	`{`
`38`	`38`	`// Create a new archive instance with the password to test it`
`39`	`39`	`fileEntry.Content.Position = 0;`
`40`		`- using var testArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions()`
	`40`	`+ using var testArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions()`
`41`	`41`	`{`
`42`	`42`	`Password = password,`
`43`	`43`	`LeaveStreamOpen = true`
`@@ -73,7 +73,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`73`	`73`	`try`
`74`	`74`	`{`
`75`	`75`	`fileEntry.Content.Position = 0;`
`76`		`- zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions()`
	`76`	`+ zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions()`
`77`	`77`	`{`
`78`	`78`	`LeaveStreamOpen = true`
`79`	`79`	`});`
`@@ -104,7 +104,7 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra`
`104`	`104`	`// Recreate archive with password`
`105`	`105`	`zipArchive.Dispose();`
`106`	`106`	`fileEntry.Content.Position = 0;`
`107`		`- zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions()`
	`107`	`+ zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions()`
`108`	`108`	`{`
`109`	`109`	`Password = foundPassword,`
`110`	`110`	`LeaveStreamOpen = true`
`@@ -199,7 +199,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`199`	`199`	`try`
`200`	`200`	`{`
`201`	`201`	`fileEntry.Content.Position = 0;`
`202`		`- zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions()`
	`202`	`+ zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions()`
`203`	`203`	`{`
`204`	`204`	`LeaveStreamOpen = true`
`205`	`205`	`});`
`@@ -230,7 +230,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti`
`230`	`230`	`// Recreate archive with password`
`231`	`231`	`zipArchive.Dispose();`
`232`	`232`	`fileEntry.Content.Position = 0;`
`233`		`- zipArchive = ZipArchive.Open(fileEntry.Content, new ReaderOptions()`
	`233`	`+ zipArchive = (ZipArchive)ZipArchive.OpenArchive(fileEntry.Content, new ReaderOptions()`
`234`	`234`	`{`
`235`	`235`	`Password = foundPassword,`
`236`	`236`	`LeaveStreamOpen = true`
`@@ -329,7 +329,7 @@ private async IAsyncEnumerable<FileEntry> YieldNonIndexedEntriesAsync(`
`329`	`329`	`IReader? forwardReader = null;`
`330`	`330`	`try`
`331`	`331`	`{`
`332`		`- forwardReader = ReaderFactory.Open(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });`
	`332`	`+ forwardReader = ReaderFactory.OpenReader(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });`
`333`	`333`	`}`
`334`	`334`	`catch (Exception ex)`
`335`	`335`	`{`
`@@ -413,7 +413,7 @@ private IEnumerable<FileEntry> YieldNonIndexedEntries(`
`413`	`413`	`IReader? forwardReader = null;`
`414`	`414`	`try`
`415`	`415`	`{`
`416`		`- forwardReader = ReaderFactory.Open(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });`
	`416`	`+ forwardReader = ReaderFactory.OpenReader(parentEntry.Content, new ReaderOptions { LeaveStreamOpen = true });`
`417`	`417`	`}`
`418`	`418`	`catch (Exception ex)`
`419`	`419`	`{`