nstools 1.2.2__tar.gz → 2.0.0b2__tar.gz

{nstools-1.2.2 → nstools-2.0.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nstools
-Version: 1.2.2
+Version: 2.0.0b2
 Home-page: https://github.com/seiya-dev/NSTools
 License: MIT
 Requires-Python: >=3.10
@@ -20,11 +20,11 @@ Dynamic: requires-python
 
 # 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/

{nstools-1.2.2 → nstools-2.0.0b2}/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/

nstools-2.0.0b2/ns_verify_folder.py

@@ -0,0 +1,110 @@
+#! /usr/bin/python3
+
+from pathlib import Path
+import argparse
+import requests
+import json
+import sys
+
+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 = Path(appPath).resolve().as_posix()
+print(f'[:INFO:] App Path: {appPath}')
+
+# 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)
+parser.add_argument('--save-log', help = 'save verify log', required = False, action='store_true')
+args = parser.parse_args()
+
+INCP_PATH = args.input
+WHOOK_URL = args.webhook_url
+SAVE_VLOG = bool(args.save_log)
+
+Keys.load_default()
+if not Keys.keys_loaded:
+    input('Press Enter to exit...')
+    sys.exit(1)
+
+def send_hook(message_content: str = '', PadPrint: bool = False):
+    if message_content == '':
+        return
+    try:
+        print_msg = message_content
+        if PadPrint == True:
+            print_msg = f'\n{message_content}'
+        print(print_msg)
+        payload = {
+            'username': 'Contributions',
+            'content': message_content.strip()
+        }
+        headers = {"Content-type": "application/json"}
+        response = requests.post(WHOOK_URL, data=json.dumps(payload), headers=headers)
+        response.raise_for_status()
+    except:
+        pass
+
+def scan_folder():
+    ipath = Path(INCP_PATH).resolve().as_posix()
+    
+    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(list(Path(ipath).iterdir())):
+        item_path = Path(item)
+        if not item_path.is_file() or item_path.is_symlink():
+            continue
+        if not item_path.name.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
+            continue
+        files.append(item.as_posix())
+    
+    findex = 0
+    for item in sorted(files):
+        item_path = Path(item)
+        
+        findex += 1
+        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_path.name)
+        
+        if data is None:
+            send_hook(f'{item_path.name}: BAD NAME')
+        
+        rootpath = item_path.parent.as_posix()
+        basename = item_path.name
+        basename = f'{basename[:-4]}-{basename[-3:]}-verify'
+        log_name = Path(rootpath).joinpath(basename).as_posix()
+        
+        try:
+            send_hook(f'[:INFO:] Verifying...')
+            nspTest, nspLog = Verify.verify(item_path.as_posix())
+            if nspTest != True:
+                send_hook(f'{item_path}: BAD', True)
+            else:
+                send_hook(f'{item_path}: OK', True)
+            if SAVE_VLOG == True:
+                if nspTest != True:
+                    with open(f'{log_name}-bad.log', 'w') as f:
+                        f.write(f'{nspLog}')
+                else:
+                    with open(f'{log_name}-ok.log', 'w') as f:
+                        f.write(f'{nspLog}')
+        except Exception as e:
+            send_hook(f'[:WARN:] An error occurred:\n{item_path}: {str(e)}')
+
+if __name__ == "__main__":
+    if INCP_PATH:
+        scan_folder()
+    else: 
+        parser.print_help()
+    print()

{nstools-1.2.2/nstools/lib → nstools-2.0.0b2/nstools}/FsCert.py

@@ -1,4 +1,4 @@
-import binascii
+from binascii import a2b_base64
 
 class PublicCert:
     def getPublic(ctype = None):
@@ -86,5 +86,5 @@ class PublicCert:
         }
         if ctype not in certlist:
             ctype = 'Tinfoil'
