Skip to content

Commit 5111565

Browse files
committed
Small update ^_^
1 parent 08d9289 commit 5111565

2 files changed

Lines changed: 26 additions & 13 deletions

File tree

archivefile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def handler(signum, frame):
108108
# Version information
109109
argparser.add_argument("-V", "--version", action="version", version=__program_name__ + " " + __version__)
110110
# Input and output specifications
111-
argparser.add_argument("-i", "--input", help="Specify the file(s) to concatenate or the archive file to extract.", required=True)
111+
argparser.add_argument("-i", "--input", nargs="+", help="Specify the file(s) to concatenate or the archive file to extract.", required=True)
112112
argparser.add_argument("-o", "--output", default=None, help="Specify the name for the extracted or output archive files.")
113113
# Operations
114114
argparser.add_argument("-c", "--create", action="store_true", help="Perform only the concatenation operation.")

pyarchivefile.py

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6492,16 +6492,29 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
64926492
advancedlist = __use_advanced_list__
64936493
altinode = __use_alt_inode__
64946494
infilelist = []
6495-
if(infiles == "-"):
6495+
if(not dirlistfromtxt and not isinstance(infiles, (list, tuple, )) and infiles == "-"):
64966496
for line in PY_STDIN_TEXT:
64976497
infilelist.append(line.strip())
64986498
infilelist = list(filter(None, infilelist))
6499-
elif(infiles != "-" and dirlistfromtxt and os.path.exists(infiles) and (os.path.isfile(infiles) or infiles == os.devnull)):
6500-
if(not os.path.exists(infiles) or not os.path.isfile(infiles)):
6501-
return False
6502-
with UncompressFile(infiles, formatspecs, "r") as finfile:
6503-
for line in finfile:
6504-
infilelist.append(line.strip())
6499+
if(not dirlistfromtxt and isinstance(infiles, (list, tuple, )) and len(infiles)==1 and infiles[0] == "-"):
6500+
for line in PY_STDIN_TEXT:
6501+
infilelist.append(line.strip())
6502+
infilelist = list(filter(None, infilelist))
6503+
elif(dirlistfromtxt):
6504+
if(not isinstance(infiles, (list, tuple, ))):
6505+
infiles = [infiles]
6506+
if(isinstance(infiles, (list, tuple, ))):
6507+
for fileloc in infiles:
6508+
if(fileloc == "-"):
6509+
for line in PY_STDIN_TEXT:
6510+
infilelist.append(line.strip())
6511+
else:
6512+
if(not os.path.exists(fileloc) or not os.path.isfile(fileloc)):
6513+
return False
6514+
else:
6515+
with UncompressFile(fileloc, formatspecs, "r") as finfile:
6516+
for line in finfile:
6517+
infilelist.append(line.strip())
65056518
infilelist = list(filter(None, infilelist))
65066519
else:
65076520
if(isinstance(infiles, (list, tuple, ))):
@@ -6837,7 +6850,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
68376850
inodetofile = {}
68386851
filetoinode = {}
68396852
inodetoforminode = {}
6840-
if(infile == "-"):
6853+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
68416854
infile = MkTempFile()
68426855
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
68436856
infile.seek(0, 0)
@@ -7063,7 +7076,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70637076
inodetofile = {}
70647077
filetoinode = {}
70657078
inodetoforminode = {}
7066-
if(infile == "-"):
7079+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
70677080
infile = MkTempFile()
70687081
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
70697082
infile.seek(0, 0)
@@ -10193,7 +10206,7 @@ def ArchiveFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_
1019310206
if(not fp):
1019410207
return False
1019510208
fp.seek(filestart, 0)
10196-
elif(infile == "-"):
10209+
elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
1019710210
fp = MkTempFile()
1019810211
shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
1019910212
fp.seek(filestart, 0)
@@ -11570,7 +11583,7 @@ def ArchiveFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipc
1157011583

1157111584

1157211585
def TarFileListFiles(infile, verbose=False, returnfp=False):
11573-
if(infile == "-"):
11586+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1157411587
infile = MkTempFile()
1157511588
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1157611589
infile.seek(0, 0)
@@ -11686,7 +11699,7 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
1168611699

1168711700

1168811701
def ZipFileListFiles(infile, verbose=False, returnfp=False):
11689-
if(infile == "-"):
11702+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1169011703
infile = MkTempFile()
1169111704
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1169211705
infile.seek(0, 0)

0 commit comments

Comments
 (0)