diff --git a/ExerciceChecker/src/config/Config.ts b/ExerciceChecker/src/config/Config.ts index 3c17a1f44213f88a57e2b4987b9d2fc53dc6a99e..249315b33657da2d006760675b637a7ba5175a36 100644 --- a/ExerciceChecker/src/config/Config.ts +++ b/ExerciceChecker/src/config/Config.ts @@ -1,10 +1,10 @@ -import fs from 'fs'; +import fs from 'fs-extra'; import path from 'path'; class Config { public readonly folders: { - project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string + project: string; resultsVolume: string; resultsDojo: string; resultsExercice: string; artifacts: string; }; public readonly exercice: { @@ -19,8 +19,9 @@ class Config { this.folders = { project : process.env.FILES_FOLDER || './', resultsVolume : process.env.RESULTS_VOLUME || '', - resultsDojo : path.join(process.env.RESULTS_VOLUME || './', 'Dojo/'), - resultsExercice: path.join(process.env.RESULTS_VOLUME || './', 'Exercice/') + resultsDojo : path.join(process.env.RESULTS_VOLUME || '', 'Dojo/'), + resultsExercice: path.join(process.env.RESULTS_VOLUME || '', 'Exercice/'), + artifacts : process.env.ARTIFACTS_FOLDER || '' }; this.resetResultsVolume(); @@ -35,15 +36,9 @@ class Config { } private resetResultsVolume(): void { - if ( this.folders.resultsVolume !== '' && fs.existsSync(this.folders.resultsVolume) ) { - fs.rmSync(this.folders.resultsVolume, { - recursive: true, - force : true - }); - } - fs.mkdirSync(this.folders.resultsVolume, { recursive: true }); - fs.mkdirSync(this.folders.resultsDojo, { recursive: true }); - fs.mkdirSync(this.folders.resultsExercice, { recursive: true }); + fs.emptyDirSync(this.folders.resultsVolume); + fs.emptyDirSync(this.folders.resultsDojo); + fs.emptyDirSync(this.folders.resultsExercice); } }