-        chain = bytearray(binascii.a2b_base64(certlist[ctype]))
+        chain = bytearray(a2b_base64(certlist[ctype]))
         return chain

nstools-2.0.0b2/nstools/FsNcz.py

@@ -0,0 +1,74 @@
+from binascii import hexlify as hx, unhexlify as uhx
+
+from nsz.nut import Keys
+from nsz.nut import Print
+
+from nsz.Fs import Type
+from nsz.Fs.File import File
+from nsz.Fs.Nca import NcaHeader as NczHeader
+
+class Ncz(File):
+    def __init__(self, path = None, mode = 'rb', cryptoType = -1, cryptoKey = -1, cryptoCounter = -1):
+        self.header = None
+        self.sectionFilesystems = []
+        self.sections = []
+        super(Ncz, self).__init__(path, mode, cryptoType, cryptoKey, cryptoCounter)
+    
+    def __iter__(self):
+        return self.sectionFilesystems.__iter__()
+    
+    def __getitem__(self, key):
+        return self.sectionFilesystems[key]
+    
+    def open(self, file = None, mode = 'rb', cryptoType = -1, cryptoKey = -1, cryptoCounter = -1, meta_only=False):
+        super(Ncz, self).open(file, mode, cryptoType, cryptoKey, cryptoCounter, meta_only)
+    
+        self.header = NczHeader()
+        self.partition(0x0, 0xC00, self.header, Type.Crypto.XTS, uhx(Keys.get('header_key')))
+        self.header.seek(0x400)
+    
+    def masterKey(self):
+        return max(self.header.cryptoType, self.header.cryptoType2)
+    
+    def buildId(self):
+        if self.header.contentType != Type.Content.PROGRAM:
+            return None
+        
+        try:
+            f = self[0]['main']
+            f.seek(0x40)
+            return hx(f.read(0x20)).decode('utf8').upper()
+        except IOError as e:
+            pass
+        except:
+            raise
+            return None
+    
+    def printInfo(self, maxDepth = 3, indent = 0):
+        tabs = '\t' * indent
+        Print.info('\n%sNCA Archive\n' % (tabs))
+        super(Ncz, self).printInfo(maxDepth, indent)
+        
+        Print.info(tabs + 'magic = ' + str(self.header.magic))
+        Print.info(tabs + 'titleId = ' + str(self.header.titleId))
+        Print.info(tabs + 'rightsId = ' + str(self.header.rightsId))
+        Print.info(tabs + 'isGameCard = ' + hex(self.header.isGameCard))
+        Print.info(tabs + 'contentType = ' + str(self.header.contentType))
+        Print.info(tabs + 'cryptoType = ' + str(self.cryptoType))
+        Print.info(tabs + 'Size: ' + str(self.header.size))
+        Print.info(tabs + 'crypto master key: ' + str(self.header.cryptoType))
+        Print.info(tabs + 'crypto master key2: ' + str(self.header.cryptoType2))
+        Print.info(tabs + 'key Index: ' + str(self.header.keyIndex))
+        #Print.info(tabs + 'key Block: ' + str(self.header.getKeyBlock()))
+        for key in self.header.keys:
+            if key:
+                Print.info(tabs + 'key Block: ' + str(hx(key)))
+        
+        if(indent+1 < maxDepth):
+            Print.info('\n%sPartitions:' % (tabs))
+            
+            for s in self:
+                s.printInfo(maxDepth, indent+1)
+        
+        if self.header.contentType == Type.Content.PROGRAM:
+            Print.info(tabs + 'build Id: ' + str(self.buildId()))

{nstools-1.2.2/nstools/lib → nstools-2.0.0b2/nstools}/FsTools.py

@@ -1,12 +1,12 @@
 from binascii import hexlify as hx, unhexlify as uhx
 from hashlib import sha256, sha1
-
 from copy import copy
-from . import FsNcaMod
+
+from .FsNcz import Ncz
 
 def get_ncz_data(src_nca):
     nca = copy(src_nca)
