Skip to content

Commit 0d7278f

Browse files
committed
Small update ^_^
1 parent 54c174e commit 0d7278f

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

catfile.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.")

pycatfile.py

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6498,16 +6498,29 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
64986498
advancedlist = __use_advanced_list__
64996499
altinode = __use_alt_inode__
65006500
infilelist = []
6501-
if(infiles == "-"):
6501+
if(not dirlistfromtxt and not isinstance(infiles, (list, tuple, )) and infiles == "-"):
65026502
for line in PY_STDIN_TEXT:
65036503
infilelist.append(line.strip())
65046504
infilelist = list(filter(None, infilelist))
6505-
elif(infiles != "-" and dirlistfromtxt and os.path.exists(infiles) and (os.path.isfile(infiles) or infiles == os.devnull)):
6506-
if(not os.path.exists(infiles) or not os.path.isfile(infiles)):
6507-
return False
6508-
with UncompressFile(infiles, formatspecs, "r") as finfile:
6509-
for line in finfile:
6510-
infilelist.append(line.strip())
6505+
if(not dirlistfromtxt and isinstance(infiles, (list, tuple, )) and len(infiles)==1 and infiles[0] == "-"):
6506+
for line in PY_STDIN_TEXT:
6507+
infilelist.append(line.strip())
6508+
infilelist = list(filter(None, infilelist))
6509+
elif(dirlistfromtxt):
6510+
if(not isinstance(infiles, (list, tuple, ))):
6511+
infiles = [infiles]
6512+
if(isinstance(infiles, (list, tuple, ))):
6513+
for fileloc in infiles:
6514+
if(fileloc == "-"):
6515+
for line in PY_STDIN_TEXT:
6516+
infilelist.append(line.strip())
6517+
else:
6518+
if(not os.path.exists(fileloc) or not os.path.isfile(fileloc)):
6519+
return False
6520+
else:
6521+
with UncompressFile(fileloc, formatspecs, "r") as finfile:
6522+
for line in finfile:
6523+
infilelist.append(line.strip())
65116524
infilelist = list(filter(None, infilelist))
65126525
else:
65136526
if(isinstance(infiles, (list, tuple, ))):
@@ -6843,7 +6856,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
68436856
inodetofile = {}
68446857
filetoinode = {}
68456858
inodetoforminode = {}
6846-
if(infile == "-"):
6859+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
68476860
infile = MkTempFile()
68486861
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
68496862
infile.seek(0, 0)
@@ -7069,7 +7082,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70697082
inodetofile = {}
70707083
filetoinode = {}
70717084
inodetoforminode = {}
7072-
if(infile == "-"):
7085+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
70737086
infile = MkTempFile()
70747087
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
70757088
infile.seek(0, 0)
@@ -10199,7 +10212,7 @@ def CatFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1019910212
if(not fp):
1020010213
return False
1020110214
fp.seek(filestart, 0)
10202-
elif(infile == "-"):
10215+
elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
1020310216
fp = MkTempFile()
1020410217
shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
1020510218
fp.seek(filestart, 0)
@@ -11576,7 +11589,7 @@ def CatFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
1157611589

1157711590

1157811591
def TarFileListFiles(infile, verbose=False, returnfp=False):
11579-
if(infile == "-"):
11592+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1158011593
infile = MkTempFile()
1158111594
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1158211595
infile.seek(0, 0)
@@ -11692,7 +11705,7 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
1169211705

1169311706

1169411707
def ZipFileListFiles(infile, verbose=False, returnfp=False):
11695-
if(infile == "-"):
11708+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1169611709
infile = MkTempFile()
1169711710
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1169811711
infile.seek(0, 0)

0 commit comments

Comments
 (0)