sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: fix the split output files root dir

Browse Source 
If the output file path is a relative path, the split
tool will create the output file under the input file path.
But the expected behavior for this case is the output file
should be relative to the current directory. This patch will
fix this bug.

If the output file path is not specified and output prefix is not
specified, the output file should be under the input file path

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Acked-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
This commit is contained in:
Bob Feng
2021-02-01 18:28:58 +08:00
committed by mergify[bot]
parent 0d96664df3
commit 43a113385e
2 changed files with 86 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
BaseTools/Source/Python/Split/Split.py
View File

@ -92,6 +92,27 @@ def getFileSize(filename):
return length
def getoutputfileabs(inputfile, prefix, outputfile,index):
inputfile = os.path.abspath(inputfile)
if outputfile is None:
if prefix is None:
outputfileabs = os.path.join(os.path.dirname(inputfile), "{}{}".format(os.path.basename(inputfile),index))
else:
if os.path.isabs(prefix):
outputfileabs = os.path.join(prefix, "{}{}".format(os.path.basename(inputfile),index))
else:
outputfileabs = os.path.join(os.getcwd(), prefix, "{}{}".format(os.path.basename(inputfile),index))
elif not os.path.isabs(outputfile):
if prefix is None:
outputfileabs = os.path.join(os.getcwd(), outputfile)
else:
if os.path.isabs(prefix):
outputfileabs = os.path.join(prefix, outputfile)
else:
outputfileabs = os.path.join(os.getcwd(), prefix, outputfile)
else:
outputfileabs = outputfile
return outputfileabs
def splitFile(inputfile, position, outputdir=None, outputfile1=None, outputfile2=None):
'''
@ -99,8 +120,6 @@ def splitFile(inputfile, position, outputdir=None, outputfile1=None, outputfile2
'''
logger = logging.getLogger('Split')
inputfile = os.path.abspath(inputfile)
workspace = os.path.dirname(inputfile)
if not os.path.exists(inputfile):
logger.error("File Not Found: %s" % inputfile)
raise(Exception)
@ -110,44 +129,33 @@ def splitFile(inputfile, position, outputdir=None, outputfile1=None, outputfile2
"The firstfile and the secondfile can't be the same: %s" % outputfile1)
raise(Exception)
if not outputdir:
outputdir = workspace
elif not os.path.isabs(outputdir):
outputdir = os.path.join(workspace, outputdir)
# Create dir for the output files
try:
if not outputfile1:
outputfile1 = os.path.abspath(os.path.join(
outputdir, "{}1".format(os.path.basename(inputfile))))
else:
outputfile1 = os.path.abspath(os.path.join(outputdir, outputfile1))
outputdir = os.path.dirname(outputfile1)
if not os.path.exists(outputdir):
os.makedirs(outputdir)
if not outputfile2:
outputfile2 = os.path.abspath(os.path.join(
outputdir, "{}2".format(os.path.basename(inputfile))))
else:
outputfile2 = os.path.abspath(os.path.join(outputdir, outputfile2))
outputdir = os.path.dirname(outputfile2)
if not os.path.exists(outputdir):
os.makedirs(outputdir)
outputfile1 = getoutputfileabs(inputfile, outputdir, outputfile1,1)
outputfolder = os.path.dirname(outputfile1)
if not os.path.exists(outputfolder):
os.makedirs(outputfolder)
outputfile2 = getoutputfileabs(inputfile, outputdir, outputfile2,2)
outputfolder = os.path.dirname(outputfile2)
if not os.path.exists(outputfolder):
os.makedirs(outputfolder)
except Exception as e:
logger.error("Can't make dir: %s" % outputdir)
logger.error("Can't make dir: %s" % outputfolder)
raise(e)
if position <= 0:
if outputfile2 != inputfile:
shutil.copy2(inputfile, outputfile2)
if outputfile2 != os.path.abspath(inputfile):
shutil.copy2(os.path.abspath(inputfile), outputfile2)
with open(outputfile1, "wb") as fout:
fout.write(b'')
else:
inputfilesize = getFileSize(inputfile)
if position >= inputfilesize:
if outputfile1 != inputfile:
shutil.copy2(inputfile, outputfile1)
if outputfile1 != os.path.abspath(inputfile):
shutil.copy2(os.path.abspath(inputfile), outputfile1)
with open(outputfile2, "wb") as fout:
fout.write(b'')
else: