Merge pull request #14 from stuartleeks/sl/template-multi-path

Template improvements

Author: stuartleeks

cmd/devcontainer/template.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"sort"
+	"text/tabwriter"
 
 	"github.com/spf13/cobra"
 	"github.com/stuartleeks/devcontainer-cli/internal/pkg/devcontainers"
@@ -24,7 +25,7 @@ func createTemplateCommand() *cobra.Command {
 }
 
 func createTemplateListCommand() *cobra.Command {
-
+	var listVerbose bool
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "list templates",
@@ -36,12 +37,28 @@ func createTemplateListCommand() *cobra.Command {
 				return err
 			}
 
+			if listVerbose {
+				w := new(tabwriter.Writer)
+				// minwidth, tabwidth, padding, padchar, flags
+				w.Init(os.Stdout, 8, 8, 0, '\t', 0)
+				defer w.Flush()
+
+				fmt.Fprintf(w, "%s\t%s\n", "TEMPLATE NAME", "PATH")
+				fmt.Fprintf(w, "%s\t%s\n", "-------------", "----")
+
+				for _, template := range templates {
+					fmt.Fprintf(w, "%s\t%s\n", template.Name, template.Path)
+				}
+				return nil
+			}
+
 			for _, template := range templates {
 				fmt.Println(template.Name)
 			}
 			return nil
 		},
 	}
+	cmd.Flags().BoolVarP(&listVerbose, "verbose", "v", false, "Verbose output")
 	return cmd
 }
 

internal/pkg/devcontainers/template.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"sort"
 
 	"github.com/stuartleeks/devcontainer-cli/internal/pkg/config"
 	"github.com/stuartleeks/devcontainer-cli/internal/pkg/errors"
@@ -35,6 +36,8 @@ func GetTemplateByName(name string) (*DevcontainerTemplate, error) {
 // GetTemplates returns a list of discovered templates
 func GetTemplates() ([]DevcontainerTemplate, error) {
 	templates := []DevcontainerTemplate{}
+	templateNames := map[string]bool{}
+
 	folders := config.GetTemplateFolders()
 	if len(folders) == 0 {
 		return []DevcontainerTemplate{}, &errors.StatusError{Message: "No template folders configured - see https://github.com/stuartleeks/devcontainer-cli/#working-with-devcontainer-templates"}
@@ -45,8 +48,14 @@ func GetTemplates() ([]DevcontainerTemplate, error) {
 		if err != nil {
 			return []DevcontainerTemplate{}, err
 		}
-		templates = append(templates, newTemplates...)
+		for _, template := range newTemplates {
+			if !templateNames[template.Name] {
+				templateNames[template.Name] = true
+				templates = append(templates, template)
+			}
+		}
 	}
+	sort.Slice(templates, func(i int, j int) bool { return templates[i].Name < templates[j].Name })
 	return templates, nil
 }