hacktools 0.34.0__tar.gz → 0.35.1__tar.gz

{hacktools-0.34.0/hacktools.egg-info → hacktools-0.35.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hacktools
-Version: 0.34.0
+Version: 0.35.1
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.35.1/hacktools/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.35.1"

{hacktools-0.34.0 → hacktools-0.35.1}/hacktools/c_ext/cmp_racjin.c

@@ -11,7 +11,7 @@ static PyObject* compressRACJIN(PyObject* module, PyObject* args, PyObject* kwar
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#", kwlist, &src, &srclen))
         return NULL;
 
-    unsigned char* compressed_buffer = PyMem_Malloc(srclen);
+    unsigned char* compressed_buffer = PyMem_Malloc(srclen * 2);
     MALLOC_CHECK(compressed_buffer);
     unsigned int destlen = 0;
 

{hacktools-0.34.0 → hacktools-0.35.1}/hacktools/common.py

@@ -756,7 +756,7 @@ class TranslationFile:
             note = ET.SubElement(unit, "note")
             note.text = comment
 
-    def preloadLookup(self):
+    def preloadLookup(self, comments="#"):
         self.lookup = {}
         self.chartot = 0
         self.transtot = 0
@@ -764,6 +764,8 @@ class TranslationFile:
             for unit in self.files[file][0]:
                 self.chartot += len(unit[0].text)
                 if unit[1].text is not None and unit[1].text != "":
+                    if comments in unit[1].text:
+                        unit[1].text = unit[1].text.split(comments)[0]
                     self.lookup[unit[0].text] = unit[1].text
                     self.transtot += len(unit[0].text)
 
@@ -1030,7 +1032,7 @@ class BinaryPointer:
         self.str = str
 
 
-def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, readfunc=detectEncodedString, writefunc=writeEncodedString, encoding="shift_jis", pointerstart=0, injectstart=0, fallbackf=None, injectfallback=0, sectionname="bin"):
+def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, readfunc=detectEncodedString, writefunc=writeEncodedString, encoding="shift_jis", pointerstart=0, injectstart=0, fallbackf=None, injectfallback=0, sectionname="bin", preformat=None, postformat=None):
     insize = os.path.getsize(infile)
     notfound = []
     with Stream(infile, "rb") as fi:
@@ -1045,6 +1047,9 @@ def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, re
                     pos = fi.tell()
                     check = readfunc(fi, encoding)
                     if check != "":
+                        pre = post = ""
+                        if preformat != None:
+                            check, pre, post = preformat(check)
                         if isinstance(section, TranslationFile):
                             newsjis = section.getEntry(check, sectionname, pos)
                         else:
@@ -1055,6 +1060,8 @@ def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, re
                         if newsjis != "":
                             if newsjis == "!":
                                 newsjis = ""
+                            if postformat != None:
+                                newsjis = postformat(newsjis, pre, post)
                             newsjislog = newsjis.encode("ascii", "ignore")
                             logDebug("Replacing string at", toHex(pos), "with", newsjislog)
                             fo.seek(pos)
