Leahnaya/pkNX
1
0
Fork 0
mirror of https://github.com/kwsch/pkNX.git synced 2026-09-30 21:27:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve VFS API

Browse Source 
Rename to match actual behaviour and add throw if invalid
This commit is contained in:
duckdoom4
2023-09-10 12:54:19 +02:00
parent 92abe54526
commit d5d6057d4c
9 changed files with 94 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkNX.Containers/VFS/FileSystems/Archives/ZipArchiveFileSystem.cs
View File

@@ -50,52 +50,52 @@ protected string ToEntryPath(FileSystemPath path)
return ZipArchive.GetEntry(ToEntryPath(path));
}
public IEnumerable<FileSystemPath> GetEntityPaths(FileSystemPath path, Func<FileSystemPath, bool>? filter = null)
public IEnumerable<FileSystemPath> GetEntitiesInDirectory(FileSystemPath directory, Func<FileSystemPath, bool>? filter = null)
{
var entries = GetZipEntries().Select(ToPath).Where(path.IsParentOf);
var entries = GetZipEntries().Select(ToPath).Where(directory.IsParentOf);
if (filter != null)
entries = entries.Where(filter);
return entries.Select(entryPath => entryPath.ParentPath == path
return entries.Select(entryPath => entryPath.ParentPath == directory
? entryPath
: path.AppendDirectory(entryPath.MakeRelativeTo(path).GetDirectorySegments().First()))
: directory.AppendDirectory(entryPath.MakeRelativeTo(directory).GetDirectorySegments().First()))
.Distinct();
}
public IEnumerable<FileSystemPath> GetDirectoryPaths(FileSystemPath path, Func<FileSystemPath, bool>? filter = null)
public IEnumerable<FileSystemPath> GetDirectoriesInDirectory(FileSystemPath directory, Func<FileSystemPath, bool>? filter = null)
{
if (!path.IsDirectory)
throw new ArgumentException("This FileSystemPath is not a directory.", nameof(path));
if (!directory.IsDirectory)
throw new ArgumentException("This FileSystemPath is not a directory.", nameof(directory));
var entries = GetZipEntries()
.Select(ToPath)
.Where(p => path.IsParentOf(p) && p.IsDirectory);
.Where(p => directory.IsParentOf(p) && p.IsDirectory);
if (filter != null)
entries = entries.Where(filter);
return entries.Select(entryPath =>
entryPath.ParentPath == path ? entryPath :
path.AppendDirectory(entryPath.MakeRelativeTo(path).GetDirectorySegments().First()))
entryPath.ParentPath == directory ? entryPath :
directory.AppendDirectory(entryPath.MakeRelativeTo(directory).GetDirectorySegments().First()))
.Distinct();
}
public IEnumerable<FileSystemPath> GetFilePaths(FileSystemPath path, Func<FileSystemPath, bool>? filter = null)
public IEnumerable<FileSystemPath> GetFilesInDirectory(FileSystemPath directory, Func<FileSystemPath, bool>? filter = null)
{
if (!path.IsDirectory)
throw new ArgumentException("The specified path is not a directory.", nameof(path));
if (!directory.IsDirectory)
throw new ArgumentException("The specified path is not a directory.", nameof(directory));
var entries = GetZipEntries()
.Select(ToPath)
.Where(p => path.IsParentOf(p) && p.IsFile);
.Where(p => directory.IsParentOf(p) && p.IsFile);
if (filter != null)
entries = entries.Where(filter);
return entries.Select(entryPath => entryPath.ParentPath == path
return entries.Select(entryPath => entryPath.ParentPath == directory
? entryPath
: path.AppendDirectory(entryPath.MakeRelativeTo(path).GetDirectorySegments().First()))
: directory.AppendDirectory(entryPath.MakeRelativeTo(directory).GetDirectorySegments().First()))
.Distinct();
}