From d2617e6110fa78da2042b8028865429b5b1c2b23 Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 27 Mar 2022 15:38:24 -0400
Subject: [PATCH 1/6] add ToolsTODDC.py with Init

---
 ToolsTODDC.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 ToolsTODDC.py

diff --git a/ToolsTODDC.py b/ToolsTODDC.py
new file mode 100644
index 0000000..aa9687d
--- /dev/null
+++ b/ToolsTODDC.py
@@ -0,0 +1,24 @@
+from ToolsTales import ToolsTales
+import subprocess
+from dicttoxml import dicttoxml
+import json
+import struct
+import shutil
+import os
+import re
+import pandas as pd
+import xml.etree.ElementTree as ET
+import lxml.etree as etree
+import comptolib
+from xml.dom import minidom
+from pathlib import Path
+import string
+import io
+
+class ToolsTODDC(ToolsTales):
+    
+    
+    def __init__(self, tbl):
+        
+        super().__init__("TODDC", tbl, "Tales-of-Destiny-DC")
+        
\ No newline at end of file

From 4efdda1d861c22ed44f7d5350dcd6c4d36a5febc Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 27 Mar 2022 17:55:52 -0400
Subject: [PATCH 2/6] Creating itable using regular tbl form toddc

---
 ToolsTODDC.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/ToolsTODDC.py b/ToolsTODDC.py
index aa9687d..58d97b3 100644
--- a/ToolsTODDC.py
+++ b/ToolsTODDC.py
@@ -20,5 +20,29 @@ class ToolsTODDC(ToolsTales):
     
     def __init__(self, tbl):
         
-        super().__init__("TODDC", tbl, "Tales-of-Destiny-DC")
+        self.gameName = "TODDC"
+        self.repo_name = "Tales-of-Destiny-DC"
+        self.basePath = os.getcwd()
+        
+        
+        with open("../Tales-of-Destiny-DC/Data/Misc/toddc.tbl", encoding="utf-8") as f:
+            data = f.readlines()
+            hex_list = [bytes.fromhex(str(ele.split("=",1)[0])) for ele in data]
+            self.itable = dict([[ele.split("=",1)[1].replace("\n",""), bytes.fromhex(ele.split("=",1)[0])] for ele in data])
+            
+     
+            
+        #with open("../{}/Data/{}/Misc/{}".format(repo_name, gameName, tblFile)) as f:
+        #    jsonRaw = json.load(f)
+        #    self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+          
+        #self.itable = dict([[i, struct.pack(">H", int(j))] for j, i in self.jsonTblTags['TBL'].items()])
+        #self.itags = dict([[i, j] for j, i in self.jsonTblTags['TAGS'].items()])
+        #self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAMES'].items()])
+        #self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
+        
+        
+        with open("../{}/Data/{}/Menu/MenuFiles.json".format(self.repo_name, self.gameName)) as f:
+           self.menu_files_json = json.load(f)
+           
         
\ No newline at end of file

From b5b30bfd4db2ea88891c6fc66ebe8684c859ca6a Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 27 Mar 2022 18:02:37 -0400
Subject: [PATCH 3/6] Adding TODDC_Test file + Comments to debug

---
 TODDC_Test.py                         |  18 ++++++++++++++++++
 ToolsTODDC.py                         |   2 +-
 ToolsTales.py                         |   4 +++-
 __pycache__/ToolsTODDC.cpython-38.pyc | Bin 0 -> 1622 bytes
 __pycache__/ToolsTales.cpython-38.pyc | Bin 23346 -> 23413 bytes
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 TODDC_Test.py
 create mode 100644 __pycache__/ToolsTODDC.cpython-38.pyc

