From c450aafda8f4d5a29a3acd5a356d4e847a044fdb Mon Sep 17 00:00:00 2001 From: Kazuki Suzuki Przyborowski Date: Mon, 29 Apr 2024 17:23:29 -0500 Subject: [PATCH] Add files via upload --- catfile.py | 70 +++++++++++++++++------------------------------------------- pycatfile.py | 54 +--------------------------------------------- 2 files changed, 21 insertions(+), 103 deletions(-) diff --git a/catfile.py b/catfile.py index 5535360..d575c15 100755 --- a/catfile.py +++ b/catfile.py @@ -118,17 +118,11 @@ should_validate = getargs.validate; if should_create: if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamelist, True); - if(checkcompressfile=="tarfile"): - pycatfile.PackArchiveFileFromTarFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="zipfile"): - pycatfile.PackArchiveFileFromZipFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="catfile"): - pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); - elif(rarfile_support and checkcompressfile=="rarfile"): - pycatfile.PackArchiveFileFromRarFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(py7zr_support and checkcompressfile=="7zipfile"): - pycatfile.PackArchiveFileFromSevenZipFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(checkcompressfile=="catfile"): + tmpout = pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); else: + tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(not tmpout): sys.exit(1); else: pycatfile.PackArchiveFile(getargs.input, getargs.output, getargs.text, getargs.compression, getargs.level, False, getargs.checksum, [], fnamelist, getargs.verbose, False); @@ -136,17 +130,11 @@ if should_create: elif should_repack: if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamelist, True); - if(checkcompressfile=="tarfile"): - pycatfile.PackArchiveFileFromTarFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="zipfile"): - pycatfile.PackArchiveFileFromZipFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="catfile"): + if(checkcompressfile=="catfile"): pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); - elif(rarfile_support and checkcompressfile=="rarfile"): - pycatfile.PackArchiveFileFromRarFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(py7zr_support and checkcompressfile=="7zipfile"): - pycatfile.PackArchiveFileFromSevenZipFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); else: + pycatfile.PackArchiveFileFromInFile(getargs.input, getargs.output, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(not tmpout): sys.exit(1); else: pycatfile.RePackArchiveFile(getargs.input, getargs.output, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); @@ -155,17 +143,11 @@ elif should_extract: if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamelist, True); tempout = BytesIO(); - if(checkcompressfile=="tarfile"): - pycatfile.PackArchiveFileFromTarFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="zipfile"): - pycatfile.PackArchiveFileFromZipFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="catfile"): - pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); - elif(rarfile_support and checkcompressfile=="rarfile"): - pycatfile.PackArchiveFileFromRarFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(py7zr_support and checkcompressfile=="7zipfile"): - pycatfile.PackArchiveFileFromSevenZipFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(checkcompressfile=="catfile"): + tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); else: + tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(not tmpout): sys.exit(1); getargs.input = tempout; pycatfile.UnPackArchiveFile(getargs.input, getargs.output, False, 0, 0, getargs.skipchecksum, fnamelist, getargs.verbose, getargs.preserve, getargs.preserve, False); @@ -173,17 +155,11 @@ elif should_extract: elif should_list: if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamelist, True); - if(checkcompressfile=="tarfile"): - pycatfile.TarFileListFiles(getargs.input, getargs.verbose, False); - elif(checkcompressfile=="zipfile"): - pycatfile.ZipFileListFiles(getargs.input, getargs.verbose, False); - elif(checkcompressfile=="catfile"): - pycatfile.ArchiveFileListFiles(getargs.input, 0, 0, getargs.skipchecksum, fnamelist, getargs.verbose, False); - elif(rarfile_support and checkcompressfile=="rarfile"): - pycatfile.RarFileListFiles(getargs.input, getargs.verbose, False); - elif(py7zr_support and checkcompressfile=="7zipfile"): - pycatfile.SevenZipFileListFiles(getargs.input, getargs.verbose, False); + if(checkcompressfile=="catfile"): + tmpout = pycatfile.ArchiveFileListFiles(getargs.input, 0, 0, getargs.skipchecksum, fnamelist, getargs.verbose, False); else: + tmpout = pycatfile.InFileListFiles(getargs.input, getargs.verbose, False); + if(not tmpout): sys.exit(1); else: pycatfile.ArchiveFileListFiles(getargs.input, 0, 0, getargs.skipchecksum, fnamelist, getargs.verbose, False); @@ -192,19 +168,13 @@ elif should_validate: if getargs.convert: checkcompressfile = pycatfile.CheckCompressionSubType(getargs.input, fnamelist, True); tempout = BytesIO(); - if(checkcompressfile=="tarfile"): - pycatfile.PackArchiveFileFromTarFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="zipfile"): - pycatfile.PackArchiveFileFromZipFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(checkcompressfile=="catfile"): - pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); - elif(rarfile_support and checkcompressfile=="rarfile"): - pycatfile.PackArchiveFileFromRarFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); - elif(py7zr_support and checkcompressfile=="7zipfile"): - pycatfile.PackArchiveFileFromSevenZipFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); + if(checkcompressfile=="catfile"): + tmpout = pycatfile.RePackArchiveFile(getargs.input, tempout, getargs.compression, getargs.level, False, 0, 0, getargs.checksum, getargs.skipchecksum, [], fnamelist, getargs.verbose, False); else: - sys.exit(1); + tmpout = pycatfile.PackArchiveFileFromInFile(getargs.input, tempout, getargs.compression, getargs.level, getargs.checksum, [], fnamelist, getargs.verbose, False); getargs.input = tempout; + if(not tmpout): + sys.exit(1); fvalid = pycatfile.ArchiveFileValidate(getargs.input, fnamelist, getargs.verbose, False); if(not getargs.verbose): import sys, logging; diff --git a/pycatfile.py b/pycatfile.py index 1e7ea57..81a06ad 100755 --- a/pycatfile.py +++ b/pycatfile.py @@ -7245,58 +7245,6 @@ def ArchiveFileStringListFiles(catstr, seekstart=0, seekend=0, skipchecksum=Fals create_alias_function("", __file_format_name__, "StringListFiles", ArchiveFileListFiles); -def ArchiveFileListFilesAlt(infile, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_list__, verbose=False, returnfp=False): - logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG); - if(isinstance(infile, dict)): - listcatfiles = infile; - else: - if(infile!="-" and not hasattr(infile, "read") and not hasattr(infile, "write")): - infile = RemoveWindowsPath(infile); - listcatfiles = ArchiveFileToArray(infile, seekstart, seekend, True, skipchecksum, formatspecs, returnfp); - if(not listcatfiles): - return False; - lenlist = len(listcatfiles['ffilelist']); - fnumfiles = int(listcatfiles['fnumfiles']); - lcfi = 0; - lcfx = int(listcatfiles['fnumfiles']); - if(lenlist>listcatfiles['fnumfiles'] or lenlist " + listcatfiles['ffilelist'][lcfi]['flinkname']; - fuprint = listcatfiles['ffilelist'][lcfi]['funame']; - if(len(fuprint)<=0): - fuprint = listcatfiles['ffilelist'][lcfi]['fuid']; - fgprint = listcatfiles['ffilelist'][lcfi]['fgname']; - if(len(fgprint)<=0): - fgprint = listcatfiles['ffilelist'][lcfi]['fgid']; - VerbosePrintOut(PrintPermissionString(listcatfiles['ffilelist'][lcfi]['fmode'], listcatfiles['ffilelist'][lcfi]['ftype']) + " " + str(str(fuprint) + "/" + str(fgprint) + " " + str(listcatfiles['ffilelist'][lcfi]['fsize']).rjust(15) + " " + datetime.datetime.utcfromtimestamp(listcatfiles['ffilelist'][lcfi]['fmtime']).strftime('%Y-%m-%d %H:%M') + " " + printfname)); - lcfi = lcfi + 1; - if(returnfp): - return listcatfiles['catfp']; - else: - return True; - -create_alias_function("", __file_format_name__, "ListFilesAlt", ArchiveFileListFilesAlt); - -def ArchiveFileStringListFilesAlt(catstr, seekstart=0, seekend=0, skipchecksum=False, formatspecs=__file_format_list__, verbose=False, returnfp=False): - catfp = BytesIO(catstr); - listcatfiles = ArchiveFileListFilesAlt(catstr, seekstart, seekend, skipchecksum, formatspecs, verbose, returnfp); - return listcatfiles; - -create_alias_function("", __file_format_name__, "StringListFilesAlt", ArchiveFileListFilesAlt); - def TarFileListFiles(infile, verbose=False, returnfp=False): logging.basicConfig(format="%(message)s", stream=sys.stdout, level=logging.DEBUG); if(infile=="-"): @@ -7760,7 +7708,7 @@ def InFileListFiles(infile, verbose=False, formatspecs=__file_format_list__, ret elif(checkcompressfile=="zipfile"): return ZipFileListFiles(infile, verbose, returnfp); elif(checkcompressfile=="catfile"): - return ArchiveFileListFilesAlt(infile, 0, 0, False, formatspecs, verbose, returnfp); + return ArchiveFileListFiles(infile, 0, 0, False, formatspecs, verbose, returnfp); elif(rarfile_support and checkcompressfile=="rarfile"): return RarFileListFiles(infile, verbose, returnfp); elif(py7zr_support and checkcompressfile=="7zipfile"): -- 2.11.4.GIT