From 9e0ca58fbe85375081ff3498314f0c06f0c98191 Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Sat, 14 Aug 2021 03:35:39 +1200
Subject: [PATCH] Fix bugs

---
 .vs/AppInfoParser/v16/.suo | Bin 91136 -> 91136 bytes
 AppInfoCli/CXMLBuilder.cs  |  11 +++++------
 AppInfoCli/CXMLReader.cs   |  37 ++++++++++++++++++++++---------------
 AppInfoCli/Program.cs      |  18 +++++++++---------
 4 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/.vs/AppInfoParser/v16/.suo b/.vs/AppInfoParser/v16/.suo
index 67d8fff4b097eaef0372ee8da9f1fe859cc3685b..096991b12ee2cc1c87c850440f1e5cb120848cae 100644
GIT binary patch
delta 3842
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

delta 3828
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

diff --git a/AppInfoCli/CXMLBuilder.cs b/AppInfoCli/CXMLBuilder.cs
index 5443e53..94f6eb3 100644
--- a/AppInfoCli/CXMLBuilder.cs
+++ b/AppInfoCli/CXMLBuilder.cs
@@ -224,15 +224,14 @@ namespace CXMLDecompiler
 
             return ent.offset;
         }
-        public int AddGetFileTable(byte[] value)
+        public int AddGetFileTable(byte[] value, string filename)
         {
-            string v = Tools.GenerateHash(value);
             foreach (StringTableEntry entry in FileTableEntries)
-                if (entry.name == v)
+                if (entry.name == filename)
                     return entry.offset;
 
             StringTableEntry ent = new StringTableEntry();
-            ent.name = v;
+            ent.name = filename;
             ent.offset = Convert.ToInt32(FileTable.Position);
             FileTableEntries.Add(ent);
 
@@ -365,7 +364,7 @@ namespace CXMLDecompiler
                     break;
                 case AttributeType.TYPE_STRING:
                     int StringOffset = AddGetStringTable(attribute.Value);
-                    int StringLen = attribute.Value.Length;
+                    int StringLen = Encoding.UTF8.GetBytes(attribute.Value).Length;
                     bWorkRam.Write(StringOffset);
                     bWorkRam.Write(StringLen);
                     Console.WriteLine("String: " + attribute.Value);
@@ -413,7 +412,7 @@ namespace CXMLDecompiler
                 case AttributeType.TYPE_FILE:
                     string fPath = Path.Combine(MainDir, attribute.Value);
                     byte[] data = File.ReadAllBytes(fPath);
-                    int FilePtr = AddGetFileTable(data);
+                    int FilePtr = AddGetFileTable(data, Path.Combine(Environment.CurrentDirectory, fPath));
                     int FileSz = data.Length;
                     bWorkRam.Write(FilePtr);
                     bWorkRam.Write(FileSz);
diff --git a/AppInfoCli/CXMLReader.cs b/AppInfoCli/CXMLReader.cs
index a0c7964..66a7fa6 100644
--- a/AppInfoCli/CXMLReader.cs
+++ b/AppInfoCli/CXMLReader.cs
@@ -355,7 +355,7 @@ namespace CXML
                 if(tInfo.key == key)
                 {
                     if (tInfo.value.ToString() != value.ToString())
-                        throw new Exception("Fuck.");
+                        throw new Exception("Very Weird CXML");
                     return;
                 }    
             }
@@ -415,19 +415,23 @@ namespace CXML
                         string extension = Path.GetExtension(oldName);
                         string folderPath = Path.GetDirectoryName(oldName);
                         string newPath = Path.ChangeExtension(Path.Combine(folderPath, lpHandler.FileName), extension);
