Minor improvements

Author: TheTrueColonel

CpkTools/CpkTools.csproj

@@ -8,6 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
+      <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
     </ItemGroup>
 
 </Project>

CpkTools/Model/Cpk.cs

@@ -1,4 +1,5 @@
 using System.Buffers.Binary;
+using System.Numerics;
 using System.Text;
 using CpkTools.Comparers;
 using CpkTools.Endian;
@@ -603,7 +604,7 @@ private static ColumnData<T> GetColumnData<T>(Utf utf, int rowIndex, string colu
         return new ColumnData<T>(default!, -1, null);
     }
 
-    private static DataInfo<T> GetFileSizeInfo<T>(ColumnData<byte[]> inputData) {
+    private static DataInfo<T> GetFileSizeInfo<T>(ColumnData<byte[]> inputData) where T : INumber<T> {
         var result = new DataInfo<T>();
 
         if (inputData.Value == null)
@@ -623,7 +624,7 @@ private static DataInfo<T> GetFileSizeInfo<T>(ColumnData<byte[]> inputData) {
 
             var extractSize = GetColumnData<T>(utfData, i, "ExtractSize");
 
-            if (extractSize.Value != null) {
+            if (extractSize.Value != default) {
                 extractSize.Position += inputData.Position;
 
                 result.CSizeTable.Add(id, extractSize);

CpkTools/Tools.cs

@@ -4,6 +4,10 @@
 namespace CpkTools;
 
 public static class Tools {
+    static Tools() {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+    }
+    
     public static string ReadCString(EndianReader reader, int maxLength = -1, long lOffset = -1, Encoding? enc = null) {
         enc ??= Encoding.GetEncoding(932);
 

ParLibrary/Converter/ParArchiveReader.cs

@@ -21,13 +21,15 @@ public class ParArchiveReader : IConverter<BinaryFormat, NodeContainerFormat> {
     /// <summary>
     /// Initializes a new instance of the <see cref="ParArchiveReader"/> class.
     /// </summary>
-    public ParArchiveReader() { }
+    public ParArchiveReader() {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+    }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ParArchiveReader"/> class.
     /// </summary>
     /// <param name="parameters">The parameters.</param>
-    public ParArchiveReader(ParArchiveReaderParameters parameters) {
+    public ParArchiveReader(ParArchiveReaderParameters parameters) : this() {
         _parameters = parameters;
     }
 

ParLibrary/Converter/ParArchiveWriter.cs

@@ -44,17 +44,19 @@ public class ParArchiveWriter : IConverter<NodeContainerFormat, ParFile> {
     /// Occurs after the file is compressed.
     /// </summary>
     public static event NodeEventHandler FileCompressed;
-    
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ParArchiveWriter"/> class.
     /// </summary>
-    public ParArchiveWriter() { }
+    public ParArchiveWriter() {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+    }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ParArchiveWriter"/> class.
     /// </summary>
     /// <param name="parameters">The parameters.</param>
-    public ParArchiveWriter(ParArchiveWriterParameters parameters) {
+    public ParArchiveWriter(ParArchiveWriterParameters parameters) : this() {
         _parameters = parameters;
     }
 

ParLibrary/ParLibrary.csproj

@@ -9,6 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.1" />
       <PackageReference Include="Yarhl" Version="4.0.0" />
     </ItemGroup>
 

Scripts/build.sh

@@ -44,7 +44,7 @@ declare -A TARGET_ARGS_PREVIEW=(
   ["windows-slim"]="win-x64;--no-self-contained -p:BuildSuffix=windows-slim-preview"
 )
 
-if [ "$IS_PREVIEW" = true ]; then
+if [[ "$IS_PREVIEW" = true ]]; then
   declare -n TARGET_ARGS=TARGET_ARGS_PREVIEW;
 else
   declare -n TARGET_ARGS=TARGET_ARGS_PROD;
@@ -67,7 +67,7 @@ ASSET_URL=$(curl -s "${API_URL}" | jq -r \
   ')
 
 if [[ -z "${ASSET_URL}" ]]; then
-  echo "ERROR: No assets matching pattern '${PATTERN}' found."
+  echo "ERROR: No assets matching pattern '${PATTERN}' found." >&2
   exit 1
 fi
 

Scripts/package.sh

@@ -81,7 +81,7 @@ for TARGET in "${SRMM_BUILD_DIRS[@]}"; do
   fi
 
   # Create only for .zip, as that's universally available
-  if [ "$IS_PREVIEW" = false ]; then
+  if [[ "$IS_PREVIEW" = false ]]; then
     netsparkle-generate-appcast \
         -a "${APPCAST_OUTPUT_DIR}" \
         --single-file "${SRMM_OUTPUT_DIR}/${OUTPUT_FILE_BASE}.zip" \
@@ -96,7 +96,7 @@ for TARGET in "${SRMM_BUILD_DIRS[@]}"; do
 
 done
 
-if [ "$IS_PREVIEW" = false ]; then
+if [[ "$IS_PREVIEW" = false ]]; then
   for TARGET in "${UPDATER_BUILD_DIRS[@]}"; do
     DIR="${UPDATER_SELECTOR}/${TARGET}"
     OUTPUT_TARGET_STR=$(echo "${TARGET}" | sed -e "s/\b\(.\)/\u\1/g") # Capitalizes each target word: linux-slim -> Linux-Slim

ShinRyuModManager-CE/Program.cs

@@ -2,6 +2,7 @@
 using System.IO.Compression;
 using Avalonia;
 using Avalonia.Svg.Skia;
+using CpkTools.Model;
 using IniParser;
 using IniParser.Model;
 using Serilog;
@@ -83,7 +84,7 @@ private static void Main(string[] args) {
         } else {
             Log.Information("Shin Ryu Mod Manager CLI Mode Start");
 
-            MainCLI(args).GetAwaiter().GetResult();
+            MainCli(args).GetAwaiter().GetResult();
         }
     }
 
@@ -97,7 +98,7 @@ private static AppBuilder BuildAvaloniaApp() {
                          .LogToTrace();
     }
 
-    private static async Task MainCLI(string[] args) {
+    private static async Task MainCli(string[] args) {
         Log.Information("Shin Ryu Mod Manager-CE v{Version}", AssemblyVersion.GetVersion());
         Log.Information("By TheTrueColonel (a port of SRMM Studio's work)");