reworked processList
This commit is contained in:
parent
f5ba071bf5
commit
587945364e
|
@ -83,10 +83,9 @@ def processList(values):
|
||||||
Processes the file for directories and iterates through by setting values.file and calling addBurst.
|
Processes the file for directories and iterates through by setting values.file and calling addBurst.
|
||||||
"""
|
"""
|
||||||
with open(values.listfile, "r") as listfile:
|
with open(values.listfile, "r") as listfile:
|
||||||
dirs = listfile.readlines()
|
files = listfile.readlines()
|
||||||
for dir in dirs:
|
for file in files:
|
||||||
dataName = path.dirname(dir[:-1]) #strip the trailing slash for dirname
|
values.file = file
|
||||||
values.file = path.join(dir,dataName+".fil")
|
|
||||||
addBurst(values)
|
addBurst(values)
|
||||||
|
|
||||||
def processDir(values, fileList):
|
def processDir(values, fileList):
|
||||||
|
@ -269,7 +268,7 @@ if __name__ == "__main__":
|
||||||
else:
|
else:
|
||||||
addBurst(values)
|
addBurst(values)
|
||||||
elif values.listfile is not None: #list of files
|
elif values.listfile is not None: #list of files
|
||||||
logging.info(f"Looking for directories in file {values.listfile}")
|
logging.info(f"Looking for filenames in file {values.listfile}")
|
||||||
processList(values)
|
processList(values)
|
||||||
elif values.fileDir is not None: #directory
|
elif values.fileDir is not None: #directory
|
||||||
filePaths = [f for f in listdir(values.fileDir) if f.endswith(".fil")]
|
filePaths = [f for f in listdir(values.fileDir) if f.endswith(".fil")]
|
||||||
|
|
Loading…
Reference in a new issue