-    nca = FsNcaMod.Nca(nca)
+    nca = Ncz(nca)
     return nca
 
 def get_data_from_cnmt(nca):

{nstools-1.2.2/nstools/lib → nstools-2.0.0b2/nstools}/PathTools.py

@@ -13,7 +13,6 @@ def expandFiles(path):
 			f = path.joinpath(f)
 			files.append(f)
 	return files
-	
 
 def isGame(filePath):
 	return filePath.suffix == '.nsp' or filePath.suffix == '.xci' or filePath.suffix == '.nsz' or filePath.suffix == '.xcz'

{nstools-1.2.2/nstools/lib → nstools-2.0.0b2/nstools}/Verify.py

@@ -1,29 +1,25 @@
+from os.path import basename as fsBasename, abspath as fsAbsPath
 from binascii import hexlify as hx, unhexlify as uhx
-from hashlib import sha256, sha1
+from re import search as re_search
+from hashlib import sha256
+from pathlib import Path
 
-import os
-import sys
-import re
+from zstandard import ZstdDecompressor
+from enlighten import Counter as pb_Counter
 
-from pathlib import Path
+from nsz import Header, BlockDecompressorReader
+from nsz.Fs import factory
+from nsz.Fs import Xci, Nsp
+from nsz.Fs import Nca, Ticket
+from nsz.Fs import Type
 
 from . import FsTools
 from . import VerifyTools
-from . import Header, BlockDecompressorReader
 from .FsCert import PublicCert
 
-import zstandard
-import enlighten
-
-from nstools.Fs import factory
-from nstools.Fs import Xci, Nsp
-from nstools.Fs import Nca, Ticket
-from nstools.Fs import Type
-
-
 def parse_name(file: str):
-    res_id = re.search(r'(?P<title_id>\[0100[A-F0-9]{12}\])', file)
-    res_ver = re.search(r'(?P<version>\[v\d+\])', file)
+    res_id = re_search(r'(?P<title_id>\[0100[A-F0-9]{12}\])', file)
+    res_ver = re_search(r'(?P<version>\[v\d+\])', file)
     
     if res_id is None or res_ver is None:
         return None
@@ -68,7 +64,7 @@ def verify(file: str, vlevel: int = 3):
         vlevel = 3
     
     try:
-        filename = os.path.abspath(file)
+        filename = fsAbsPath(file)
         
         check = True
         vmsg = list()
@@ -100,7 +96,7 @@ def verify(file: str, vlevel: int = 3):
         f.flush()
         f.close()
         
-        outlog = os.path.basename(file) + '\n'
+        outlog = fsBasename(file) + '\n'
         outlog += '\n'.join(vmsg) + '\n'
         
         return check, outlog
@@ -192,7 +188,7 @@ def verify_decrypt(nspx, vmsg = None):
                         vmsg.append(tvmsg)
                         if f.header.contentType != Type.Content.PROGRAM:
                             correct = VerifyTools.verify_enforcer(f)
-                            if correct == True and f.header.contentType == Type.Content.PUBLIC_DATA and f.header.getRightsId() == 0:
+                            if correct == True and f.header.contentType == Type.Content.PUBLICDATA and f.header.getRightsId() == 0:
                                 correct = VerifyTools.pr_noenc_check_dlc(f)
                                 if correct == False:
                                     bad_dec = True
@@ -571,7 +567,7 @@ def verify_hash(nspx, headerlist, vmsg = None):
             counter = 0
             mbDiv = 1048576
             BAR_FMT = u'{desc}{desc_pad}{percentage:3.0f}%|{bar}| {count:{len_total}d}/{total:d} {unit} [{elapsed}<{eta}, {rate:.2f}{unit_pad}{unit}/s]'
