Updated makefile

Author: djthorpe

Makefile

@@ -22,7 +22,7 @@ BUILD_DIR := "build"
 CMD_DIR := $(filter-out cmd/ffmpeg/README.md, $(wildcard cmd/ffmpeg/*))
 BUILD_TAG := ${DOCKER_REGISTRY}/go-media-${OS}-${ARCH}:${VERSION}
 
-all: clean cmds
+all: clean cli cmds
 
 cmds: $(CMD_DIR)
 
@@ -47,6 +47,11 @@ test: go-dep
 	@${GO} test ./pkg/...
 	@${GO} test .
 
+
+cli: go-dep mkdir
+	@echo Build media tool
+	@${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/media ./cmd/cli
+
 $(CMD_DIR): go-dep mkdir
 	@echo Build cmd $(notdir $@)
 	@${GO} build ${BUILD_FLAGS} -o ${BUILD_DIR}/$(notdir $@) ./$@

cmd/cli/version.go

@@ -1,37 +1,18 @@
 package main
 
 import (
-	"fmt"
 	"os"
-	"runtime"
 
-	"github.com/mutablelogic/go-client/pkg/version"
+	"github.com/djthorpe/go-tablewriter"
+	"github.com/mutablelogic/go-media"
 )
 
 type VersionCmd struct{}
 
 func (v *VersionCmd) Run(globals *Globals) error {
-	w := os.Stdout
-	if version.GitSource != "" {
-		if version.GitTag != "" {
-			fmt.Fprintf(w, " %v", version.GitTag)
-		}
-		if version.GitSource != "" {
-			fmt.Fprintf(w, " (%v)", version.GitSource)
-		}
-		fmt.Fprintln(w, "")
+	opts := []tablewriter.TableOpt{
+		tablewriter.OptOutputText(),
+		tablewriter.OptDelimiter(' '),
 	}
-	if runtime.Version() != "" {
-		fmt.Fprintf(w, "%v %v/%v\n", runtime.Version(), runtime.GOOS, runtime.GOARCH)
-	}
-	if version.GitBranch != "" {
-		fmt.Fprintf(w, "Branch: %v\n", version.GitBranch)
-	}
-	if version.GitHash != "" {
-		fmt.Fprintf(w, "Hash: %v\n", version.GitHash)
-	}
-	if version.GoBuildTime != "" {
-		fmt.Fprintf(w, "BuildTime: %v\n", version.GoBuildTime)
-	}
-	return nil
+	return tablewriter.New(os.Stdout, opts...).Write(media.NewManager().Version())
 }

metadata.go

@@ -6,8 +6,8 @@ import "encoding/json"
 // TYPES
 
 type metadata struct {
-	Key   string `json:"key"`
-	Value any    `json:"value"`
+	Key   string `json:"key" writer:",width:30"`
+	Value any    `json:"value" writer:",width:50"`
 }
 
 ////////////////////////////////////////////////////////////////////////////////