validation of the -p arguments has been fixed. fixes #15

DmitriySalnikov · Mar 13, 2024 · 37d4e74 · 37d4e74
1 parent 6ed271f
commit 37d4e74
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 30 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -37,7 +37,7 @@ jobs:
 
       # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1
+        uses: microsoft/setup-msbuild@v2
 
       # Add nuget to cache
       - name: Setup Cache

diff --git a/Bruteforcer/UI/PCKBruteforcer.UI.csproj b/Bruteforcer/UI/PCKBruteforcer.UI.csproj
@@ -12,12 +12,8 @@
 		<Authors>Dmitriy Salnikov</Authors>
 		<Description>A small utility to find the encryption key for PCK.</Description>
 		<Copyright>Copyright © 2024</Copyright>
-		<PackageProjectUrl>
-			https://github.com/DmitriySalnikov/GodotPCKExplorer/tree/master/Bruteforcer
-		</PackageProjectUrl>
-		<RepositoryUrl>
-			https://github.com/DmitriySalnikov/GodotPCKExplorer/tree/master/Bruteforcer
-		</RepositoryUrl>
+		<PackageProjectUrl>https://github.com/DmitriySalnikov/GodotPCKExplorer/tree/master/Bruteforcer</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/DmitriySalnikov/GodotPCKExplorer/tree/master/Bruteforcer</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<NeutralLanguage>en</NeutralLanguage>
 		<Version>1.0.0</Version>

diff --git a/Core/Global.Shared/Logger.cs b/Core/Global.Shared/Logger.cs
@@ -55,7 +55,7 @@ public Logger(string saveFile)
 
             try
             {
-                string dir_name = Path.GetDirectoryName(this.saveFile) ?? "";
+                string dir_name = Path.GetDirectoryName(this.saveFile) ?? string.Empty;
                 if (!Directory.Exists(dir_name))
                     Directory.CreateDirectory(dir_name);
 
@@ -104,12 +104,20 @@ public void Dispose()
             logWriter = null;
         }
 
+        public void Flush()
+        {
+            FastConsole.Flush();
+            flushFastConsole.Cancel();
+            timeFlushConsole = DateTime.UtcNow;
+            logWriter?.Flush();
+        }
+
         public void Write(string txt)
         {
             var isFirst = true;
             txt = string.Join(Environment.NewLine,
-                txt.Split('\n').
-                Select((t) =>
+                txt.Split(["\r\n", "\n", "\r"], StringSplitOptions.None)
+                .Select((t) =>
                 {
                     var res = $"[{DateTime.Now.ToString(CultureInfo.InvariantCulture)}]{(isFirst ? "\t" : "-\t")}{t}";
                     isFirst = false;
@@ -141,6 +149,11 @@ public void Write(string txt)
             }
         }
 
+        public void WriteError(string txt)
+        {
+            Write("❗ Error: " + txt);
+        }
+
         public void Write(Exception ex)
         {
             Write($"⚠ {ex.GetType().Name}:\n{ex.Message}\nStackTrace:\n{ex.StackTrace}");

diff --git a/Core/GodotPCKExplorer/GodotPCKExplorer.csproj b/Core/GodotPCKExplorer/GodotPCKExplorer.csproj
@@ -14,7 +14,7 @@
 			mbedTLS\**\*.pdb;
 			**\.gitignore
 		</DefaultItemExcludes>
-		<Version>1.4.0</Version>
+		<Version>1.4.1</Version>
 		<AssemblyVersion>$(Version)</AssemblyVersion>
 	</PropertyGroup>
 

diff --git a/Core/GodotPCKExplorer/PCKPacker.cs b/Core/GodotPCKExplorer/PCKPacker.cs
@@ -113,6 +113,15 @@ public static bool PackFiles(string outPck, bool embed, IEnumerable<PCKPackerFil
                 return false;
             }
 
+            if (godotVersion.PackVersion == PCKUtils.PCK_VERSION_GODOT_3)
+            {
+                if (EncryptionKey != null || EncryptIndex || EncryptFiles)
+                {
+                    PCKActions.progress?.ShowMessage("Encryption is not supported for PCK files for Godot 3 (pack version 1).", "Error", MessageType.Error);
+                    return false;
+                }
+            }
+
             if (embed)
             {
                 if (!File.Exists(outPck))

diff --git a/Core/GodotPCKExplorer/PCKReader.cs b/Core/GodotPCKExplorer/PCKReader.cs
@@ -263,7 +263,7 @@ public bool OpenFile(BinaryReader fileReader, bool show_NotPCKError = true, bool
                 PCK_Flags = 0;
                 PCK_FileBase = 0;
 
-                if (PCK_VersionPack == 2)
+                if (PCK_VersionPack == PCKUtils.PCK_VERSION_GODOT_4)
                 {
                     PCK_Flags = fileReader.ReadInt32(); // 20-23
                     PCK_FileBaseAddressOffset = fileReader.BaseStream.Position;

diff --git a/Explorer/Console/ConsoleCommands.cs b/Explorer/Console/ConsoleCommands.cs
@@ -273,18 +273,21 @@ static void PackPCKCommand(string[] args, bool embed)
             var encIndex = false;
             var encFiles = false;
 
-            switch (encType)
+            if (encKey != null)
             {
-                case "both":
-                    encIndex = true;
-                    encFiles = true;
-                    break;
-                case "index":
-                    encIndex = true;
-                    break;
-                case "files":
-                    encFiles = true;
-                    break;
+                switch (encType)
+                {
+                    case "both":
+                        encIndex = true;
+                        encFiles = true;
+                        break;
+                    case "index":
+                        encIndex = true;
+                        break;
+                    case "files":
+                        encFiles = true;
+                        break;
+                }
             }
 
             var res = PCKActions.Pack(dirPath, filePath, strVer, prefix, 16, embed, encKey, encIndex, encFiles);

diff --git a/Explorer/UI/GodotPCKExplorer.UI.csproj b/Explorer/UI/GodotPCKExplorer.UI.csproj
@@ -11,16 +11,14 @@
 		<Product>GodotPCKExplorer</Product>
 		<PackageId>GodotPCKExplorer.UI</PackageId>
 		<Authors>Dmitriy Salnikov</Authors>
-		<Description>
-			C# implementation of the Godot's PCK file format with the ability to export files from it and create new PCK packs, as well as giving several more useful features.
-		</Description>
+		<Description>C# implementation of the Godot's PCK file format with the ability to export files from it and create new PCK packs,&#10;as well as giving several more useful features.</Description>
 		<Copyright>Copyright © 2024</Copyright>
 		<PackageProjectUrl>https://github.com/DmitriySalnikov/GodotPCKExplorer</PackageProjectUrl>
 		<PackageIcon>pckAbout.png</PackageIcon>
 		<RepositoryUrl>https://github.com/DmitriySalnikov/GodotPCKExplorer</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
 		<NeutralLanguage>en</NeutralLanguage>
-		<Version>1.4.0</Version>
+		<Version>1.4.1</Version>
 
 		<NoWarn>$(NoWarn);IDE1006</NoWarn>
 

diff --git a/Explorer/UI/VersionCheckGitHub.cs b/Explorer/UI/VersionCheckGitHub.cs
@@ -1,7 +1,6 @@
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Reflection;
+using System.Text.Json;
 
 internal sealed class VersionCheckerGitHub : IDisposable
 {