diff --git a/verif.py b/verif.py index 1ad0732..327e689 100644 --- a/verif.py +++ b/verif.py @@ -18,6 +18,7 @@ except:pass import Config import Status +from pathlib import Path # # SET ENVIRONMENT # squirrel_dir=os.path.abspath(os.curdir) @@ -42,9 +43,12 @@ def verify(file): tmpfolder =os.path.join(dir,'tmp') feed='' buffer = 65536 - if filename.lower().endswith('.nsp') or filename.lower().endswith('.nsz'): + if filename.lower().endswith(('.nsp','.nsz')): f = Fs.Nsp(filename) - elif filename.lower().endswith('.xcz') or filename.lower().endswith('.xci'): + elif filename.lower().endswith('.xci'): + f = Fs.factory(Path(filename)) + f.open(filename, 'rb') + elif filename.lower().endswith('.xcz'): f = Fs.Xci(filename) else: raise Exception("{1} does not have the appropriate extension".format(filename)) @@ -63,9 +67,9 @@ def verify(file): f.close() return False print(filename) - if filename.endswith('.nsz') : + if filename.endswith('.nsz'): verdict,feed=f.nsz_hasher(buffer,headerlist,verdict,feed) - elif filename.endswith('.xcz') : + elif filename.endswith('.xcz'): verdict,feed=f.xcz_hasher(buffer,headerlist,verdict,feed) else: verdict,feed=f.verify_hash_nca(buffer,headerlist,verdict,feed)