Skip to content

Fix null IVolume.FileName for single-volume file-based archives #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamhathcock merged 5 commits into from
May 26, 2026
+18 −1
Merged

Fix null IVolume.FileName for single-volume file-based archives #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5185cbb
Initial plan
Copilot May 25, 2026
48ff579
Fix single-volume archive Volume.FileName resolution
Copilot May 25, 2026
a5ef90e
Revert unrelated lockfile updates
Copilot May 25, 2026
34034e8
Finalize single-volume FileName fix validation
Copilot May 25, 2026
1af9397
Remove regenerated lockfile noise
Copilot May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/SharpCompress/Common/Volume.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using SharpCompress.IO;
using SharpCompress.Readers;
Expand Down Expand Up @@ -42,7 +43,9 @@ internal Volume(Stream stream, ReaderOptions readerOptions, int index = 0)

public virtual int Index { get; internal set; }

public string? FileName => (_baseStream as FileStream)?.Name;
public string? FileName =>
(_baseStream as FileStream)?.Name
?? (_baseStream as SourceStream)?.Files.FirstOrDefault()?.FullName;

/// <summary>
/// RarArchive is part of a multi-part archive.
Expand Down
14 changes: 14 additions & 0 deletions tests/SharpCompress.Test/ArchiveFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,20 @@ await Assert.ThrowsAsync<ArgumentException>(() =>
);
}

[Theory]
[InlineData("Zip.deflate.zip")]
[InlineData("Tar.noEmptyDirs.tar")]
[InlineData("Rar.rar")]
[InlineData("7Zip.nonsolid.7z")]
public void OpenArchive_SingleVolume_VolumeFileName_MatchesPath(string archiveName)
{
var archivePath = GetTestArchivePath(archiveName);
using var archive = ArchiveFactory.OpenArchive(archivePath);

var volume = Assert.Single(archive.Volumes);
Assert.Equal(archivePath, volume.FileName);
}

[Theory]
[InlineData("Zip.deflate.zip", ArchiveType.Zip)]
[InlineData("Tar.noEmptyDirs.tar", ArchiveType.Tar)]
Expand Down
Loading