claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

CopyToStream needs some work

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-15 21:34:17 -04:00
parent a2e10f789b
commit e29610de4b
13 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SabreTools.DatTools/Rebuilder.cs
View File

@@ -744,7 +744,10 @@ namespace SabreTools.DatTools
{
BaseArchive? archive = BaseArchive.Create(file);
if (archive != null)
(stream, _) = archive.CopyToStream(datItem.GetName() ?? datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>().AsStringValue() ?? string.Empty);
{
ItemType itemType = datItem.GetStringFieldValue(Models.Metadata.DatItem.TypeKey).AsEnumValue<ItemType>();
(stream, _) = archive.CopyToStream(datItem.GetName() ?? itemType.AsStringValue() ?? string.Empty);
}
}
// Otherwise, just open the filestream
else

8
SabreTools.FileTypes/Archives/GZipArchive.cs
View File

@@ -130,9 +130,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -170,9 +170,9 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry;
// If we have an invalid file

2
SabreTools.FileTypes/Archives/LRZipArchive.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream, string) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
throw new NotImplementedException();
}

2
SabreTools.FileTypes/Archives/LZ4Archive.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream, string) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
throw new NotImplementedException();
}

8
SabreTools.FileTypes/Archives/RarArchive.cs
View File

@@ -96,9 +96,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -134,10 +134,10 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
#if NET462_OR_GREATER || NETCOREAPP
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry = null;
// If we have an invalid file

8
SabreTools.FileTypes/Archives/SevenZipArchive.cs
View File

@@ -183,9 +183,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -221,9 +221,9 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry = null;
// If we have an invalid file

8
SabreTools.FileTypes/Archives/TapeArchive.cs
View File

@@ -97,9 +97,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -135,10 +135,10 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
#if NET462_OR_GREATER || NETCOREAPP
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry = null;
try

8
SabreTools.FileTypes/Archives/XZArchive.cs
View File

@@ -114,9 +114,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -152,10 +152,10 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
#if NET462_OR_GREATER || NETCOREAPP
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry;
try

2
SabreTools.FileTypes/Archives/ZPAQArchive.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream, string) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
throw new NotImplementedException();
}

8
SabreTools.FileTypes/Archives/ZipArchive.cs
View File

@@ -158,9 +158,9 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir)
{
// Try to extract a stream using the given information
(MemoryStream? ms, string? realEntry) = CopyToStream(entryName);
(Stream? ms, string? realEntry) = CopyToStream(entryName);
// If the memory stream and the entry name are both non-null, we write to file
// If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null)
{
realEntry = Path.Combine(outDir, realEntry);
@@ -196,9 +196,9 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream?, string?) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
MemoryStream? ms = new();
var ms = new MemoryStream();
string? realEntry = null;
try

2
SabreTools.FileTypes/Archives/ZstdArchive.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.FileTypes.Archives
}
/// <inheritdoc/>
public override (MemoryStream, string) CopyToStream(string entryName)
public override (Stream?, string?) CopyToStream(string entryName)
{
throw new NotImplementedException();
}

2
SabreTools.FileTypes/BaseArchive.cs
View File

@@ -121,7 +121,7 @@ namespace SabreTools.FileTypes
public override abstract string? CopyToFile(string entryName, string outDir);
/// <inheritdoc/>
public override abstract (MemoryStream?, string?) CopyToStream(string entryName);
public override abstract (Stream?, string?) CopyToStream(string entryName);
#endregion

4
SabreTools.FileTypes/Folder.cs
View File

@@ -210,9 +210,9 @@ namespace SabreTools.FileTypes
/// </summary>
/// <param name="entryName">Name of the entry to be extracted</param>
/// <returns>MemoryStream representing the entry, null on error</returns>
public virtual (MemoryStream?, string?) CopyToStream(string entryName)
public virtual (Stream?, string?) CopyToStream(string entryName)
{
MemoryStream ms = new();
var ms = new MemoryStream();
string? realentry = null;
// If we have an invalid filename