code refactoring. Prefix function name having behaviour depending on command line option by the prefix CLI

This commit is contained in:
2023-02-23 23:32:59 +01:00
parent a0ab14c205
commit ebb05fcdf7
15 changed files with 39 additions and 21 deletions

View File

@ -34,7 +34,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
sequences, _ := obiconvert.ReadBioSequences(args...) sequences, _ := obiconvert.CLIReadBioSequences(args...)
annotator := obiannotate.CLIAnnotationPipeline() annotator := obiannotate.CLIAnnotationPipeline()
obiconvert.CLIWriteBioSequences(sequences.Pipe(annotator), true) obiconvert.CLIWriteBioSequences(sequences.Pipe(annotator), true)

View File

@ -15,7 +15,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
cleaned := obiclean.IOBIClean(fs) cleaned := obiclean.IOBIClean(fs)

View File

@ -14,7 +14,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
cleaned := obicleandb.ICleanDB(fs) cleaned := obicleandb.ICleanDB(fs)

View File

@ -15,7 +15,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
comp := fs.MakeIWorker(obiseq.ReverseComplementWorker(true)) comp := fs.MakeIWorker(obiseq.ReverseComplementWorker(true))
obiconvert.CLIWriteBioSequences(comp, true) obiconvert.CLIWriteBioSequences(comp, true)

View File

@ -14,7 +14,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
obiconvert.CLIWriteBioSequences(fs, true) obiconvert.CLIWriteBioSequences(fs, true)
obiiter.WaitForLastPipe() obiiter.WaitForLastPipe()

View File

@ -33,7 +33,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
nvariant, nread, nsymbol := fs.Count(true) nvariant, nread, nsymbol := fs.Count(true)
if obicount.CLIIsPrintingVariantCount() { if obicount.CLIIsPrintingVariantCount() {

View File

@ -0,0 +1,17 @@
package main
import (
"git.metabarcoding.org/lecasofts/go/obitools/pkg/obiiter"
)
func main() {
// optionParser := obioptions.GenerateOptionParser(obiconvert.OptionSet)
// _, args, _ := optionParser(os.Args)
// fs, _ := obiconvert.ReadBioSequences(args...)
// //obicsv.CLIWriteCSV(fs, true)
obiiter.WaitForLastPipe()
}

View File

@ -15,8 +15,8 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
obidistribute.DistributeSequence(fs) obidistribute.DistributeSequence(fs)
obiiter.WaitForLastPipe() obiiter.WaitForLastPipe()

View File

@ -34,8 +34,8 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
sequences, _ := obiconvert.ReadBioSequences(args...) sequences, _ := obiconvert.CLIReadBioSequences(args...)
selected := obigrep.IFilterSequence(sequences) selected := obigrep.CLIFilterSequence(sequences)
obiconvert.CLIWriteBioSequences(selected, true) obiconvert.CLIWriteBioSequences(selected, true)
obiiter.WaitForLastPipe() obiiter.WaitForLastPipe()

View File

@ -29,7 +29,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
sequences, _ := obiconvert.ReadBioSequences(args...) sequences, _ := obiconvert.CLIReadBioSequences(args...)
amplicons, _ := obimultiplex.IExtractBarcode(sequences) amplicons, _ := obimultiplex.IExtractBarcode(sequences)
obiconvert.CLIWriteBioSequences(amplicons, true) obiconvert.CLIWriteBioSequences(amplicons, true)
amplicons.Wait() amplicons.Wait()

View File

@ -30,15 +30,16 @@ func main() {
optionParser := obioptions.GenerateOptionParser(obipairing.OptionSet) optionParser := obioptions.GenerateOptionParser(obipairing.OptionSet)
optionParser(os.Args) optionParser(os.Args)
pairs, _ := obipairing.IBatchPairedSequence() pairs, _ := obipairing.CLIPairedSequence()
paired := obipairing.IAssemblePESequencesBatch(pairs, paired := obipairing.IAssemblePESequencesBatch(pairs,
obipairing.GapPenality(), obipairing.CLIGapPenality(),
obipairing.Delta(), obipairing.CLIDelta(),
obipairing.MinOverlap(), obipairing.CLIMinOverlap(),
obipairing.MinIdentity(), obipairing.CLIMinIdentity(),
obipairing.WithStats(), obipairing.CLIWithStats(),
obioptions.CLIParallelWorkers(), obioptions.CLIParallelWorkers(),
) )
obiconvert.CLIWriteBioSequences(paired, true) obiconvert.CLIWriteBioSequences(paired, true)
obiiter.WaitForLastPipe() obiiter.WaitForLastPipe()

View File

@ -31,7 +31,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
sequences, _ := obiconvert.ReadBioSequences(args...) sequences, _ := obiconvert.CLIReadBioSequences(args...)
amplicons, _ := obipcr.PCR(sequences) amplicons, _ := obipcr.PCR(sequences)
obiconvert.CLIWriteBioSequences(amplicons, true) obiconvert.CLIWriteBioSequences(amplicons, true)
obiiter.WaitForLastPipe() obiiter.WaitForLastPipe()

View File

@ -15,7 +15,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
indexed := obirefidx.IndexReferenceDB(fs) indexed := obirefidx.IndexReferenceDB(fs)
obiconvert.CLIWriteBioSequences(indexed, true) obiconvert.CLIWriteBioSequences(indexed, true)

View File

@ -33,7 +33,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
fs, _ := obiconvert.ReadBioSequences(args...) fs, _ := obiconvert.CLIReadBioSequences(args...)
identified := obitag.AssignTaxonomy(fs) identified := obitag.AssignTaxonomy(fs)
obiconvert.CLIWriteBioSequences(identified, true) obiconvert.CLIWriteBioSequences(identified, true)

View File

@ -34,7 +34,7 @@ func main() {
_, args, _ := optionParser(os.Args) _, args, _ := optionParser(os.Args)
sequences, _ := obiconvert.ReadBioSequences(args...) sequences, _ := obiconvert.CLIReadBioSequences(args...)
unique := obiuniq.Unique(sequences) unique := obiuniq.Unique(sequences)
obiconvert.CLIWriteBioSequences(unique, true) obiconvert.CLIWriteBioSequences(unique, true)