added more form functions

upctl/cfg/config.go

@@ -43,6 +43,9 @@ type Config struct {
 
 	// required to intercept requests using httpmock in tests
 	Mock bool
+
+	// required for forms
+	Description string
 }
 
 func Getversion() string {

upctl/cmd/formcommands.go

@@ -0,0 +1,72 @@
+/*
+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/cenophane/upctl/cfg"
+	"github.com/tlinden/cenophane/upctl/lib"
+	"os"
+)
+
+func FormCommand(conf *cfg.Config) *cobra.Command {
+	var formCmd = &cobra.Command{
+		Use:   "form {create|delete|modify|list}",
+		Short: "Form commands",
+		Long:  `Manage upload forms.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// errors at this stage do not cause the usage to be shown
+			//cmd.SilenceUsage = true
+			if len(args) == 0 {
+				cmd.Help()
+				os.Exit(0)
+			}
+			return nil
+		},
+	}
+
+	formCmd.Aliases = append(formCmd.Aliases, "frm")
+	formCmd.Aliases = append(formCmd.Aliases, "f")
+
+	formCmd.AddCommand(FormCreateCommand(conf))
+
+	return formCmd
+}
+
+func FormCreateCommand(conf *cfg.Config) *cobra.Command {
+	var formCreateCmd = &cobra.Command{
+		Use:   "create [options]",
+		Short: "Create a new form",
+		Long:  `Create a new form for consumers so they can upload something.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// errors at this stage do not cause the usage to be shown
+			cmd.SilenceUsage = true
+
+			return lib.CreateForm(os.Stdout, conf)
+		},
+	}
+
+	// options
+	formCreateCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+	formCreateCmd.PersistentFlags().StringVarP(&conf.Description, "description", "D", "", "Description of the form")
+
+	formCreateCmd.Aliases = append(formCreateCmd.Aliases, "add")
+	formCreateCmd.Aliases = append(formCreateCmd.Aliases, "+")
+
+	return formCreateCmd
+}

upctl/cmd/root.go

@@ -92,6 +92,7 @@ func Execute() {
 	rootCmd.AddCommand(DeleteCommand(&conf))
 	rootCmd.AddCommand(DescribeCommand(&conf))
 	rootCmd.AddCommand(DownloadCommand(&conf))
+	rootCmd.AddCommand(FormCommand(&conf))
 
 	err := rootCmd.Execute()
 	if err != nil {

upctl/lib/client.go

@@ -320,3 +320,29 @@ func Download(w io.Writer, c *cfg.Config, args []string) error {
 
 	return nil
 }
+
+/**** Forms stuff ****/
+func CreateForm(w io.Writer, c *cfg.Config) error {
+	// setup url, req.Request, timeout handling etc
+	rq := Setup(c, "/forms")
+
+	// actual post w/ settings
+	resp, err := rq.R.
+		SetFormData(map[string]string{
+			"expire":      c.Expire,
+			"description": c.Description,
+		}).
+		Post(rq.Url)
+
+	if err != nil {
+		return err
+	}
+
+	if err := HandleResponse(c, resp); err != nil {
+		return err
+	}
+
+	return RespondExtended(w, resp)
+
+	return nil
+}

upctl/lib/output.go

@@ -35,7 +35,8 @@ func prepareExpire(expire string, start common.Timestamp) string {
 	case "asap":
 		return "On first access"
 	default:
-		return time.Unix(start.Unix()+int64(common.Duration2int(expire)), 0).Format("2006-01-02 15:04:05")
+		return time.Unix(start.Unix()+int64(common.Duration2int(expire)), 0).
+			Format("2006-01-02 15:04:05")
 	}
 
 	return ""
@@ -87,7 +88,16 @@ func WriteExtended(w io.Writer, response *common.Response) {
 		fmt.Fprintln(w)
 	}
 
-	// FIXME: add response.Forms loop here
+	for _, entry := range response.Forms {
+		expire := prepareExpire(entry.Expire, entry.Created)
+		fmt.Fprintf(w, format, "Id", entry.Id)
+		fmt.Fprintf(w, format, "Expire", expire)
+		fmt.Fprintf(w, format, "Context", entry.Context)
+		fmt.Fprintf(w, format, "Created", entry.Created)
+		fmt.Fprintf(w, format, "Description", entry.Description)
+		fmt.Fprintf(w, format, "Url", entry.Url)
+		fmt.Fprintln(w)
+	}
 }
 
 // extract an common.Uploads{} struct from json response