-                        File.Move(oldName, newPath);
+                        
+                        if(!File.Exists(newPath))
+                        {
+                            File.Move(oldName, newPath);
 
-                        string xmlRelOldPath = oldName.Substring(Tools.GetRootFolder(oldName).Length + 1);
-                        string xmlRelNewPath = newPath.Substring(Tools.GetRootFolder(newPath).Length + 1);
-                        Console.WriteLine("Moved " + xmlRelOldPath + " => " + xmlRelNewPath);
-                        XmlData = XmlData.Replace(xmlRelOldPath, xmlRelNewPath);
+                            string xmlRelOldPath = oldName.Substring(Tools.GetRootFolder(oldName).Length + 1);
+                            string xmlRelNewPath = newPath.Substring(Tools.GetRootFolder(newPath).Length + 1);
+                            Console.WriteLine("Moved " + xmlRelOldPath + " => " + xmlRelNewPath);
+                            XmlData = XmlData.Replace(xmlRelOldPath, xmlRelNewPath);
+                        }
 
                         if (ProcessFiles)
                             ProcessFile(newPath);
                     }
                     else
                     {
-                        Console.WriteLine("Generated Filename used for " + lpHandler.OldFileName);
+                        Console.WriteLine("NOT MOVING: " + lpHandler.OldFileName);
                         if (ProcessFiles)
                             ProcessFile(lpHandler.OldFileName);
                     }
@@ -517,7 +521,7 @@ namespace CXML
             }
         }
         
-        public void ChangeFilename(Int64 ElementPtr, String NewName, Boolean FileEntry)
+        public void RegisterFile(Int64 ElementPtr, String NewName, Boolean FileEntry, String IdealName=null)
         {
             Console.WriteLine("Adding Entry for Loopback: 0x" + ElementPtr.ToString("X8") + " (" + NewName + ")");
             for(int i = 0; i < FileList.Count; i++)
@@ -529,6 +533,7 @@ namespace CXML
                         if (FileList[i].OldFileName != null)
                             break;
                         FileList[i].OldFileName = NewName;
+                        FileList[i].FileName = IdealName;
                         return;
                     }
                     else