-            bar = enlighten.Counter(total = nca_size//mbDiv, desc='Hashing', unit='MiB', color='red', bar_format=BAR_FMT)
+            bar = pb_Counter(total = nca_size//mbDiv, desc='Hashing', unit='MiB', color='red', bar_format=BAR_FMT)
             
             i = 0
             f.rewind();
@@ -651,7 +647,7 @@ def verify_hash(nspx, headerlist, vmsg = None):
             counter = 0
             mbDiv = 1048576
             BAR_FMT = u'{desc}{desc_pad}{percentage:3.0f}%|{bar}| {count:{len_total}d}/{total:d} {unit} [{elapsed}<{eta}, {rate:.2f}{unit_pad}{unit}/s]'
-            bar = enlighten.Counter(total = nca_size//mbDiv, desc='Hashing', unit='MiB', color='red', bar_format=BAR_FMT)
+            bar = pb_Counter(total = nca_size//mbDiv, desc='Hashing', unit='MiB', color='red', bar_format=BAR_FMT)
             
             i = 0
             f.rewind();
@@ -704,7 +700,7 @@ def verify_hash(nspx, headerlist, vmsg = None):
             pos = f.tell()
             
             if not useBlockCompression:
-                decompressor = zstandard.ZstdDecompressor().stream_reader(f)
+                decompressor = ZstdDecompressor().stream_reader(f)
             
             spsize = 0
             

{nstools-1.2.2/nstools/lib → nstools-2.0.0b2/nstools}/VerifyTools.py

@@ -7,24 +7,20 @@ from Crypto.Util import Counter
 from Crypto.PublicKey import RSA
 from Crypto.Signature import PKCS1_v1_5, PKCS1_PSS
 
-import io
+from zstandard import ZstdDecompressor
 
-from nstools.nut import Hex
-from nstools.nut import Keys
-from nstools.nut import aes128
+from nsz import Header, BlockDecompressorReader
+from nsz.nut import Hex
+from nsz.nut import Keys
+from nsz.nut import aes128
+from nsz.Fs import Type
+from nsz.Fs import File
+from nsz.Fs import Nca
+from nsz.Fs import Ticket
 
 from . import FsTools
-from . import Header, BlockDecompressorReader
 from .NcaKeys import getNcaModulusKey
 
-import zstandard
-
-from nstools.Fs import Type
-from nstools.Fs import File
-from nstools.Fs import Nca
-from nstools.Fs import Ticket
-
-
 RSA_PUBLIC_EXPONENT = 0x10001
 FS_HEADER_LENGTH = 0x200
 UNCOMPRESSABLE_HEADER_SIZE = 0x4000
@@ -136,7 +132,7 @@ def verify_ncz(self, target):
             pos = f.tell()
             
             if not useBlockCompression:
-                decompressor = zstandard.ZstdDecompressor().stream_reader(f)
+                decompressor = ZstdDecompressor().stream_reader(f)
             
             count = 0
             checkstarter = 0

{nstools-1.2.2 → nstools-2.0.0b2}/nstools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nstools
-Version: 1.2.2
+Version: 2.0.0b2
 Home-page: https://github.com/seiya-dev/NSTools
 License: MIT
 Requires-Python: >=3.10
@@ -20,11 +20,11 @@ Dynamic: requires-python
 
 # 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/

nstools-2.0.0b2/nstools.egg-info/SOURCES.txt

@@ -0,0 +1,21 @@
+LICENSE.md
+README.md
+ns_verify_folder.py
+setup.py
+bin/ns-verify-folder
+bin/ns-verify-folder-log
+bin/ns-verify-folder-log.bat
+bin/ns-verify-folder.bat
+nstools/FsCert.py
+nstools/FsNcz.py
+nstools/FsTools.py
+nstools/NcaKeys.py
+nstools/PathTools.py
+nstools/Verify.py
+nstools/VerifyTools.py
+nstools.egg-info/PKG-INFO
+nstools.egg-info/SOURCES.txt
+nstools.egg-info/dependency_links.txt
+nstools.egg-info/requires.txt
+nstools.egg-info/top_level.txt
+nstools.egg-info/zip-safe

{nstools-1.2.2 → nstools-2.0.0b2}/setup.py

@@ -16,7 +16,7 @@ if readmePath.is_file():
 
 setuptools.setup(
     name = 'nstools',
-    version = '1.2.2',
+    version = '2.0.0b2',
     url = 'https://github.com/seiya-dev/NSTools',
     long_description = long_description,
     long_description_content_type = 'text/markdown',
@@ -31,11 +31,10 @@ setuptools.setup(
     ],
     
     packages = [
-        'nstools.Fs',
-        'nstools.nut',
-        'nstools.lib',
+        'nstools',
     ],
     install_requires = [
+        # 'nsz @ git+https://github.com/nicoboss/nsz.git@...', # use requirements.txt
         'zstandard',
         'enlighten',
         'requests',

nstools-1.2.2/ns_verify_folder.py

@@ -1,156 +0,0 @@
-#! /usr/bin/python3
-
-import os
-import sys
-import json
-import requests
-import re
-
-from pathlib import Path
-
-from nstools.nut import Keys
-
-from nstools.lib import Verify
-
-# set app path
-appPath = Path(sys.argv[0])
-while not appPath.is_dir():
-    appPath = appPath.parents[0]
-appPath = os.path.abspath(appPath)
-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
-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)
-parser.add_argument('--save-log', help = 'save verify log', required = False, action='store_true')
-args = parser.parse_args()
-
-INCP_PATH = args.input
-WHOOK_URL = args.webhook_url
-SAVE_VLOG = bool(args.save_log)
-
-Keys.load_default()
-if not Keys.keys_loaded:
-    input('Press Enter to exit...')
-    sys.exit(1)
-
-def send_hook(message_content: str = '', PadPrint: bool = False):
-    if message_content == '':
-        return
-    try:
-        print_msg = message_content
-        if PadPrint == True:
-            print_msg = f'\n{message_content}'
-        print(print_msg)
-        payload = {
-            'username': 'Contributions',
-            'content': message_content.strip()
-        }
-        headers = {"Content-type": "application/json"}
-        response = requests.post(WHOOK_URL, data=json.dumps(payload), headers=headers)
-        response.raise_for_status()
-    except:
-        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)
-    
-    # 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):
-        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):
-            continue
-        if not item.lower().endswith(('.xci', '.xcz', '.nsp', '.nsz')):
-            continue
-        files.append(item)
-    
-    findex = 0
-    for item in sorted(files):
-        item_path = os.path.join(ipath, item)
-        
-        findex += 1
-        send_hook(f'[:INFO:] File found ({findex} of {len(files)}): {item_path}', True)
-        send_hook(f'[:INFO:] Checking filename...')
-        
-        data = Verify.parse_name(item)
-        
-        if data is None:
-            send_hook(f'{item_path}: BAD NAME')
-            # with open(lpath_badname, 'a') as f:
-            #     f.write(f'{item_path}\n')
-        
-        # 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)
-        basename = f'{basename[:-4]}-{basename[-3:]}-verify'
-        log_name = os.path.join(rootpath, basename)
-        
-        try:
-            send_hook(f'[:INFO:] Verifying...')
-            nspTest, nspLog = Verify.verify(item_path)
-            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:
-                if nspTest != True:
-                    with open(f'{log_name}-bad.log', 'w') as f:
-                        f.write(f'{nspLog}')
-                else:
-                    with open(f'{log_name}-ok.log', 'w') as f:
-                        f.write(f'{nspLog}')
-        except Exception as e:
-            send_hook(f'[:WARN:] An error occurred:\n{item_path}: {str(e)}')
-
-
-if __name__ == "__main__":
-    if INCP_PATH:
-        scan_folder()
-    else: 
-        parser.print_help()
-    print()