diff --git a/.gitignore b/.gitignore index 2a3699b..bbcbf09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,7 @@ *.log out/* corpus-resources/ +sisyphe-out/ +*-local* .vscode Dockerfile.debug diff --git a/main.go b/main.go index 20bd54e..22ee933 100644 --- a/main.go +++ b/main.go @@ -34,6 +34,7 @@ var corpusPath = flag.String("p", "", "Corpus path") var outputPath = flag.String("o", "out", "Output path") var corpusName = flag.String("n", "test", "Corpus name") +var corpusResourcesSubdir = flag.String("r", "", "corpus-resources sub-directory") var configurationFolder = flag.String("c", "", "Configuration folder path") var withWordCount = flag.Bool("w", false, "Enable word count") var noIndexation = flag.Bool("noindex", false, "Disable indexation after process") @@ -170,12 +171,17 @@ files, _ := ioutil.ReadDir(*configurationFolder) // get file on corpus resources directory for _, file := range files { - if file.IsDir() && GetStringWithPrefix(*corpusName, file.Name()) != "" { - *corpusName = file.Name() + if *corpusResourcesSubdir != "" { + if file.IsDir() && *corpusResourcesSubdir == file.Name() { + } + } else { + if file.IsDir() && GetStringWithPrefix(*corpusName, file.Name()) != "" { + *corpusResourcesSubdir = file.Name() + } } } - fmt.Println(color.InGreen("The detailed analysis is enabled for"), color.InGreen(*configurationFolder+"/"+*corpusName+"/sisyphe-conf.json")) - jsonFile, err := ioutil.ReadFile(*configurationFolder + "/" + *corpusName + "/sisyphe-conf.json") + fmt.Println(color.InGreen("The detailed analysis is enabled for"), color.InGreen(*configurationFolder+"/"+*corpusResourcesSubdir+"/sisyphe-conf.json")) + jsonFile, err := ioutil.ReadFile(*configurationFolder + "/" + *corpusResourcesSubdir + "/sisyphe-conf.json") if err != nil { fmt.Println(color.InRed("Bad configuration file")) os.Exit(1)