glm94/LibIRD
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better path handling

Browse Source
This commit is contained in:
Deterous
2024-01-31 15:03:37 +09:00
parent e6f6d1f41a
commit 1a74e8fed0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DiscUtils
+1 -1
Submodule DiscUtils updated: 24d7ddc258...f53a1dab61
IRDKit/Program.cs
+2 -2
View File
@@ -366,7 +366,7 @@ namespace IRDKit
// Write PARAM.SFO info // Write PARAM.SFO info
try try
{ {
using DiscUtils.Streams.SparseStream s = reader.OpenFile("PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read); using DiscUtils.Streams.SparseStream s = reader.OpenFile(Path.Combine("PS3_GAME", "PARAM.SFO"), FileMode.Open, FileAccess.Read);
ParamSFO paramSFO = new(s); ParamSFO paramSFO = new(s);
if (json) if (json)
{ {
@@ -382,7 +382,7 @@ namespace IRDKit
catch (FileNotFoundException) catch (FileNotFoundException)
{ {
if (!json) if (!json)
Console.WriteLine($"PS3_GAME\\PARAM.SFO not found in {isoPath}\n"); Console.WriteLine($"\\PS3_GAME\\PARAM.SFO not found in {isoPath}\n");
} }
// End JSON object // End JSON object
LibIRD/IRD.cs
+4 -4
View File
@@ -658,7 +658,7 @@ namespace LibIRD
} }
// Read PS3 Metadata from PARAM.SFO // Read PS3 Metadata from PARAM.SFO
using (DiscUtils.Streams.SparseStream s = reader.OpenFile("PS3_GAME\\PARAM.SFO", FileMode.Open, FileAccess.Read)) // Path.DirectorySeparatorChar ? using (DiscUtils.Streams.SparseStream s = reader.OpenFile(Path.Combine("PS3_GAME", "PARAM.SFO"), FileMode.Open, FileAccess.Read))
{ {
// Parse PARAM.SFO file // Parse PARAM.SFO file
ParamSFO paramSFO = new(s); ParamSFO paramSFO = new(s);
@@ -710,7 +710,7 @@ namespace LibIRD
// TODO: Speed up program by hashing regions and files at the same time (read from filesystem only once) // TODO: Speed up program by hashing regions and files at the same time (read from filesystem only once)
// Recursively count all files in ISO to allocate file arrays // Recursively count all files in ISO to allocate file arrays
DiscDirectoryInfo rootDir = reader.GetDirectoryInfo("\\"); // Path.DirectorySeparatorChar ? DiscDirectoryInfo rootDir = reader.GetDirectoryInfo("");
FileCount = 0; FileCount = 0;
CountFiles(rootDir); CountFiles(rootDir);
FileKeys = new long[FileCount]; FileKeys = new long[FileCount];
@@ -739,7 +739,7 @@ namespace LibIRD
private void GetSystemVersion(FileStream fs, CDReader reader) private void GetSystemVersion(FileStream fs, CDReader reader)
{ {
// Determine PUP file offset via cluster // Determine PUP file offset via cluster
DiscUtils.Streams.Range<long, long>[] updateClusters = reader.PathToClusters("\\PS3_UPDATE\\PS3UPDAT.PUP"); // Path.DirectorySeparatorChar ? DiscUtils.Streams.Range<long, long>[] updateClusters = reader.PathToClusters(Path.Combine("PS3_UPDATE", "PS3UPDAT.PUP"));
if (updateClusters == null && updateClusters.Length == 0 && updateClusters[0] == null) if (updateClusters == null && updateClusters.Length == 0 && updateClusters[0] == null)
throw new InvalidFileSystemException("Invalid file extents for PS3UPDAT.PUP"); throw new InvalidFileSystemException("Invalid file extents for PS3UPDAT.PUP");
@@ -782,7 +782,7 @@ namespace LibIRD
private void GetHeader(FileStream fs, CDReader reader) private void GetHeader(FileStream fs, CDReader reader)
{ {
// Determine the extent of the header via cluster (Sector 0 to first data sector) // Determine the extent of the header via cluster (Sector 0 to first data sector)
DiscUtils.Streams.Range<long, long>[] sfbClusters = reader.PathToClusters("\\PS3_DISC.SFB"); // Path.DirectorySeparatorChar ? DiscUtils.Streams.Range<long, long>[] sfbClusters = reader.PathToClusters("PS3_DISC.SFB");
if (sfbClusters == null && sfbClusters.Length == 0 && sfbClusters[0] == null) if (sfbClusters == null && sfbClusters.Length == 0 && sfbClusters[0] == null)
throw new InvalidFileSystemException("Invalid file extents for PS3_DISC.SFB"); throw new InvalidFileSystemException("Invalid file extents for PS3_DISC.SFB");
// End of header is at beginning of first byte of dedicated cluster // End of header is at beginning of first byte of dedicated cluster