hacktools 0.35.2__tar.gz → 0.36.1__tar.gz

{hacktools-0.35.2/hacktools.egg-info → hacktools-0.36.1}/PKG-INFO

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

hacktools-0.36.1/hacktools/__init__.py

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

{hacktools-0.35.2 → hacktools-0.36.1}/hacktools/common.py

@@ -8,6 +8,7 @@ import re
 import shlex
 import shutil
 import sys
+import stat
 import struct
 import subprocess
 import typing
@@ -430,7 +431,7 @@ if hasClick:
             runGUI()
 
 
-    def runStartup():
+    def runStartup(skipcrc=False):
         if datafolder != "" and not os.path.isdir(datafolder):
             makeFolder(datafolder)
         if appname != "":
@@ -441,7 +442,7 @@ if hasClick:
         if filecheck != "" and not os.path.isfile(filecheck):
             logError(filecheck, "file not found.")
             return False
-        if crc >= 0 and not os.path.isfile(".skipcrc"):
+        if crc >= 0 and not skipcrc and not os.path.isfile(".skipcrc"):
             checkcrc = crcFile(filecheck)
             if crc != checkcrc:
                 logMessage("Checksum mismatch for", filecheck, "(" + toHex(checkcrc) + ", expected", toHex(crc) + ")")
@@ -1154,6 +1155,11 @@ def makeFolder(folder, clear=True):
 
 def clearFolder(folder):
     if os.path.isdir(folder):
+        # Ensure files aren't marked as read-only
+        for root, dirs, files in os.walk(folder, topdown=False):
+            for name in files:
+                filename = os.path.join(root, name)
+                os.chmod(filename, stat.S_IWUSR)
         shutil.rmtree(folder)
 
 
@@ -1163,8 +1169,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.2 → hacktools-0.36.1/hacktools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hacktools
-Version: 0.35.2
+Version: 0.36.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.2/hacktools/__init__.py

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