PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-25 13:53:48 +01:00
Code Releases Activity

Add prefix support

Browse Source
This commit is contained in:
Mickaël Véril 2020-03-28 13:21:47 +01:00
parent dafaf023f7
commit f1f51a7c62
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/datafileBuilder.py
View File

@ -13,8 +13,8 @@ parser = argparse.ArgumentParser()
parser.add_argument('--file', type=argparse.FileType('r')) parser.add_argument('--file', type=argparse.FileType('r'))
parser.add_argument('--defaultType', type=str, choices=[t.name for t in list(dataType)]) parser.add_argument('--defaultType', type=str, choices=[t.name for t in list(dataType)])
parser.add_argument('--format',type=str, choices=[t.name for t in list(Format)],default=Format.LINE.name) parser.add_argument('--format',type=str, choices=[t.name for t in list(Format)],default=Format.LINE.name)
parser.add_argument('--debug', action='store_true', help='Debug mode' parser.add_argument('--debug', action='store_true', help='Debug mode')
) parser.add_argument('--prefix',type=str,default=None)
args = parser.parse_args() args = parser.parse_args()
print(args) print(args)
lines=args.file.readlines() lines=args.file.readlines()
@ -29,4 +29,4 @@ if not datapath.exists():
datapath.mkdir() datapath.mkdir()
datalst=dataFileBase.readFromTable(dat,format=Format[args.format],default=dataType[args.defaultType],commands=commands) datalst=dataFileBase.readFromTable(dat,format=Format[args.format],default=dataType[args.defaultType],commands=commands)
for data in datalst: for data in datalst:
data.toFile(datapath) data.toFile(datapath,args.prefix)

4
tools/lib/data.py
View File

@ -238,13 +238,15 @@ class dataFileBase(object):
dic["DOI"]="" if self.DOI is None else self.DOI dic["DOI"]="" if self.DOI is None else self.DOI
return dic return dic
def toFile(self,datadir): def toFile(self,datadir,prefix=None):
subpath=datadir/self.GetFileType().name.lower() subpath=datadir/self.GetFileType().name.lower()
if not subpath.exists(): if not subpath.exists():
subpath.mkdir() subpath.mkdir()
fileNameComp=[self.molecule.lower().replace(" ","_"),self.method.name] fileNameComp=[self.molecule.lower().replace(" ","_"),self.method.name]
if self.method.basis: if self.method.basis:
fileNameComp.append(self.method.basis) fileNameComp.append(self.method.basis)
if prefix:
fileNameComp.append(prefix)
fileName="_".join(fileNameComp)+".dat" fileName="_".join(fileNameComp)+".dat"
file=subpath/fileName file=subpath/fileName
if not file.exists(): if not file.exists():