Skip to content

Commit ddade31

Browse files
committed
Small update ^_^
1 parent 5a4bf24 commit ddade31

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

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

pyfoxfile.py

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6499,16 +6499,29 @@ def AppendFilesWithContentToList(infiles, dirlistfromtxt=False, extradata=[], js
64996499
advancedlist = __use_advanced_list__
65006500
altinode = __use_alt_inode__
65016501
infilelist = []
6502-
if(infiles == "-"):
6502+
if(not dirlistfromtxt and not isinstance(infiles, (list, tuple, )) and infiles == "-"):
65036503
for line in PY_STDIN_TEXT:
65046504
infilelist.append(line.strip())
65056505
infilelist = list(filter(None, infilelist))
6506-
elif(infiles != "-" and dirlistfromtxt and os.path.exists(infiles) and (os.path.isfile(infiles) or infiles == os.devnull)):
6507-
if(not os.path.exists(infiles) or not os.path.isfile(infiles)):
6508-
return False
6509-
with UncompressFile(infiles, formatspecs, "r") as finfile:
6510-
for line in finfile:
6511-
infilelist.append(line.strip())
6506+
if(not dirlistfromtxt and isinstance(infiles, (list, tuple, )) and len(infiles)==1 and infiles[0] == "-"):
6507+
for line in PY_STDIN_TEXT:
6508+
infilelist.append(line.strip())
6509+
infilelist = list(filter(None, infilelist))
6510+
elif(dirlistfromtxt):
6511+
if(not isinstance(infiles, (list, tuple, ))):
6512+
infiles = [infiles]
6513+
if(isinstance(infiles, (list, tuple, ))):
6514+
for fileloc in infiles:
6515+
if(fileloc == "-"):
6516+
for line in PY_STDIN_TEXT:
6517+
infilelist.append(line.strip())
6518+
else:
6519+
if(not os.path.exists(fileloc) or not os.path.isfile(fileloc)):
6520+
return False
6521+
else:
6522+
with UncompressFile(fileloc, formatspecs, "r") as finfile:
6523+
for line in finfile:
6524+
infilelist.append(line.strip())
65126525
infilelist = list(filter(None, infilelist))
65136526
else:
65146527
if(isinstance(infiles, (list, tuple, ))):
@@ -6844,7 +6857,7 @@ def AppendFilesWithContentFromTarFileToList(infile, extradata=[], jsondata={}, c
68446857
inodetofile = {}
68456858
filetoinode = {}
68466859
inodetoforminode = {}
6847-
if(infile == "-"):
6860+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
68486861
infile = MkTempFile()
68496862
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
68506863
infile.seek(0, 0)
@@ -7070,7 +7083,7 @@ def AppendFilesWithContentFromZipFileToList(infile, extradata=[], jsondata={}, c
70707083
inodetofile = {}
70717084
filetoinode = {}
70727085
inodetoforminode = {}
7073-
if(infile == "-"):
7086+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
70747087
infile = MkTempFile()
70757088
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
70767089
infile.seek(0, 0)
@@ -10200,7 +10213,7 @@ def FoxFileValidate(infile, fmttype="auto", filestart=0, formatspecs=__file_form
1020010213
if(not fp):
1020110214
return False
1020210215
fp.seek(filestart, 0)
10203-
elif(infile == "-"):
10216+
elif(not isinstance(infile, (list, tuple, )) and infile == "-"):
1020410217
fp = MkTempFile()
1020510218
shutil.copyfileobj(PY_STDIN_BUF, fp, length=__filebuff_size__)
1020610219
fp.seek(filestart, 0)
@@ -11577,7 +11590,7 @@ def FoxFileStringListFiles(instr, filestart=0, seekstart=0, seekend=0, skipcheck
1157711590

1157811591

1157911592
def TarFileListFiles(infile, verbose=False, returnfp=False):
11580-
if(infile == "-"):
11593+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1158111594
infile = MkTempFile()
1158211595
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1158311596
infile.seek(0, 0)
@@ -11693,7 +11706,7 @@ def TarFileListFiles(infile, verbose=False, returnfp=False):
1169311706

1169411707

1169511708
def ZipFileListFiles(infile, verbose=False, returnfp=False):
11696-
if(infile == "-"):
11709+
if(not isinstance(infile, (list, tuple, )) and infile == "-"):
1169711710
infile = MkTempFile()
1169811711
shutil.copyfileobj(PY_STDIN_BUF, infile, length=__filebuff_size__)
1169911712
infile.seek(0, 0)

0 commit comments

Comments
 (0)