diff --git a/TODDC_Test.py b/TODDC_Test.py
new file mode 100644
index 0000000..2f510f6
--- /dev/null
+++ b/TODDC_Test.py
@@ -0,0 +1,18 @@
+import ToolsTODDC
+import json
+import struct
+import comptolib
+import io
+import re
+import string
+import pandas as pd
+import json
+import os
+import lxml.etree as etree
+
+
+tool = ToolsTODDC.ToolsTODDC("toddc.tbl")
+
+ele = tool.menu_files_json[0]
+tool.extract_Menu_File(ele)
+
diff --git a/ToolsTODDC.py b/ToolsTODDC.py
index 58d97b3..e06df4c 100644
--- a/ToolsTODDC.py
+++ b/ToolsTODDC.py
@@ -42,7 +42,7 @@ class ToolsTODDC(ToolsTales):
         #self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
         
         
-        with open("../{}/Data/{}/Menu/MenuFiles.json".format(self.repo_name, self.gameName)) as f:
+        with open("../{}/Data/Menu/MenuFiles.json".format(self.repo_name, self.gameName)) as f:
            self.menu_files_json = json.load(f)
            
         
\ No newline at end of file
diff --git a/ToolsTales.py b/ToolsTales.py
index a364333..ecf6fe3 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -891,12 +891,14 @@ class ToolsTales:
                 text_end = section['Text_End'] 
                   
                 #Extract Pointers of the file
+                print("Extract Pointers")
                 pointers_offset, pointers_value = self.get_special_pointers( text_start, text_end, base_offset, section['Pointer_Offset_Start'], section['Nb_Per_Block'], section['Step'], section['Section'], file_path)
    
               
                 #Extract Text from the pointers
+                print("Extract Text")
                 texts = [ self.bytes_to_text(f, ele + base_offset)[0] for ele in pointers_value]
-              
+                print(texts)
                 
                 #Make a list
                 section_list.extend( [section['Section']] * len(texts)) 
