good shit

santisq · Jan 9, 2025 · 9b1fdfb · 9b1fdfb
1 parent eef8b5d
commit 9b1fdfb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/PSCompression/Commands/GetZipEntryCommand.cs b/src/PSCompression/Commands/GetZipEntryCommand.cs
@@ -78,7 +78,7 @@ ZipEntryBase CreateFromStream(ZipArchiveEntry entry, bool isDirectory) =>
 
             using ZipArchive zip = new(Stream, ZipArchiveMode.Read, true);
             WriteObject(
-                EnumerateEntries(zip, CreateFromStream),
+                GetEntries(zip, CreateFromStream),
                 enumerateCollection: true);
             return;
         }
@@ -102,10 +102,13 @@ ZipEntryBase CreateFromFile(ZipArchiveEntry entry, bool isDirectory) =>
 
             try
             {
-                using ZipArchive zip = ZipFile.OpenRead(path);
-                WriteObject(
-                    EnumerateEntries(zip, CreateFromFile),
-                    enumerateCollection: true);
+                IEnumerable<ZipEntryBase> entries;
+                using (ZipArchive zip = ZipFile.OpenRead(path))
+                {
+                    entries = GetEntries(zip, CreateFromFile);
+                }
+
+                WriteObject(entries, enumerateCollection: true);
             }
             catch (Exception exception)
             {
@@ -114,7 +117,7 @@ ZipEntryBase CreateFromFile(ZipArchiveEntry entry, bool isDirectory) =>
         }
     }
 
-    private IEnumerable<ZipEntryBase> EnumerateEntries(
+    private IEnumerable<ZipEntryBase> GetEntries(
         ZipArchive zip,
         Func<ZipArchiveEntry, bool, ZipEntryBase> createMethod)
     {

diff --git a/tests/ZipEntryCmdlets.tests.ps1 b/tests/ZipEntryCmdlets.tests.ps1
@@ -10,7 +10,8 @@ Describe 'ZipEntry Cmdlets' {
     BeforeAll {
         $zip = New-Item (Join-Path $TestDrive test.zip) -ItemType File -Force
         $file = New-Item ([System.IO.Path]::Combine($TestDrive, 'someFile.txt')) -ItemType File -Value 'foo'
-        $zip, $file | Out-Null
+        $uri = 'https://www.powershellgallery.com/api/v2/package/PSCompression'
+        $zip, $file, $uri | Out-Null
     }
 
     Context 'New-ZipEntry' -Tag 'New-ZipEntry' {
@@ -113,8 +114,13 @@ Describe 'ZipEntry Cmdlets' {
 
     Context 'Get-ZipEntry' -Tag 'Get-ZipEntry' {
         It 'Can list entries in a zip archive' {
-            @($zip | Get-ZipEntry).Count -gt 0 |
-                Should -BeGreaterThan 0
+            $zip | Get-ZipEntry |
+                Should -BeOfType ([PSCompression.ZipEntryBase])
+        }
+
+        It 'Can list entries from a Stream' {
+            Invoke-WebRequest $uri | Get-ZipEntry |
+                Should -BeOfType ([PSCompression.ZipEntryBase])
         }
 
         It 'Should throw when not targetting a FileSystem Provider Path' {