hacktools 0.35.1__tar.gz → 0.36.0__tar.gz

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

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

hacktools-0.36.0/hacktools/__init__.py

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

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

@@ -430,7 +430,7 @@ if hasClick:
             runGUI()
 
 
-    def runStartup(nocrc=False):
+    def runStartup():
         if datafolder != "" and not os.path.isdir(datafolder):
             makeFolder(datafolder)
         if appname != "":
@@ -441,7 +441,7 @@ if hasClick:
         if filecheck != "" and not os.path.isfile(filecheck):
             logError(filecheck, "file not found.")
             return False
-        if crc >= 0 and not nocrc:
+        if crc >= 0 and not os.path.isfile(".skipcrc"):
             checkcrc = crcFile(filecheck)
             if crc != checkcrc:
                 logMessage("Checksum mismatch for", filecheck, "(" + toHex(checkcrc) + ", expected", toHex(crc) + ")")
@@ -1163,8 +1163,7 @@ def copyFolder(f1, f2):
 
 
 def mergeFolder(f1, f2):
-    import distutils.dir_util
-    distutils.dir_util.copy_tree(f1, f2, verbose=0)
+    shutil.copytree(f1, f2, dirs_exist_ok=True)
 
 
 def copyFile(f1, f2):

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

@@ -31,7 +31,7 @@ def extractIso(isofile, extractfolder, workfolder="", fixfilename=False):
     common.logMessage("Done!")
 
 
-def repackIso(isofile, isopatch, workfolder, patchfile="", fixfilename=False):
+def repackIso(isofile, isopatch, workfolder, patchfile="", fixfilename=False, udf=False, ignorefiles=[]):
     try:
         import pycdlib
     except ImportError:
@@ -41,11 +41,31 @@ def repackIso(isofile, isopatch, workfolder, patchfile="", fixfilename=False):
     common.copyFile(isofile, isopatch)
     iso = pycdlib.PyCdlib()
     iso.open(isopatch, "r+b")
+    udflookup = {}
+    if udf:
+        for dirname, dirlist, filelist in iso.walk(udf_path="/"):
+            if dirname != "/":
+                dirname += "/"
+            common.logDebug("Dirname:", dirname, ", Dirlist:", dirlist, ", Filelist:", filelist)
+            for file in filelist:
+                udflookup[dirname[1:].lower() + file.lower()] = dirname[1:] + file
+    common.logDebug(udflookup)
     files = common.getFiles(workfolder)
     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 + (";1" if fixfilename and not file.endswith(".") else ""))
+            udfpath = None
+            if udf:
+                if file.lower() not in udflookup:
+                    common.logError("UDF lookup not found:", file)
+                    udfpath = "/" + file
+                else:
+                    udfpath = "/" + udflookup[file.lower()]
+                    common.logDebug("UDF path:", udfpath)
+            # Add a . to files without extension
+            if "." not in file:
+                file += "."
+            iso.modify_file_in_place(f, filelen, "/" + file + (";1" if fixfilename else ""), udf_path=udfpath)
     iso.close()
     common.logMessage("Done!")
     # Create xdelta patch

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hacktools
-Version: 0.35.1
+Version: 0.36.0
 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

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