@@ -1104,7 +1111,10 @@ def repackBinaryStrings(section, infile, outfile, binranges, freeranges=None, re
                                             newpointer = range[0]
                                             # For the injected range, add injectstart, otherwise add pointerstart
                                             if (len(range) == 3):
-                                                newpointer += injectstart
+                                                if isinstance(range[2], bool):
+                                                    newpointer += injectstart
+                                                else:
+                                                    newpointer += int(range[2])
                                             else:
                                                 newpointer += pointerstart
                                             range[0] = fo.tell()

{hacktools-0.34.0 → hacktools-0.35.1}/hacktools/nds.py

@@ -134,7 +134,7 @@ def extractBIN(binrange, readfunc=common.detectEncodedString, encoding="shift_ji
 
 
 def repackBIN(binrange, freeranges=[], readfunc=common.detectEncodedString, writefunc=common.writeEncodedString, encoding="shift_jis", comments="#",
-              binin="data/extract/arm9.bin", binout="data/repack/arm9.bin", binfile="data/bin_input.txt", fixchars=[], pointerstart=0x02000000, injectstart=0x02000000, fallbackf=None, injectfallback=0, nocopy=False, sectionname="bin"):
+              binin="data/extract/arm9.bin", binout="data/repack/arm9.bin", binfile="data/bin_input.txt", fixchars=[], pointerstart=0x02000000, injectstart=0x02000000, fallbackf=None, injectfallback=0, nocopy=False, sectionname="bin", preformat=None, postformat=None):
     if not os.path.isfile(binfile):
         common.logError("Input file", binfile, "not found")
         return False
@@ -152,7 +152,7 @@ def repackBIN(binrange, freeranges=[], readfunc=common.detectEncodedString, writ
         section.preloadLookup()
     if type(binrange) == tuple:
         binrange = [binrange]
-    notfound = common.repackBinaryStrings(section, binin, binout, binrange, freeranges, readfunc, writefunc, encoding, pointerstart, injectstart, fallbackf, injectfallback, sectionname)
+    notfound = common.repackBinaryStrings(section, binin, binout, binrange, freeranges, readfunc, writefunc, encoding, pointerstart, injectstart, fallbackf, injectfallback, sectionname, preformat, postformat)
     for pointer in notfound:
         common.logError("Pointer", common.toHex(pointer.old), "->", common.toHex(pointer.new), "not found for string", pointer.str)
     if binfile.endswith(".txt"):
@@ -176,13 +176,17 @@ class BINSection:
             self.data = bytearray(ramlen)
 
 
-def expandBIN(binin, binout, headerin, headerout, newlength, injectpos):
+def expandBIN(binin, binout, headerin, headerout, newlengths, injectpos):
     if not os.path.isfile(binin):
         common.logError("Input file", binin, "not found")
         return False
     if not os.path.isfile(headerin):
         common.logError("Header file", headerin, "not found")
         return False
+    if not isinstance(newlengths, list):
+        newlengths = [newlengths]
+    if not isinstance(injectpos, list):
+        injectpos = [injectpos]
     codesettings = -1
     with common.Stream(headerin, "rb") as fin:
         fin.seek(0x20)
@@ -225,13 +229,15 @@ def expandBIN(binin, binout, headerin, headerout, newlength, injectpos):
             sections.append(BINSection(fin, start, size, datastart, bsssize))
             datastart += size
     # Write the new extended arm9.bin
-    sections.append(BINSection(None, injectpos, newlength, 0, 0))
+    for i in range(len(newlengths)):
+        sections.append(BINSection(None, injectpos[i], newlengths[i], 0, 0))
     with common.Stream(binout, "wb") as f:
         # Write the section data first
         f.write(sections[0].data)
         datastart = f.tell()
         for i in range(1, len(sections)):
             sections[i].offset = f.tell()
+            common.logDebug("Section", i, "offset:", common.toHex(f.tell()))
             f.write(sections[i].data)
         # Write the new copytable
         copytablestart = f.tell()

{hacktools-0.34.0 → hacktools-0.35.1}/hacktools/psp.py

@@ -31,7 +31,7 @@ def extractIso(isofile, extractfolder, workfolder="", fixfilename=False):
     common.logMessage("Done!")
 
 
-def repackIso(isofile, isopatch, workfolder, patchfile=""):
+def repackIso(isofile, isopatch, workfolder, patchfile="", fixfilename=False):
     try:
         import pycdlib
     except ImportError:
@@ -45,7 +45,7 @@ def repackIso(isofile, isopatch, workfolder, patchfile=""):
     for file in common.showProgress(files):
         filelen = os.path.getsize(workfolder + file)
         with open(workfolder + file, "rb") as f:
-            iso.modify_file_in_place(f, filelen, "/" + file)
+            iso.modify_file_in_place(f, filelen, "/" + file + (";1" if fixfilename and not file.endswith(".") else ""))
     iso.close()
     common.logMessage("Done!")
     # Create xdelta patch

{hacktools-0.34.0 → hacktools-0.35.1/hacktools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hacktools
-Version: 0.34.0
+Version: 0.35.1
 Summary: A set of utilities and tools for rom hacking and translations.
 Home-page: https://github.com/Illidanz/hacktools
 Author: Illidan

hacktools-0.34.0/hacktools/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.34.0"