Skip to content
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

[PULL REQUEST] Rewrite the main program and some fixes #9

Merged
merged 9 commits into from
Oct 21, 2023
Merged

[PULL REQUEST] Rewrite the main program and some fixes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21e881b
Tried to refactor (unstable)
kiraio-moe Oct 8, 2023
ed6c16b
Refactor: Fixes for handling globalgamemanagers
kiraio-moe Oct 18, 2023
7e84209
Refactor: Add safe checks and warn if watermark have been removed
kiraio-moe Oct 18, 2023
98dc820
Refactor: Fixes for handling *.unity3d
kiraio-moe Oct 18, 2023
e29b0ce
Refactor: Fixes for handling UnityWebData
kiraio-moe Oct 20, 2023
19cc120
Refactor: Fixes for handing UnityWebData Brotli & GZip
kiraio-moe Oct 21, 2023
d9eac55
Add build script and target architectures
kiraio-moe Oct 21, 2023
e843daf
Fix: Can't detect UnityWebData Brotli again after modifying it
kiraio-moe Oct 21, 2023
8a1c75c
Update README
kiraio-moe Oct 21, 2023
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
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"args": [],
"cwd": "${workspaceFolder}",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "integratedTerminal",
"console": "externalTerminal",
"stopAtEntry": false,
"requireExactSource": false
},
Expand Down
33 changes: 26 additions & 7 deletions BrotliUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace USSR.Utilities
{
public class BrotliUtils
internal class BrotliUtils
{
static CompressionLevel GetCompressionLevel()
{
Expand All @@ -13,7 +13,7 @@ static CompressionLevel GetCompressionLevel()
return CompressionLevel.Optimal;
}

public static byte[] CompressBytes(byte[] bytes)
internal static byte[] CompressBytes(byte[] bytes)
{
using MemoryStream? outputStream = new();
using (BrotliStream? compressionStream = new(outputStream, GetCompressionLevel()))
Expand All @@ -22,7 +22,7 @@ public static byte[] CompressBytes(byte[] bytes)
return outputStream.ToArray();
}

public static string CompressFile(string originalFileName, string compressedFileName)
internal static string CompressFile(string originalFileName, string compressedFileName)
{
using FileStream originalStream = File.Open(originalFileName, FileMode.Open);
using FileStream compressedStream = File.Create(compressedFileName);
Expand All @@ -31,13 +31,13 @@ public static string CompressFile(string originalFileName, string compressedFile
return compressedFileName;
}

public static void CompressStream(Stream originalStream, Stream compressedStream)
internal static void CompressStream(Stream originalStream, Stream compressedStream)
{
using BrotliStream? compressor = new(compressedStream, GetCompressionLevel());
originalStream.CopyTo(compressor);
}

public static byte[] DecompressBytes(byte[] bytes)
internal static byte[] DecompressBytes(byte[] bytes)
{
using MemoryStream? inputStream = new(bytes);
using MemoryStream outputStream = new();
Expand All @@ -47,7 +47,7 @@ public static byte[] DecompressBytes(byte[] bytes)
return outputStream.ToArray();
}

public static string DecompressFile(string compressedFileName, string outputFileName)
internal static string DecompressFile(string compressedFileName, string outputFileName)
{
using FileStream compressedFileStream = File.Open(compressedFileName, FileMode.Open);
using FileStream outputFileStream = File.Create(outputFileName);
Expand All @@ -56,11 +56,30 @@ public static string DecompressFile(string compressedFileName, string outputFile
return outputFileName;
}

public static void DecompressStream(Stream compressedStream, Stream outputStream)
internal static void DecompressStream(Stream compressedStream, Stream outputStream)
{
using BrotliStream decompressor = new(compressedStream, CompressionMode.Decompress);
decompressor.CopyTo(outputStream);
}

internal static void WriteUnityIdentifier(string filePath, byte[] magicBytes)
{
try
{
using (
FileStream fileStream = new FileStream(
filePath,
FileMode.Open,
FileAccess.ReadWrite
)
)
{
fileStream.Seek(0, SeekOrigin.Begin);
fileStream.Write(magicBytes, 0, magicBytes.Length);
}
}
catch (Exception) { }
}
}
}

Expand Down
16 changes: 8 additions & 8 deletions GZipUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace USSR.Utilities
{
public class GZipUtils
internal class GZipUtils
{
private static CompressionLevel GetCompressionLevel()
static CompressionLevel GetCompressionLevel()
{
// NOTE: CompressionLevel.SmallestSize == 3 is not supported in .NET Core 3.1 but is in .NET 6
if (Enum.IsDefined(typeof(CompressionLevel), 3))
Expand All @@ -13,7 +13,7 @@ private static CompressionLevel GetCompressionLevel()
return CompressionLevel.Optimal;
}

public static byte[] CompressBytes(byte[] bytes)
internal static byte[] CompressBytes(byte[] bytes)
{
using MemoryStream? outputStream = new();
using (GZipStream? compressionStream = new(outputStream, GetCompressionLevel()))
Expand All @@ -22,7 +22,7 @@ public static byte[] CompressBytes(byte[] bytes)
return outputStream.ToArray();
}

public static string CompressFile(string originalFileName, string compressedFileName)
internal static string CompressFile(string originalFileName, string compressedFileName)
{
using FileStream originalStream = File.Open(originalFileName, FileMode.Open);
using FileStream compressedStream = File.Create(compressedFileName);
Expand All @@ -31,13 +31,13 @@ public static string CompressFile(string originalFileName, string compressedFile
return compressedFileName;
}

public static void CompressStream(Stream originalStream, Stream compressedStream)
internal static void CompressStream(Stream originalStream, Stream compressedStream)
{
using GZipStream? compressor = new(compressedStream, GetCompressionLevel());
originalStream.CopyTo(compressor);
}

public static byte[] DecompressBytes(byte[] bytes)
internal static byte[] DecompressBytes(byte[] bytes)
{
using MemoryStream? inputStream = new(bytes);
using MemoryStream? outputStream = new();
Expand All @@ -47,7 +47,7 @@ public static byte[] DecompressBytes(byte[] bytes)
return outputStream.ToArray();
}

public static string DecompressFile(string compressedFileName, string outputFileName)
internal static string DecompressFile(string compressedFileName, string outputFileName)
{
using FileStream compressedFileStream = File.Open(compressedFileName, FileMode.Open);
using FileStream outputFileStream = File.Create(outputFileName);
Expand All @@ -56,7 +56,7 @@ public static string DecompressFile(string compressedFileName, string outputFile
return outputFileName;
}

public static void DecompressStream(Stream compressedStream, Stream outputStream)
internal static void DecompressStream(Stream compressedStream, Stream outputStream)
{
using GZipStream? decompressor = new(compressedStream, CompressionMode.Decompress);
decompressor.CopyTo(outputStream);
Expand Down
Loading
Loading