@@ -543,6 +548,7 @@ namespace CXML
             if (FileEntry)
             {
                 lpHandler.OldFileName = NewName;
+                lpHandler.FileName = IdealName;
             }
             else
             {
@@ -574,7 +580,7 @@ namespace CXML
                     break;
                 case AttributeType.TYPE_FLOAT:
                     float FloatValue = bTreeTable.ReadSingle();
-                    AttributeValue = FloatValue.ToString()+"f";
+                    AttributeValue = ((double)FloatValue).ToString() + "f";
                     Console.WriteLine("Float - Value: " + AttributeValue.ToString() + " sz:" + bTreeTable.ReadInt32());
                     break;
                 case AttributeType.TYPE_STRING:
@@ -636,7 +642,7 @@ namespace CXML
                     for(int i = 0; i < FloatArraySize; i++)
                     {
                         FloatValue = bFloatArrayTable.ReadSingle();
-                        StrList.Add(FloatValue.ToString()+"f");
+                        StrList.Add(((double)FloatValue).ToString() +"f");
                     }
                     string[] StrArray = StrList.ToArray();
                     AttributeValue = "[" + String.Join(", ", StrArray) + "]";
@@ -650,9 +656,10 @@ namespace CXML
                     FileTable.Seek(FilePtr, SeekOrigin.Begin);
                     FileTable.Read(FileData, 0, FileSz);
                     string FileHash = Tools.GenerateHash(FileData);
-
+                    string FileSmallHash = Tools.GenerateShortHash(FileData);
                     String Extension = Tools.GetFileExtension(FileData);
-                    String FileName = Path.Combine(FileDir, ElementName, FileHash + Extension);
+                    String FileName = Path.Combine(FileDir, "original", FilePtr.ToString("X")+"-"+FileHash + Extension);
+                    String IdealName = ElementName + "-" + AttributeName + "-" + FileSmallHash + Extension;
                     if (!File.Exists(FileName))
                     {
                         Console.WriteLine("Writing: " + FileName);
@@ -661,7 +668,7 @@ namespace CXML
                             Directory.CreateDirectory(Path.GetDirectoryName(FileName));
 
                         File.WriteAllBytes(FileName, FileData);
-                        ChangeFilename(ElementPtr, FileName, true);
+                        RegisterFile(ElementPtr, FileName, true, IdealName);
                     }
                     else
                     {
@@ -682,7 +689,7 @@ namespace CXML
                     Console.WriteLine("Loopback: " + LoopbackAttribute +" "+ LoopbackPtr.ToString("X")+" ("+ElementPtr.ToString("X")+")");
                     
                     AttributeValue = Tools.ReadString(StringIDTable);
-                    ChangeFilename(LoopbackPtr, AttributeValue.ToString(), false);
+                    RegisterFile(LoopbackPtr, AttributeValue.ToString(), false);
 
                     Console.WriteLine("Loopback ID String: " + StringIdTableOffset + " sz: " + bTreeTable.ReadInt32());
                     break;
@@ -707,7 +714,7 @@ namespace CXML
                     Console.WriteLine("Int Loopback: " + LoopbackAttribute + " " + LoopbackPtr.ToString("X") + " (" + ElementPtr.ToString("X") + ")");
                     
                     AttributeValue = IDValue.ToString("X8");
-                    ChangeFilename(LoopbackPtr, AttributeValue.ToString(), false);
+                    RegisterFile(LoopbackPtr, AttributeValue.ToString(), false);
 
                     Console.WriteLine("Loopback Int: " + IntIdTableOffset + " sz: " + bTreeTable.ReadInt32());
                     break;
diff --git a/AppInfoCli/Program.cs b/AppInfoCli/Program.cs
index e4c3753..458710e 100644
--- a/AppInfoCli/Program.cs
+++ b/AppInfoCli/Program.cs
@@ -65,6 +65,10 @@ namespace CXMLCli
             String ArgsFull = String.Join(" ", args);
             String path = args[0];
 
+            if (args.Length == 1)
+            {
+                ArgsFull += " -d -p -w";
+            }
 
             if (HasArg(ArgsFull, "-iv") || HasArg(ArgsFull, "--is-vag"))
             {
@@ -99,16 +103,12 @@ namespace CXMLCli
 
             CXML.CXMLParser cxmlParser = new CXML.CXMLParser();
             if(!HasArg(ArgsFull, "-c") && !HasArg(ArgsFull, "--compile"))
-                cxmlParser.Init(path, Check);
-
-            if (args.Length == 1)
             {
-                if (Path.GetExtension(args[0]) == ".xml")
-                    ArgsFull += Path.ChangeExtension(args[0], ".cxml") + " -c -w";
-                else
-                    ArgsFull += "-d -p -w";
+                Console.WriteLine("Initalizing: " + path);
+                cxmlParser.Init(path, Check);
             }
 
+
             if (HasArg(ArgsFull, "-f") || HasArg(ArgsFull, "--force"))
             {
                 Check = false;
@@ -116,7 +116,7 @@ namespace CXMLCli
 
             if (HasArg(ArgsFull, "-dt") || HasArg(ArgsFull, "--dump-tables"))
             {
-                ArgsFull += "-tt -ist -iit -st -ct -sit -iat -fat -ft";
+                ArgsFull += " -tt -ist -iit -st -ct -sit -iat -fat -ft";
             }
 
             if (HasArg(ArgsFull, "-tt") || HasArg(ArgsFull, "--dump-tree"))
@@ -198,7 +198,7 @@ namespace CXMLCli
             }
             else if (HasArg(ArgsFull, "-c") || HasArg(ArgsFull, "--compile"))
             {
-                Console.WriteLine("Compiling.");
+                Console.WriteLine("Compiling: " + path);
                 CXMLBuilder builder = new CXMLBuilder();
                 builder.Init(path, args[1]);
                 builder.BuildCXML(path, args[1]);