Changed the name to CoroToolkit, fixed a bug where the toolkit was always assuming all files were zlib compressed and added the ability to export multiple files at once

SeleDreams · SeleDreams · commit 527c84506926 · 2020-05-03T23:27:00.000+02:00
diff --git a/CoroHeartFormats/CoroHeartFormats.csproj b/CoroHeartFormats/CoroHeartFormats.csproj
diff --git a/CoroHeartFormats/Formats/CSH/CSH.cs b/CoroHeartFormats/Formats/CSH/CSH.cs
@@ -3,7 +3,7 @@
 using System.Text;
 using System.IO;
 
-namespace DeathEndFormats.Formats.CSH
+namespace CoroHeart.Formats.CSH
 {
     public class CSH
     {
diff --git a/CoroHeartFormats/Formats/DATExtractor.cs b/CoroHeartFormats/Formats/DATExtractor.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DeathEndFormats.Formats
+namespace CoroHeart.Formats
 {
     class DATExtractor
     {
diff --git a/CoroHeartFormats/Formats/GDAT/GDAT.cs b/CoroHeartFormats/Formats/GDAT/GDAT.cs
@@ -1,7 +1,8 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
-namespace DeathEndFormats.Formats.GDAT
+namespace CoroHeart.Formats.GDAT
 {
     public class GDAT : IDisposable
     {
@@ -38,34 +39,61 @@ public static string ReverseString(string myStr)
             Array.Reverse(myArr);
             return new string(myArr);
         }
+        public static string CleanString(string dirtyString)
+        {
+            HashSet<char> removeChars = new HashSet<char>(" ?&^$#@!()+-,:;<>’\'-_*");
+            StringBuilder result = new StringBuilder(dirtyString.Length);
+            foreach (char c in dirtyString)
+                if (!removeChars.Contains(c)) // prevent dirty chars
+                    result.Append(c);
+            return result.ToString();
+        }
+
+        public static bool isZLIB(byte[] data)
+        {
+            byte[] magic = new byte[4];
+            Array.Copy(data, 0x80, magic, 0, 4);
+            return ReverseString(Encoding.UTF8.GetString(magic)) == "ZLIB";
+        }
+
         public void Export(int id, string path)
         {
             GDATFile data = Files[id];
+            Console.WriteLine("start export");
             Data.Seek(data.Offset, SeekOrigin.Begin);
             using (BinaryReader reader = new BinaryReader(Data, Encoding.UTF8, true))
             {
-                byte[] bytes = reader.ReadBytes(4);
-                string fileFormat = Encoding.UTF8.GetString(bytes);
+                int MAGIC = reader.ReadInt32();
+                string fileFormat = ReverseString(Encoding.UTF8.GetString(BitConverter.GetBytes(MAGIC)));
+                string fileName = data.Offset + "." + string.Concat(fileFormat.Split(Path.GetInvalidFileNameChars()));
+                Console.WriteLine(fileName);
                 reader.BaseStream.Seek(data.Offset, SeekOrigin.Begin);
-                using (FileStream fs = File.Create(path + "." + ReverseString(fileFormat).Replace('\0', '.')))
+                byte[] buffer = reader.ReadBytes((int)data.Length);
+                reader.BaseStream.Seek(data.Offset, SeekOrigin.Begin);
+                string finalPath = path + fileName;
+                using (FileStream fs = File.Create(finalPath))
                 {
                     using (BinaryWriter writer = new BinaryWriter(fs))
                     {
-                        reader.BaseStream.Seek(data.Offset, SeekOrigin.Begin);
-                       writer.BaseStream.Seek(0, SeekOrigin.Begin);
-                       while (reader.BaseStream.Position < data.Offset + 0x80)
+                        if (isZLIB(buffer))
+                        {
+                            Console.WriteLine(fileName + " is a zlib archive, extracting...");
+                            reader.BaseStream.Seek(data.Offset, SeekOrigin.Begin);
+                            ZLIB.Load(Data, writer.BaseStream);
+                        }
+                        else
                         {
-                            // writer.Write(reader.ReadByte());
-                            reader.ReadByte();
+                            Console.WriteLine(fileName + " is an unknown file type, it will be exported as is");
+                            reader.BaseStream.Seek(data.Offset, SeekOrigin.Begin);
+                            writer.Write(reader.ReadBytes((int)data.Length));
                         }
-                      //  Array.Reverse(bytes);
-                       // writer.Write(bytes);
-                        ZLIB.Load(Data, writer.BaseStream);
                     }
                 }
             }
         }
 
+
+
         public void Dispose()
         {
             Data.Dispose();
diff --git a/CoroHeartFormats/Formats/GDAT/GDATFile.cs b/CoroHeartFormats/Formats/GDAT/GDATFile.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DeathEndFormats.Formats.GDAT
+namespace CoroHeart.Formats.GDAT
 {
     public class GDATFile
     {
diff --git a/CoroHeartFormats/Formats/ICanExtract.cs b/CoroHeartFormats/Formats/ICanExtract.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DeathEndFormats
+namespace CoroHeart
 {
     interface ICanExtract
     {
diff --git a/CoroHeartFormats/Formats/ZLIB.cs b/CoroHeartFormats/Formats/ZLIB.cs
@@ -4,14 +4,17 @@
 using System.IO;
 using System.IO.Compression;
 
-namespace DeathEndFormats.Formats
+namespace CoroHeart.Formats
 {
     public class ZLIB
     {
         const string MAGIC = "BILZ";
 
         public static void Load(Stream data, Stream output)
         {
+            data.Seek(data.Position + 0x80, SeekOrigin.Begin);
+            output.Seek(0, SeekOrigin.Begin);
+
             BinaryReader reader = new BinaryReader(data, Encoding.UTF8, true);
             using (reader)
             {
diff --git a/CoroHeartFormats/Tools.cs b/CoroHeartFormats/Tools.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.IO.Compression;
 
-namespace DeathEndFormats
+namespace CoroHeart
 {
     public static class Tools
     {
diff --git a/CoroHeartToolkit.sln b/CoroHeartToolkit.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeathEndToolkit", "DeathEndToolkit\DeathEndToolkit.csproj", "{0DDAD26A-CCBC-48D8-A9EA-E3F15730FB28}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoroHeartToolkit", "CoroHeartToolkit\CoroHeartToolkit.csproj", "{0DDAD26A-CCBC-48D8-A9EA-E3F15730FB28}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeathEndFormats", "DeathEndFormats\DeathEndFormats.csproj", "{B95CC3AA-F7B8-4907-9775-E766BEE2215A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoroHeartFormats", "CoroHeartFormats\CoroHeartFormats.csproj", "{B95CC3AA-F7B8-4907-9775-E766BEE2215A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/CoroHeartToolkit/CoroHeartToolkit.csproj b/CoroHeartToolkit/CoroHeartToolkit.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DeathEndFormats\DeathEndFormats.csproj" />
+    <ProjectReference Include="..\DeathEndFormats\CoroHeartFormats.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/CoroHeartToolkit/Program.cs b/CoroHeartToolkit/Program.cs
@@ -0,0 +1,72 @@
+﻿using System;
+using System.IO;
+using CoroHeart.Formats.GDAT;
+using CoroHeart.Formats.CSH;
+
+namespace CoroHeart.Toolkit
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            if (args.Length < 1)
+            {
+                Console.WriteLine("Drag and drop your .csh or your .dat on DeathEndToolkit.exe then try again !");
+                Console.ReadLine();
+                return;
+            }
+            foreach (string FileName in args)
+            {
+                FileStream file = File.OpenRead(FileName);
+                using (file)
+                {
+                    if (FileName.EndsWith(".csh"))
+                    {
+                        FileStream outputFile = File.Create(FileName + ".extracted");
+                        using (outputFile)
+                        {
+                            CSH.Load(file, outputFile);
+                        }
+                    }
+                    else if (FileName.EndsWith(".dat"))
+                    {
+                        using (GDAT gdat = GDAT.Load(file))
+                        {
+
+                            DirectoryInfo info = Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory + "\\" + Path.GetFileNameWithoutExtension(FileName));
+                            int SuccessfulExports = 0;
+                            for (int i = 0; i < gdat.FileCount; i++)
+                            {
+                                try
+                                {
+                                    gdat.Export(i, info.FullName + "\\");
+                                    SuccessfulExports++;
+                                }
+                                catch (Exception ex)
+                                {
+                                    Console.WriteLine("An exception occurred while loading " + FileName + " contact SeleDreams to determine what happened.");
+                                    Console.WriteLine(ex.GetType().Name + " : " + ex.Message);
+                                }
+                            }
+                            if (SuccessfulExports == gdat.FileCount)
+                            {
+                                Console.WriteLine("All files of " + FileName + " got succesfully exported !");
+                            }
+                            else
+                            {
+                                Console.WriteLine(SuccessfulExports + " out of " + gdat.FileCount + " got successfully exported from " + FileName);
+                            }
+
+                        }
+
+                    }
+                    else
+                    {
+                        Console.WriteLine("Incorrect argument, the valid file types are .dat and .csh");
+                    }
+                }
+                Console.ReadLine();
+            }
+        }
+    }
+}
diff --git a/CoroHeartToolkit/Properties/launchSettings.json b/CoroHeartToolkit/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "DeathEndToolkit": {
+      "commandName": "Project",
+      "commandLineArgs": "\"D:\\Games\\steamapps\\common\\Megadimension Neptunia VIIR\\resource\\masterWin64\\GxArchivedFile002.dat\""
+    }
+  }
+}
diff --git a/DeathEndToolkit/Program.cs b/DeathEndToolkit/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Text;`
`4`	`4`	`using System.IO;`
`5`	`5`
`6`		`-namespace DeathEndFormats.Formats.CSH`
	`6`	`+namespace CoroHeart.Formats.CSH`
`7`	`7`	`{`
`8`	`8`	`public class CSH`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Text;`
`4`	`4`
`5`		`-namespace DeathEndFormats.Formats`
	`5`	`+namespace CoroHeart.Formats`
`6`	`6`	`{`
`7`	`7`	`class DATExtractor`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,17 @@`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.IO.Compression;`
`6`	`6`
`7`		`-namespace DeathEndFormats.Formats`
	`7`	`+namespace CoroHeart.Formats`
`8`	`8`	`{`
`9`	`9`	`public class ZLIB`
`10`	`10`	`{`
`11`	`11`	`const string MAGIC = "BILZ";`
`12`	`12`
`13`	`13`	`public static void Load(Stream data, Stream output)`
`14`	`14`	`{`
	`15`	`+ data.Seek(data.Position + 0x80, SeekOrigin.Begin);`
	`16`	`+ output.Seek(0, SeekOrigin.Begin);`
	`17`	`+`
`15`	`18`	`BinaryReader reader = new BinaryReader(data, Encoding.UTF8, true);`
`16`	`19`	`using (reader)`
`17`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.IO;`
`5`	`5`	`using System.IO.Compression;`
`6`	`6`
`7`		`-namespace DeathEndFormats`
	`7`	`+namespace CoroHeart`
`8`	`8`	`{`
`9`	`9`	`public static class Tools`
`10`	`10`	`{`