diff --git a/__pycache__/ToolsTODDC.cpython-38.pyc b/__pycache__/ToolsTODDC.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..21457e040333a37170f5c2ac5fc3811162ee4ff1
GIT binary patch
literal 1622
zcmWIL<>g{vU|`sK*CFW!8w0~*5C<8vFfcGUFfcF_Z(?9zNMT4}%wfo7h+<#_v6*rh
zqZm^dQkZj?a+#u-pkmBX%qa{hOgSu3EMS^7iWN+=MX`Zt_9%8R%@M^3rnz#tnHU%u
za(SY7p(gO<az}AP+5A!bDGVtrIRd$YQG#GG)*PW+;V5A+n<+;mN(5|*Xq2csLke38
zdkaGfdn!XSbCg&LQ!s-j$4iiJG#PJkh2-bw6o(|{q!#;WGT!1$$xJRO$*;)G(PX^E
zo|~DMnUbHY$#{z;Ah9GP8KegpGr>YZgn@w}l>y}ID5ey~6s8u2DCQLAU<OSVm<9eW
zF3!my^)UUc3=9mM3=9m;pit}pg(71OLp(zYQw>8rV+qp&=7kJ34Dl=_tSQVXEGewL
zO#KG6Of^gk*cLL>GDCb+!|cM)%vj4(!k)qb@*#xZ3^Io!oWYbKkRga6f}w;pg>wOC
z4MP@V4MP^gLZ)WMexX{X60QZ@HB1XZYIzW9Qy797G`ak4v4()$TO|w*7v20cU6<72
zlFYnHT^HvnEj>MbEaLhui6x2pzL~|z`X%`(Dam>zNjX)lr6p;)7MhH=I8yVH^HVbO
z(vuls0l>h(016LK7zBgDK#hTcA)TRyAy%%Iv4mj(V+m6Y;{s5cVO+?R!X(Mi%(#$o
zB2yttFoP!ZFGky!AcKlPgeJ=^)}+dk)Z$z0X+`<D8L1Vwn2Sq_Zm|{@<YbntWV*$q
zXK;%-H79i?Ly-^z1H&&HcdHn%4?Gf+vorJ3V*)BmGV=3$GLzy1auO@ki}FkJQV@bM
zkR$>M5xs)STU<6dnZ+f^`MCvlav*nuvH}|e6GN3clDhc#%)HE!_;@{=oc!d(oMJmY
zgf84cU<C^Tqguuq#s#3v1oAwiB*Oy66s8pBg-oD?fh5Bs$*_<yoe3H&tVNs*3=Bn}
zoO_Fr>lOnvbc*;G7#MD`7o`^DBqpa8af8(GfCzpN0SXatuoMY{xS*6QkK!#kJw5&E
zT4?m9=9TLErskEpW#*(7>tz+^=V|iZ;z&=-P4!F6O})iglv<D<p9f+x<rm*#OHVCH
zE>F3|k(5}R3d%vZSn>-}^FYcHQ*tu%Qj2e~fHK@Iw#<^mq@2`SY-#yLxrrsWSU@J<
zV#&!*Ou5CMo0?Y|p9Zop9we;EdW)qvH7D&Bb4gOpEylE4EGda4iMKd1QY+#?F$3`o
z*jpeU-Qs}7g(%2dAaMpJHbyo^E@nPP4n{skIX*GQDq$>f=cma6(hTxVeEco0`1suX
zl+v8k`1o5q@$rSFi8&CNA}vt3fy_m-xrmK{fdM353`*x5%wWEzcoB$qi>tUash}u7
zIkmXBh#6#n5-5_`ic5-0lS^)~6=#%|Wabn}fdrX~Qg5*pB<7_g7T;njNVz3ik(;BJ
zT2hpns^^-Mnwy$e5>k|!dW#h-bc-8VjL9|R7FP~j{Vh&VvMtHa$xOP%4iZht&n*I_
z-&^bji6t31nMp;UV(Avh8JT(Mx0o{X!H!1q7|1{1lyZy11`-~2pgdTtz`(%3!^pu1
Q!W@h+C<Ny7fJqJ}0MQMX#sB~S

literal 0
HcmV?d00001

diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index ed9fca1415592aa71f820b310015205f1df2f2ad..9141a6d6ed0f057d9c8f34f22484a874cd54ea19 100644
GIT binary patch
delta 7293
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

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


From 050415dda965b48dc03937b2a8740969ba93fa2a Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 27 Mar 2022 20:35:17 -0400
Subject: [PATCH 4/6] Extracting 00016_0000d

---
 TODDC_Test.py                         |  50 +++++++++++++++++++++++++-
 ToolsTODDC.py                         |  27 ++------------
 ToolsTales.py                         |  20 ++++++-----
 __pycache__/ToolsTODDC.cpython-38.pyc | Bin 1622 -> 928 bytes
 __pycache__/ToolsTales.cpython-38.pyc | Bin 23413 -> 23748 bytes
 5 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/TODDC_Test.py b/TODDC_Test.py
index 2f510f6..ed3c0cd 100644
--- a/TODDC_Test.py
+++ b/TODDC_Test.py
@@ -11,8 +11,56 @@ import os
 import lxml.etree as etree
 
 
-tool = ToolsTODDC.ToolsTODDC("toddc.tbl")
+tool = ToolsTODDC.ToolsTODDC("TBL_All.json")
 
 ele = tool.menu_files_json[0]
 tool.extract_Menu_File(ele)
 
+repo_name = "Tales-Of-Destiny-DC"
+tblFile = "TBL_ALL.json"
+with open("../{}/Data/Misc/{}".format(repo_name, tblFile), encoding="utf-8") as f:
+    jsonRaw = json.load(f)
+    jsonTblTags ={ k1:{ int(k2) if (k2 != "TBL") else int(k2):v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+    #jsonTblTags = {k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+    
+
+TAGS = jsonTblTags['TAGS']
+
+with open("../Data/Tales-Of-Destiny-DC/Menu/New/00016/00016_0000d.unknown", "rb") as fileRead:
+    
+    
+    fileRead.seek(0x3C87D)
+    b = fileRead.read(1)
+        
+    b = ord(b)
+    finalText=""
+    if (b >= 0x99 and b <= 0x9F) or (b >= 0xE0 and b <= 0xEB):
+        c = (b << 8) + ord(fileRead.read(1))
+       
+        # if str(c) not in json_data.keys():
+        #    json_data[str(c)] = char_index[decode(c)]
+        try:
+            finalText += (jsonTblTags['TBL'][str(c)])
+        except KeyError:
+            b_u = (c >> 8) & 0xff
+            b_l = c & 0xff
+            finalText += ("{%02X}" % b_u)
+            finalText += ("{%02X}" % b_l)
+    elif b == 0x1:
+        finalText += ("\n")
+    elif b in (0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xB, 0xC, 0xD, 0xE, 0xF):
+        b2 = struct.unpack("<L", fileRead.read(4))[0]
+        if b in TAGS:
+            tag_name = TAGS.get(b)
+            
+            tag_param = None
+            tag_search = tag_name.upper()
+            if (tag_search in jsonTblTags.keys()):
+                tags2 = jsonTblTags[tag_search]
+                tag_param = tags2.get(b2, None) 
+            if tag_param != None:
+                finalText += tag_param
+            else:
+                finalText += ("<%s:%08X>" % (tag_name, b2))
+        else:
+            finalText += "<%02X:%08X>" % (b, b2)
\ No newline at end of file
diff --git a/ToolsTODDC.py b/ToolsTODDC.py
index e06df4c..f43525a 100644
--- a/ToolsTODDC.py
+++ b/ToolsTODDC.py
@@ -20,29 +20,6 @@ class ToolsTODDC(ToolsTales):
     
     def __init__(self, tbl):
         
-        self.gameName = "TODDC"
-        self.repo_name = "Tales-of-Destiny-DC"
-        self.basePath = os.getcwd()
-        
-        
-        with open("../Tales-of-Destiny-DC/Data/Misc/toddc.tbl", encoding="utf-8") as f:
-            data = f.readlines()
-            hex_list = [bytes.fromhex(str(ele.split("=",1)[0])) for ele in data]
-            self.itable = dict([[ele.split("=",1)[1].replace("\n",""), bytes.fromhex(ele.split("=",1)[0])] for ele in data])
-            
-     
-            
-        #with open("../{}/Data/{}/Misc/{}".format(repo_name, gameName, tblFile)) as f:
-        #    jsonRaw = json.load(f)
-        #    self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
-          
-        #self.itable = dict([[i, struct.pack(">H", int(j))] for j, i in self.jsonTblTags['TBL'].items()])
-        #self.itags = dict([[i, j] for j, i in self.jsonTblTags['TAGS'].items()])
-        #self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAMES'].items()])
-        #self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
-        
-        
-        with open("../{}/Data/Menu/MenuFiles.json".format(self.repo_name, self.gameName)) as f:
-           self.menu_files_json = json.load(f)
+        super().__init__("TODDC", tbl, "Tales-of-Destiny-DC")
            
-        
\ No newline at end of file
+        
diff --git a/ToolsTales.py b/ToolsTales.py
index ecf6fe3..ffa6acd 100644
--- a/ToolsTales.py
+++ b/ToolsTales.py
@@ -31,17 +31,21 @@ class ToolsTales:
         self.repo_name = repo_name
         self.basePath = os.getcwd()
         
-        with open("../{}/Data/{}/Misc/{}".format(repo_name, gameName, tblFile)) as f:
+        with open("../{}/Data/Misc/{}".format(repo_name, tblFile), encoding="utf-8") as f:
             jsonRaw = json.load(f)
-            self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            if self.repo_name == "Tales-of-Destiny-DC":
+                self.jsonTblTags ={ k1:{ int(k2) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            else:
+                self.jsonTblTags ={ k1:{ int(k2,16) if (k1 != "TBL") else k2:v2 for k2,v2 in jsonRaw[k1].items()} for k1,v1 in jsonRaw.items()}
+            
           
         self.itable = dict([[i, struct.pack(">H", int(j))] for j, i in self.jsonTblTags['TBL'].items()])
         self.itags = dict([[i, j] for j, i in self.jsonTblTags['TAGS'].items()])
-        self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAMES'].items()])
-        self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLORS'].items()])
+        self.inames = dict([[i, j] for j, i in self.jsonTblTags['NAME'].items()])
+        self.icolors = dict([[i, j] for j, i in self.jsonTblTags['COLOR'].items()])
         
         
-        with open("../{}/Data/{}/Menu/MenuFiles.json".format(repo_name, gameName)) as f:
+        with open("../{}/Data/Menu/MenuFiles.json".format(repo_name)) as f:
            self.menu_files_json = json.load(f)
            
            
@@ -469,7 +473,7 @@ class ToolsTales:
                     tag_name = TAGS.get(b)
                     
                     tag_param = None
-                    tag_search = tag_name.upper()+'S'
+                    tag_search = tag_name.upper()
                     if (tag_search in self.jsonTblTags.keys()):
                         tags2 = self.jsonTblTags[tag_search]
                         tag_param = tags2.get(b2, None) 
@@ -913,7 +917,7 @@ class ToolsTales:
         
         #Write to XML file
         txt=etree.tostring(root, encoding="UTF-8", pretty_print=True)
-        with open(file_definition['File_XML'].replace("/{}".format(self.repo_name),""), "wb") as xmlFile:
+        with open(file_definition['File_XML'].replace("/{}".format(self.repo_name),"").replace("/Data","/Data/{}".format(self.repo_name)), "wb") as xmlFile:
             xmlFile.write(txt)
         
         
@@ -922,7 +926,7 @@ class ToolsTales:
 
         
         print("Extracting Menu Files")
-        self.mkdir("../Data/{}/Menu/New".format(self.gameName))
+        self.mkdir("../Data/{}/Menu/New".format(self.repo_name))
         
         #Prepare the menu files (Unpack PAK files and use comptoe)
         files_to_prepare = list(dict.fromkeys([ele['File_Original'] for ele in self.menu_files_json]))
diff --git a/__pycache__/ToolsTODDC.cpython-38.pyc b/__pycache__/ToolsTODDC.cpython-38.pyc
index 21457e040333a37170f5c2ac5fc3811162ee4ff1..032585fb482c54d6de939649e5140639c53ffe9b 100644
GIT binary patch
delta 307
zcmcb{vw)p1l$V!_fq{X+<E2B=Z^n&$l8o8RAU*>FL$M4414Al96k`fQ6jM7x8e<A$
z3R4S56mvTR3qur3FoP!ZEv}IK{G8$te-{_$WG1LS5CvkhGB7ZJ%qkXPU|=X=Xl7Wz
zn8H}Yn8LJ>nUNud0i=KOKSo(SO{QC{#ia$QMYlNO<1_OzOXA}-nQpNZr{<*HVlGL_
zS;=^dGd?~!C$YFVK7QroJ52ThMVt%_45A=6f-GWSn*4!9lu46yG6$=w3P|b}FH}Qv
zYEDjkd=Vc50|SKM0kQZeJFyx_-D1fq&d<BWR$Nk4np|>=tvI8!Bs1q0Q-1N}9@Z8C
NgdQ-9f3gCb836iVNDcr1

delta 1062
zcmZ3$evOAOl$V!_fq{Wx>s^PW8*Cf-BpK_O7#J8F7#J9eMHm<uQW>HcQy8L{QW#U1
zS{S03Q<#GpG+AzOh2-bw6o>e`xHu<+)PsxwVO9nP22KVB24|4|4h9B>6vi5cc!m_F
z8ishr5~c;r3mIw{;#o>qQ<zg&QdoPL`VDHCYM2(VEo7)=PGL)7Z(*pfVRm6?W~^l?
zVNc-z2|)PGAcHu<8B7@h8G;xh7)n@EI2Ul%Fk~^-Fk~?-WNK#Y7pi3{;ab35!?X~j
zmIt9Wg&~+hlgsZGE7-wR!Xb${sl~eaX}T_{#U+_}mAWp@Ra$y_`e5;TR0(~T#F9jP
z-^}7<{gV8Ylw`e<q?{_&(vmb?3r)sb9I1K9`6-!s>B)>B??W*tL_nbs3<?D`1_p+7
zh8l)gxmv~&h6RizOf`%Pm{S;17#A|7FiA2rGcIJD$W+J@%%I8qi_!L_1<0f#5TVI(
zi#4gTB(?Y!ds<O`ZboXwE#~5qqFb!R1v!}|E17OF=^5N&PR&VO$xtN3z%cnPqka7?
zE}NXp;*#Y2+yXl}ko7DK3=C`xObk`(h$z#GkI&4@EQycTv&qR%PRuE`(?jUO?Gr1Q
zPmF3AYZw<WK>ffd$*_Pig(-!3AyY{`(*kBBDHchFg^cM;Q17u8aWXJ46oJy)Ek>?e
z3{X!N@i8zk++r_EEyzhsPA%dFso?<;{2)RIP6&fopfo9u;x9QpJ^kuhXf)NQ=9TLE
zrskEpW#*(7>tz+^=V|iZ;z&=-P4!F6O})iglv<D<p9f+x<rm*#OHVCHE>F3|k(5}R
z8jx6$af>CtAT<x9EHNb~GcUFH7E4NIa>*^W%#y^UoYY%vY57IDi6ysKKqlW}$;nSl
zxy7HGnpYa12C^`|9we^GdW)qvH7D&Bb4gOpEylE4EGda4iMKd1QY+#?kpqe>aEvh&
zf&6rf0~Q^kAdi7O%)rFP$i~RU%*V*V$j2zhC&pMMj3xT~G+98JLEedvzr__FpF25-
zNla7=6i^^zkS&_r!(<>;qy!3Tw&IeaQjn*LGfGP`bBd%G7#JpBV`>q=(38b%1^|3$
B4~PH&

diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index 9141a6d6ed0f057d9c8f34f22484a874cd54ea19..2e7f96d3d79d39c8961b4890bd3885ebd30a0e86 100644
GIT binary patch
delta 7391
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

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


From b352faa978322e567e74aeb4c75ab4c19847bb22 Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 10 Apr 2022 12:12:19 -0400
Subject: [PATCH 5/6] Automation of Apache3

- Open Apache3
- Click on the 2 Freelicense + Error Drive not found
- Click on Open Iso
---
 __pycache__/ToolsTODDC.cpython-38.pyc | Bin 928 -> 928 bytes
 __pycache__/ToolsTales.cpython-38.pyc | Bin 23748 -> 23748 bytes
 apache_automate.py                    |  28 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 apache_automate.py

diff --git a/__pycache__/ToolsTODDC.cpython-38.pyc b/__pycache__/ToolsTODDC.cpython-38.pyc
index 032585fb482c54d6de939649e5140639c53ffe9b..1ae4fd1ec11b2a14f2dec18322c51289b8dc41a5 100644
GIT binary patch
delta 20
bcmZ3$zJQ%Ol$V!_fq{YHACu!o?y1ZGET;r$

delta 20
bcmZ3$zJQ%Ol$V!_fq{X+<E6t!?y1ZGEfNHn

diff --git a/__pycache__/ToolsTales.cpython-38.pyc b/__pycache__/ToolsTales.cpython-38.pyc
index 2e7f96d3d79d39c8961b4890bd3885ebd30a0e86..b095f3f4794bff6b28562331f92804d83cde1d18 100644
GIT binary patch
delta 20
ccmX@Ilkvz-M$S-PUM>a(28MqdId{hZ07cmbP5=M^

delta 20
bcmX@Ilkvz-M$S-PUM>a(28Nc6oV#NHLw5z#

diff --git a/apache_automate.py b/apache_automate.py
new file mode 100644
index 0000000..d0eb025
--- /dev/null
+++ b/apache_automate.py
@@ -0,0 +1,28 @@
+from pywinauto import application
+from pywinauto.keyboard import send_keys
+from pywinauto.findwindows import find_windows
+
+app = application.Application(backend="uia").start('apache3.exe')
+app = application.Application(backend="uia").connect(title='Apache3 Build 3.10.6 (BETA)')
+
+#Get the window about FREE license
+app.Information.set_focus()
+send_keys('{ENTER}')
+
+#Get the window about Drive missing
+drive_missing = app.Apache3Build.child_window(title="apache3", control_type="Window")
+drive_missing.set_focus()
+send_keys('{ENTER}')
+
+#app.Apache3Build.print_control_identifiers()
+
+#Click on the Open Iso button
+app.Apache3Build.child_window(auto_id="1011").click()
+
+app.Dialog.child_window(auto_id="2").click()
+
+app.Apache3Build.child_window()
+app.Apache3Build.child_window(auto_id="TitleBar").print_control_identifiers()
+
+open_ele = app.Apache3Build.child_window(title="Open", auto_id="1011", control_type="Button")
+open_ele.click_input()
\ No newline at end of file

From 200baa8d4045516ab96b109f2a5b8b88710ba434 Mon Sep 17 00:00:00 2001
From: Stewie <fortiersteven1@gmail.com>
Date: Sun, 10 Apr 2022 15:57:01 -0400
Subject: [PATCH 6/6] Full script to open Apache3 and replace SLPS into the iso

- function to open Apache3 + Iso
- function to loop on each file and replace with the new file
---
 apache_automate.py | 109 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 92 insertions(+), 17 deletions(-)

diff --git a/apache_automate.py b/apache_automate.py
index d0eb025..49e4a5f 100644
--- a/apache_automate.py
+++ b/apache_automate.py
@@ -1,28 +1,103 @@
 from pywinauto import application
 from pywinauto.keyboard import send_keys
+from pywinauto import mouse
 from pywinauto.findwindows import find_windows
+import os
+import shutil
 
-app = application.Application(backend="uia").start('apache3.exe')
-app = application.Application(backend="uia").connect(title='Apache3 Build 3.10.6 (BETA)')
+def open_apache3_iso(repo_name):
+    
+    app = application.Application(backend="uia").start('apache3.exe')
+    app = application.Application(backend="uia").connect(title='Apache3 Build 3.10.6 (BETA)')
+    
+    #Get the window about FREE license
+    app.Information.set_focus()
+    send_keys('{ENTER}')
+    
+    #Get the window about Drive missing
+    drive_missing = app.Apache3Build.child_window(title="apache3", control_type="Window")
+    drive_missing.set_focus()
+    send_keys('{ENTER}')
+    
+    iso_path = os.path.join( os.path.normpath(os.getcwd() + os.sep + os.pardir), "Data",repo_name,"Disc","New","{}.iso".format(repo_name))
 
-#Get the window about FREE license
-app.Information.set_focus()
-send_keys('{ENTER}')
+    #Click on the Open Iso button
+    app.Apache3Build.child_window(auto_id="1011").click()
+    
+    #File Name textbox
+    text_box_filename = app.Dialog.child_window(auto_id="1152").wrapper_object()
+    text_box_filename.type_keys(r"{}".format(iso_path))
+    
+    #Open the iso
+    app.Dialog.child_window(title="Open", auto_id="1", control_type="Button").wrapper_object().click()
 
-#Get the window about Drive missing
-drive_missing = app.Apache3Build.child_window(title="apache3", control_type="Window")
-drive_missing.set_focus()
-send_keys('{ENTER}')
+    return app
 
-#app.Apache3Build.print_control_identifiers()
+def locate_right_click(file_name, app):
+    item = app.Apache3Build.child_window(title=file_name, control_type="ListItem").wrapper_object()
+    pos_x = item.rectangle().mid_point().x
+    pos_y = item.rectangle().mid_point().y
+    app.Apache3Build.set_focus()
+    mouse.click(button='right', coords=(pos_x, pos_y))
+    
+def browse_replace_file(file_replace_ele, new_file_path, repo_name):
+    
+    #Browse the file and put the new file path
+    new_file_path = os.path.join( os.path.normpath(os.getcwd() + os.sep + os.pardir), "Data",repo_name, "Menu", "New", "SLPS_254.50")
+    file_replace_ele.child_window(auto_id="1095").wrapper_object().click()
+    file_replace_ele.Dialog.child_window(title="File name:", auto_id="1152", control_type="Edit").wrapper_object().type_keys(new_file_path)
+    file_replace_ele.Dialog.child_window(title="Open", auto_id="1", control_type="Button").wrapper_object().click()
+    
+    #Click on the Replace File button
+    file_replace_ele.child_window(title="Replace File", auto_id="1094", control_type="Button").wrapper_object().click()
+    
+    
+def replace_files(files_list, app):
+    
+    new_file_path_format = os.path.join( os.path.normpath(os.getcwd() + os.sep + os.pardir), "Data",repo_name, "Disc", "New")
+    for file_name in files_list:
 
-#Click on the Open Iso button
-app.Apache3Build.child_window(auto_id="1011").click()
+        #Locate file and right-click it
+        locate_right_click(file_name, app)
 
-app.Dialog.child_window(auto_id="2").click()
+        #Click on the option "Replace Selected File"
+        replace_file_pos = app.Context.child_window(title="Replace Selected File", auto_id="32782", control_type="MenuItem").wrapper_object().rectangle().mid_point()
+        mouse.click(button='left', coords=(replace_file_pos.x, replace_file_pos.y))
+        
+        file_replace_ele = app.Apache3Build.Apache3FileReplacer
+        
+        #Uncheck TOC and Check Ignore File size
+        file_replace_ele.child_window(title="Update TOC", auto_id="1092", control_type="CheckBox").wrapper_object().click()
+        file_replace_ele.child_window(title="Ignore File Size Differences", auto_id="1093", control_type="CheckBox").click()
 
-app.Apache3Build.child_window()
-app.Apache3Build.child_window(auto_id="TitleBar").print_control_identifiers()
+        browse_replace_file(file_replace_ele, os.path.join(new_file_path_format, file_name), repo_name)
+      
 
-open_ele = app.Apache3Build.child_window(title="Open", auto_id="1011", control_type="Button")
-open_ele.click_input()
\ No newline at end of file
+#Files to reinsert
+#files_list = ['SLPS_254.50', 'DAT.bin']
+files_list = ['SLPS_254.50']
+
+repo_name = "Tales-Of-Rebirth"
+
+#copy original Iso
+original_path = os.path.join(os.getcwd(), "..", "Data", repo_name, "Disc", "Original", "{}.iso".format(repo_name))
+new_path = os.path.join(os.getcwd(), "..", "Data", repo_name, "Disc", "New", "{}.iso".format(repo_name))
+
+print("Copy Original Iso into New folder")
+shutil.copy( original_path, new_path)
+
+
+
+try:
+    app = application.Application(backend="uia").connect(title='Apache3 Build 3.10.6 (BETA)')
+    app.Apache3Build.close()
+    
+except:
+    print("Open Apache3 and load the iso")
+    app = open_apache3_iso(repo_name)
+
+    print("Replace the different files")
+    replace_files(files_list,app)
+    
+    print("Close Apache3")
+    app.Apache3Build.close()
\ No newline at end of file