some changes:

- reorganized client code, using cobra subcommands
- more reorg in upd code

upctl/cfg/config.go

@@ -23,6 +23,7 @@ import (
 
 const Version string = "v0.0.1"
 
+var ApiVersion string = "/v1"
 var VERSION string // maintained by -x
 
 type Config struct {

upctl/cmd/root.go

@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"github.com/tlinden/up/upctl/cfg"
-	"github.com/tlinden/up/upctl/lib"
 	"os"
 	"strings"
 )
@@ -56,8 +55,8 @@ func Execute() {
 
 	var rootCmd = &cobra.Command{
 		Use:   "upctl [options]",
-		Short: "upload client",
-		Long:  `Upload files to an upload api.`,
+		Short: "upload api client",
+		Long:  `Manage files on an upload api server.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if ShowVersion {
 				fmt.Println(cfg.Getversion())
@@ -69,13 +68,10 @@ func Execute() {
 			}
 
 			if len(args) == 0 {
-				return errors.New("No files specified to upload!")
+				return errors.New("No command specified!")
 			}
 
-			// errors at this stage do not cause the usage to be shown
-			cmd.SilenceUsage = true
-
-			return lib.Runclient(&conf, args)
+			return nil
 		},
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			return initConfig(cmd, &conf)
@@ -88,7 +84,8 @@ func Execute() {
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "custom config file")
 	rootCmd.PersistentFlags().IntVarP(&conf.Retries, "retries", "r", 3, "How often shall we retry to access our endpoint")
 	rootCmd.PersistentFlags().StringVarP(&conf.Endpoint, "endpoint", "p", "http://localhost:8080/api", "upload api endpoint url")
-	rootCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "asap", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+
+	rootCmd.AddCommand(UploadCommand(&conf))
 
 	err := rootCmd.Execute()
 	if err != nil {

upctl/cmd/upload.go

@@ -0,0 +1,47 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package cmd
+
+import (
+	"errors"
+	"github.com/spf13/cobra"
+	"github.com/tlinden/up/upctl/cfg"
+	"github.com/tlinden/up/upctl/lib"
+)
+
+func UploadCommand(conf *cfg.Config) *cobra.Command {
+	var uploadCmd = &cobra.Command{
+		Use:   "upload [options] [file ..]",
+		Short: "upload files",
+		Long:  `Upload files to an upload api.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return errors.New("No files specified to upload!")
+			}
+
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.Upload(conf, args)
+		},
+	}
+
+	// options
+	uploadCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+
+	return uploadCmd
+}

upctl/lib/client.go

@@ -19,7 +19,7 @@ package lib
 
 import (
 	"encoding/json"
-	//"errors"
+	"errors"
 	"fmt"
 	"github.com/imroc/req/v3"
 	"github.com/tlinden/up/upctl/cfg"
@@ -34,9 +34,12 @@ type Response struct {
 	Message string `json:"message"`
 }
 
-const ApiVersion string = "/v1"
+type Request struct {
+	R   *req.Request
+	Url string
+}
 
-func Runclient(c *cfg.Config, args []string) error {
+func Setup(c *cfg.Config, path string) *Request {
 	client := req.C()
 	if c.Debug {
 		client.DevMode()
@@ -44,9 +47,28 @@ func Runclient(c *cfg.Config, args []string) error {
 
 	client.SetUserAgent("upctl-" + cfg.VERSION)
 
-	url := c.Endpoint + ApiVersion + "/file/"
+	R := client.R()
 
-	rq := client.R()
+	if c.Retries > 0 {
+		// Enable retry and set the maximum retry count.
+		R.SetRetryCount(c.Retries).
+			//  Set  the  retry  sleep   interval  with  a  commonly  used
+			//   algorithm:  capped   exponential   backoff  with   jitter
+			// (https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/).
+			SetRetryBackoffInterval(1*time.Second, 5*time.Second).
+			AddRetryHook(func(resp *req.Response, err error) {
+				req := resp.Request.RawRequest
+				if c.Debug {
+					fmt.Println("Retrying endpoint request:", req.Method, req.URL)
+				}
+			})
+	}
+
+	return &Request{Url: c.Endpoint + cfg.ApiVersion + "/file/", R: R}
+
+}
+
+func GatherFiles(rq *Request, args []string) error {
 	for _, file := range args {
 		info, err := os.Stat(file)
 
@@ -61,7 +83,7 @@ func Runclient(c *cfg.Config, args []string) error {
 				}
 
 				if !info.IsDir() {
-					rq.SetFile("upload[]", path)
+					rq.R.SetFile("upload[]", path)
 				}
 				return nil
 			})
@@ -70,27 +92,24 @@ func Runclient(c *cfg.Config, args []string) error {
 				return err
 			}
 		} else {
-			rq.SetFile("upload[]", file)
+			rq.R.SetFile("upload[]", file)
 		}
-
 	}
 
-	if c.Retries > 0 {
-		// Enable retry and set the maximum retry count.
-		rq.SetRetryCount(c.Retries).
-			//  Set  the  retry  sleep   interval  with  a  commonly  used
-			//   algorithm:  capped   exponential   backoff  with   jitter
-			// (https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/).
-			SetRetryBackoffInterval(1*time.Second, 5*time.Second).
-			AddRetryHook(func(resp *req.Response, err error) {
-				req := resp.Request.RawRequest
-				if c.Debug {
-					fmt.Println("Retrying endpoint request:", req.Method, req.URL)
-				}
-			})
+	return nil
+}
+
+func Upload(c *cfg.Config, args []string) error {
+	// setup url, req.Request, timeout handling etc
+	rq := Setup(c, "/file/")
+
+	// collect files to upload from @argv
+	if err := GatherFiles(rq, args); err != nil {
+		return err
 	}
 
-	resp, err := rq.
+	// actual post w/ settings
+	resp, err := rq.R.
 		SetFormData(map[string]string{
 			"expire": c.Expire,
 		}).
@@ -98,7 +117,7 @@ func Runclient(c *cfg.Config, args []string) error {
 			fmt.Printf("\r%q uploaded %.2f%%", info.FileName, float64(info.UploadedSize)/float64(info.FileSize)*100.0)
 			fmt.Println()
 		}, 10*time.Millisecond).
-		Post(url)
+		Post(rq.Url)
 
 	fmt.Println("")
 
@@ -106,12 +125,10 @@ func Runclient(c *cfg.Config, args []string) error {
 		return err
 	}
 
+	// we expect a json response
 	r := Response{}
-
 	json.Unmarshal([]byte(resp.String()), &r)
 
-	fmt.Println(r)
-
 	if c.Debug {
 		trace := resp.TraceInfo()  // Use `resp.Request.TraceInfo()` to avoid unnecessary struct copy in production.
 		fmt.Println(trace.Blame()) // Print out exactly where the http request is slowing down.
@@ -119,5 +136,11 @@ func Runclient(c *cfg.Config, args []string) error {
 		fmt.Println(trace)
 	}
 
+	if !r.Success {
+		return errors.New(r.Message)
+	}
+
+	fmt.Println(r.Message)
+
 	return nil
 }