use nsz package for nut and Fs

README.md

@@ -1,10 +1,10 @@
 # Nintendo Switch Tools
 
-Tools for  XCI, XCZ, NSP and NSZ
+Tools for XCI, XCZ, NSP and NSZ
 
 Based on nut, NSC_B and nsz
 
 # pypi.org
 
-for using nstools.Fs, nstools.lib and nstools.nut:
+for using nstools, nsz.Fs and nsz.nut:
 https://pypi.org/project/nstools/

build/setup.py

@@ -16,7 +16,7 @@
 
 setuptools.setup(
     name = 'nstools',
-    version = '1.2.3',
+    version = '2.0.0b1',
     url = 'https://github.com/seiya-dev/NSTools',
     long_description = long_description,
     long_description_content_type = 'text/markdown',
@@ -31,11 +31,10 @@
     ],
 
     packages = [
-        'nstools.Fs',
-        'nstools.nut',
-        'nstools.lib',
+        'nstools',
     ],
     install_requires = [
+        'nsz @ git+https://github.com/nicoboss/nsz.git@2aac384',
         'zstandard',
         'enlighten',
         'requests',

py/ns_extract_hashes.py

@@ -1,32 +1,24 @@
 #! /usr/bin/python3
 
 from binascii import hexlify as hx, unhexlify as uhx
-
-import os
-import sys
-
 from pathlib import Path
+import argparse
+import sys
 
-from nstools.nut import Keys
-
-from nstools.Fs import factory
-from nstools.Fs import Pfs0, Nca, Type
-
-from nstools.lib import FsTools
+from nsz.nut import Keys
+from nsz.Fs import factory
+from nsz.Fs import Pfs0, Nca, Type
 
+from nstools import FsTools
 
 # set app path
 appPath = Path(sys.argv[0])
 while not appPath.is_dir():
     appPath = appPath.parents[0]
-appPath = os.path.abspath(appPath)
+appPath = Path(appPath).resolve().as_posix()
 print(f'[:INFO:] App Path: {appPath}')
 
-# set logs path
-# logs_dir = os.path.abspath(os.path.join(appPath, '..', 'logs'))
-# print(f'[:INFO:] Logs Path: {logs_dir}')
-
-import argparse
+# set args
 parser = argparse.ArgumentParser(formatter_class = argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument('-i', '--input',  help = 'input file')
 args = parser.parse_args()
@@ -45,16 +37,19 @@ def send_hook(message_content):
         pass
 
 def scan_file():
-    ipath = os.path.abspath(INCP_PATH)
-    if not os.path.isfile(ipath):
+    ipath = Path(INCP_PATH).resolve().as_posix()
+
+    if not Path(ipath).is_file() or Path(ipath).is_symlink():
         return
-    if not ipath.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
+    if not Path(ipath).name.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
         return
 
     container = factory(Path(ipath).resolve())
-    container.open(ipath, 'rb')
+    container.open(ipath)
+
     if ipath.lower().endswith(('.xci', '.xcz')):
         container = container.hfs0['secure']
+
     try:
         for nspf in container:
             if isinstance(nspf, Nca.Nca) and nspf.header.contentType == Type.Content.META:

py/ns_extract_meta.py

@@ -1,32 +1,24 @@
 #! /usr/bin/python3
 
 from binascii import hexlify as hx, unhexlify as uhx
-
-import os
-import sys
-
 from pathlib import Path
+import argparse
+import sys
 
-from nstools.nut import Keys
-
-from nstools.Fs import factory
-from nstools.Fs import Pfs0, Xci, Nsp, Nca, Type
-
-from nstools.lib import FsTools
+from nsz.nut import Keys
+from nsz.Fs import factory
+from nsz.Fs import Pfs0, Xci, Nsp, Nca, Type
 
+from nstools import FsTools
 
 # set app path
 appPath = Path(sys.argv[0])
 while not appPath.is_dir():
     appPath = appPath.parents[0]
-appPath = os.path.abspath(appPath)
+appPath = Path(appPath).resolve().as_posix()
 print(f'[:INFO:] App Path: {appPath}')
 
-# set logs path
-# logs_dir = os.path.abspath(os.path.join(appPath, '..', 'logs'))
-# print(f'[:INFO:] Logs Path: {logs_dir}')
-
-import argparse
+# set args
 parser = argparse.ArgumentParser(formatter_class = argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument('-i', '--input',  help = 'input file')
 args = parser.parse_args()
@@ -77,14 +69,16 @@ def extract_meta_from_cnmt(cnmt_sections):
                 print(f'> HASH: {entry.hash.hex()}')
 
 def scan_file():
-    ipath = os.path.abspath(INCP_PATH)
-    if not os.path.isfile(ipath):
+    ipath = Path(INCP_PATH).resolve().as_posix()
+
+    if not Path(ipath).is_file() or Path(ipath).is_symlink():
         return
-    if not ipath.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
+    if not Path(ipath).name.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
         return
 
     container = factory(Path(ipath).resolve())
-    container.open(ipath, 'rb', meta_only=True)
+    container.open(ipath, meta_only=True)
+
     try:
         for cnmt in get_cnmts(container):
             extract_meta_from_cnmt(cnmt)

py/ns_ticket_info.py

@@ -1,26 +1,20 @@
 #! /usr/bin/python3
 
-import os
-import sys
-
 from pathlib import Path
+import argparse
+import sys
 
-from nstools.nut import Keys
-
-from nstools.Fs import factory, Ticket
+from nsz.nut import Keys
+from nsz.Fs import factory, Ticket
 
 # set app path
 appPath = Path(sys.argv[0])
 while not appPath.is_dir():
     appPath = appPath.parents[0]
-appPath = os.path.abspath(appPath)
+appPath = Path(appPath).resolve().as_posix()
 print(f'[:INFO:] App Path: {appPath}')
 
-# set logs path
-# logs_dir = os.path.abspath(os.path.join(appPath, '..', 'logs'))
-# print(f'[:INFO:] Logs Path: {logs_dir}')
-
-import argparse
+# set args
 parser = argparse.ArgumentParser(formatter_class = argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument('-i', '--input',  help = 'input file')
 args = parser.parse_args()
@@ -39,15 +33,17 @@ def send_hook(message_content):
         pass
 
 def scan_file():
-    ipath = os.path.abspath(INCP_PATH)
-    if not os.path.isfile(ipath):
+    ipath = Path(INCP_PATH).resolve().as_posix()
+
+    if not Path(ipath).is_file() or Path(ipath).is_symlink():
         return
-    if not ipath.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
+    if not Path(ipath).name.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
         return
 
     container = factory(Path(ipath).resolve())
-    container.open(ipath, 'rb')
-    if ipath.lower().endswith(('.xci', '.xcz')):
+    container.open(ipath)
+
+    if ipath.name.lower().endswith(('.xci', '.xcz')):
         container = container.hfs0['secure']
 
     try:

py/ns_verify_folder.py

@@ -1,29 +1,22 @@
 #! /usr/bin/python3
 
-import os
-import sys
-import json
-import requests
-import re
-
 from pathlib import Path
+import argparse
+import requests
+import json
+import sys
 
-from nstools.nut import Keys
-
-from nstools.lib import Verify
+from nsz.nut import Keys
+from nstools import Verify
 
 # set app path
 appPath = Path(sys.argv[0])
 while not appPath.is_dir():
     appPath = appPath.parents[0]
-appPath = os.path.abspath(appPath)
+appPath = Path(appPath).resolve().as_posix()
 print(f'[:INFO:] App Path: {appPath}')
 
-# set logs path
-# logs_dir = os.path.abspath(os.path.join(appPath, '..', 'logs'))
-# print(f'[:INFO:] Logs Path: {logs_dir}')
-
-import argparse
+# set args
 parser = argparse.ArgumentParser(formatter_class = argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument('-i', '--input',  help = 'input folder')
 parser.add_argument('-w', '--webhook-url', help = 'discord webhook url', required = False)
@@ -58,83 +51,45 @@ def send_hook(message_content: str = '', PadPrint: bool = False):
         pass
 
 def scan_folder():
-    ipath = os.path.abspath(INCP_PATH)
-    fname = os.path.basename(ipath).upper()
-
-    # lpath_badfolder = os.path.join(logs_dir, 'bad-folder.log')
-    # lpath_badname = os.path.join(logs_dir, 'bad-names.log')
-    # lpath_badfile = os.path.join(logs_dir, 'bad-file.log')
-
-    # if not os.path.exists(logs_dir):
-    #     os.makedirs(logs_dir)
+    ipath = Path(INCP_PATH).resolve().as_posix()
 
-    # if os.path.exists(lpath_badfolder):
-    #     os.remove(lpath_badfolder)
-    # if os.path.exists(lpath_badname):
-    #     os.remove(lpath_badname)
-    # if os.path.exists(lpath_badfile):
-    #     os.remove(lpath_badfile)
-
-    if not os.path.exists(ipath):
+    if not Path(ipath).exists():
         print(f'[:WARN:] Please put your files in "{ipath}" and run this script again.') 
         return
 
     files = list()
-    for item in sorted(os.listdir(ipath)):
-        item_path = os.path.join(ipath, item)
-        if not os.path.isfile(item_path):
+
+    for item in sorted(list(Path(ipath).iterdir())):
+        item_path = Path(item)
+        if not item_path.is_file() or item_path.is_symlink():
             continue
-        if not item.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
+        if not item_path.name.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
             continue
-        files.append(item)
+        files.append(item.as_posix())
 
     findex = 0
     for item in sorted(files):
-        item_path = os.path.join(ipath, item)
+        item_path = Path(item)
 
         findex += 1
-        send_hook(f'[:INFO:] File found ({findex} of {len(files)}): {item_path}', True)
+        send_hook(f'[:INFO:] File found ({findex} of {len(files)}): {item_path.name}', True)
         send_hook(f'[:INFO:] Checking filename...')
 
-        data = Verify.parse_name(item)
+        data = Verify.parse_name(item_path.name)
 
         if data is None:
-            send_hook(f'{item_path}: BAD NAME')
-            # with open(lpath_badname, 'a') as f:
-            #     f.write(f'{item_path}\n')
+            send_hook(f'{item_path.name}: BAD NAME')
 
-        # if data is not None and re.match(r'^BASE|UPD(ATE)?|DLC|XCI$', fname) is not None:
-        #     if item.lower().endswith(('.xci', '.xcz')):
-        #         iscart = True
-        #     else:
-        #         iscart = False
-        #     if fname == 'UPDATE':
-        #         fname = 'UPD'
-        #     if fname == 'BASE' and data['title_type'] != 'BASE' or fname == 'BASE' and iscart == True:
-        #         with open(lpath_badfolder, 'a') as f:
-        #             f.write(f'{item_path}\n')
-        #     if fname == 'UPD' and data['title_type'] != 'UPD' or fname == 'UPD' and iscart == True:
-        #         with open(lpath_badfolder, 'a') as f:
-        #             f.write(f'{item_path}\n')
-        #     if fname == 'DLC' and data['title_type'] != 'DLC' or fname == 'DLC' and iscart == True:
-        #         with open(lpath_badfolder, 'a') as f:
-        #             f.write(f'{item_path}\n')
-        #     if fname == 'XCI' and iscart == False:
-        #         with open(lpath_badfolder, 'a') as f:
-        #             f.write(f'{item_path}\n')
-
-        rootpath = os.path.dirname(item_path)
-        basename = os.path.basename(item_path)
+        rootpath = item_path.parent.as_posix()
+        basename = item_path.name
         basename = f'{basename[:-4]}-{basename[-3:]}-verify'
-        log_name = os.path.join(rootpath, basename)
+        log_name = Path(rootpath).joinpath(basename).as_posix()
 
         try:
             send_hook(f'[:INFO:] Verifying...')
-            nspTest, nspLog = Verify.verify(item_path)
+            nspTest, nspLog = Verify.verify(item_path.as_posix())
             if nspTest != True:
                 send_hook(f'{item_path}: BAD', True)
-                # with open(lpath_badfile, 'a') as f:
-                #     f.write(f'{item_path}\n')
             else:
                 send_hook(f'{item_path}: OK', True)
             if SAVE_VLOG == True:
@@ -147,7 +102,6 @@ def scan_folder():
         except Exception as e:
             send_hook(f'[:WARN:] An error occurred:\n{item_path}: {str(e)}')
 
-
 if __name__ == "__main__":
     if INCP_PATH:
         scan_folder()