github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-04 03:29:03 +08:00
Code Projects Activity

refactor promptforinputs

Browse Source
This commit is contained in:
Lea Anthony 2019-02-05 08:43:50 +11:00
parent 1670ac6567
commit b323c3db20
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cmd/project.go
View File

@ -178,7 +178,6 @@ func (po *ProjectOptions) Defaults() {
func (po *ProjectOptions) PromptForInputs() error { func (po *ProjectOptions) PromptForInputs() error {
var questions []*survey.Question var questions []*survey.Question
fs := NewFSHelper()
if po.Name == "" { if po.Name == "" {
questions = append(questions, InputQuestion("Name", "The name of the project", "My Project", true)) questions = append(questions, InputQuestion("Name", "The name of the project", "My Project", true))
@ -187,33 +186,17 @@ func (po *ProjectOptions) PromptForInputs() error {
} }
if po.BinaryName == "" { if po.BinaryName == "" {
var binaryNameComputed string var binaryNameComputed = computeBinaryName(po.Name)
if po.Name != "" {
binaryNameComputed = strings.ToLower(po.Name)
binaryNameComputed = strings.Replace(binaryNameComputed, " ", "-", -1)
binaryNameComputed = strings.Replace(binaryNameComputed, string(filepath.Separator), "-", -1)
binaryNameComputed = strings.Replace(binaryNameComputed, ":", "-", -1)
}
questions = append(questions, InputQuestion("BinaryName", "The output binary name", binaryNameComputed, true)) questions = append(questions, InputQuestion("BinaryName", "The output binary name", binaryNameComputed, true))
} else { } else {
fmt.Println("Output binary Name: " + po.BinaryName) fmt.Println("Output binary Name: " + po.BinaryName)
} }
if po.OutputDirectory != "" { err := processOutputDirectory(po.OutputDirectory, &questions)
projectPath, err := filepath.Abs(po.OutputDirectory)
if err != nil { if err != nil {
return err return err
} }
if fs.DirExists(projectPath) {
return fmt.Errorf("directory '%s' already exists", projectPath)
}
fmt.Println("Project Directory: " + po.OutputDirectory)
} else {
questions = append(questions, InputQuestion("OutputDirectory", "Project directory name", "", true))
}
templateDetails, err := po.templates.GetTemplateDetails() templateDetails, err := po.templates.GetTemplateDetails()
if err != nil { if err != nil {
return err return err
@ -320,3 +303,33 @@ func (po *ProjectOptions) LoadConfig(projectDir string) error {
} }
return json.Unmarshal(rawBytes, po) return json.Unmarshal(rawBytes, po)
} }
func computeBinaryName(projectName string) string {
if projectName == "" {
return ""
}
var binaryNameComputed = strings.ToLower(projectName)
binaryNameComputed = strings.Replace(binaryNameComputed, " ", "-", -1)
binaryNameComputed = strings.Replace(binaryNameComputed, string(filepath.Separator), "-", -1)
binaryNameComputed = strings.Replace(binaryNameComputed, ":", "-", -1)
return binaryNameComputed
}
func processOutputDirectory(outputDirectory string, questions *[]*survey.Question) error {
if outputDirectory != "" {
projectPath, err := filepath.Abs(outputDirectory)
if err != nil {
return err
}
if NewFSHelper().DirExists(projectPath) {
return fmt.Errorf("directory '%s' already exists", projectPath)
}
fmt.Println("Project Directory: " + outputDirectory)
} else {
*questions = append(*questions, InputQuestion("OutputDirectory", "Project directory name", "", true))
}
return nil
}