@@ -74,8 +78,8 @@ const formtemplate = `
$('.statusMsg').html('');
if(response.success){
$('#UploadForm')[0].reset();
- $('.statusMsg').html('
Your upload is available at '
- +response.uploads[0].url+' for download
');
+ $('.statusMsg').html('
Your upload is available for download.');
$('#UploadForm').hide();
}else{
$('.statusMsg').html('
'+response.message+'
');
diff --git a/cmd/root.go b/cmd/root.go
index 8834071..0f5cd3a 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -75,7 +75,9 @@ func Execute() error {
f.StringVarP(&conf.AppName, "appname", "n", "ephemerupd "+conf.GetVersion(), "App name to say hi as")
f.IntVarP(&conf.BodyLimit, "bodylimit", "b", 10250000000, "Max allowed upload size in bytes")
- f.Parse(os.Args[1:])
+ if err := f.Parse(os.Args[1:]); err != nil {
+ return err
+ }
// exclude -6 and -4
if conf.V4only && conf.V6only {
@@ -86,19 +88,19 @@ func Execute() error {
var k = koanf.New(".")
// Load the config files provided in the commandline or the default locations
- configfiles := []string{}
+ var configfiles []string
configfile, _ := f.GetString("config")
if configfile != "" {
configfiles = []string{configfile}
} else {
configfiles = []string{
- "/etc/ephemerupd.hcl", "/usr/local/etc/ephemerupd.hcl", // unix variants
- filepath.Join(os.Getenv("HOME"), ".config", "ephemerupd", "ephemerupd.hcl"),
- filepath.Join(os.Getenv("HOME"), ".ephemerupd"),
- "ephemerupd.hcl",
+ "/etc/ephemerup.hcl", "/usr/local/etc/ephemerup.hcl", // unix variants
+ filepath.Join(os.Getenv("HOME"), ".config", "ephemerup", "ephemerup.hcl"),
+ filepath.Join(os.Getenv("HOME"), ".ephemerup"),
+ "ephemerup.hcl",
}
}
-
+ repr.Print(configfiles)
for _, cfgfile := range configfiles {
if _, err := os.Stat(cfgfile); err == nil {
if err := k.Load(file.Provider(cfgfile), hcl.Parser(true)); err != nil {
@@ -109,10 +111,12 @@ func Execute() error {
}
// env overrides config file
- k.Load(env.Provider("EPHEMERUPD_", ".", func(s string) string {
+ if err := k.Load(env.Provider("EPHEMERUPD_", ".", func(s string) string {
return strings.Replace(strings.ToLower(
strings.TrimPrefix(s, "EPHEMERUPD_")), "_", ".", -1)
- }), nil)
+ }), nil); err != nil {
+ return errors.New("error loading environment: " + err.Error())
+ }
// command line overrides env
if err := k.Load(posflag.Provider(f, ".", k), nil); err != nil {
@@ -120,7 +124,9 @@ func Execute() error {
}
// fetch values
- k.Unmarshal("", &conf)
+ if err := k.Unmarshal("", &conf); err != nil {
+ return errors.New("error unmarshalling: " + err.Error())
+ }
// there may exist some api context variables
GetApicontextsFromEnv(&conf)
@@ -180,7 +186,7 @@ func Execute() error {
eg:
EPHEMERUPD_CONTEXT_SUPPORT="support:tymag-fycyh-gymof-dysuf-doseb-puxyx"
- ^^^^^^^- doesn't matter.
+ ^^^^^^^- doesn't matter.
Modifies cfg.Config directly
*/
@@ -197,9 +203,7 @@ func GetApicontextsFromEnv(conf *cfg.Config) {
}
}
- for _, ap := range conf.Apicontexts {
- contexts = append(contexts, ap)
- }
+ contexts = append(contexts, conf.Apicontexts...)
conf.Apicontexts = contexts
}
diff --git a/common/types.go b/common/types.go
index 57ea156..a380042 100644
--- a/common/types.go
+++ b/common/types.go
@@ -20,6 +20,7 @@ package common
import (
"encoding/json"
"fmt"
+ "regexp"
)
// used to return to the api client
@@ -33,16 +34,23 @@ type Result struct {
type Dbentry interface {
Getcontext(j []byte) (string, error)
Marshal() ([]byte, error)
+ MatchExpire(r *regexp.Regexp) bool
+ MatchDescription(r *regexp.Regexp) bool
+ MatchFile(r *regexp.Regexp) bool
+ MatchCreated(r *regexp.Regexp) bool
+ IsType(t int) bool
}
type Upload struct {
- Id string `json:"id"`
- Expire string `json:"expire"`
- File string `json:"file"` // final filename (visible to the downloader)
- Members []string `json:"members"` // contains multiple files, so File is an archive
- Created Timestamp `json:"uploaded"`
- Context string `json:"context"`
- Url string `json:"url"`
+ Type int `json:"type"`
+ Id string `json:"id"`
+ Expire string `json:"expire"`
+ File string `json:"file"` // final filename (visible to the downloader)
+ Members []string `json:"members"` // contains multiple files, so File is an archive
+ Created Timestamp `json:"uploaded"`
+ Context string `json:"context"`
+ Description string `json:"description"`
+ Url string `json:"url"`
}
// this one is also used for marshalling to the client
@@ -60,6 +68,7 @@ type Form struct {
// that the upload handler is able to check if the form object has
// to be deleted immediately (if its expire field has been set to
// asap)
+ Type int `json:"type"`
Id string `json:"id"`
Expire string `json:"expire"`
Description string `json:"description"`
@@ -111,6 +120,52 @@ func (form Form) Marshal() ([]byte, error) {
return jsonentry, nil
}
+func (upload Upload) MatchExpire(r *regexp.Regexp) bool {
+ return r.MatchString(upload.Expire)
+}
+
+func (upload Upload) MatchDescription(r *regexp.Regexp) bool {
+ return r.MatchString(upload.Description)
+}
+
+func (upload Upload) MatchCreated(r *regexp.Regexp) bool {
+ return r.MatchString(upload.Created.Time.String())
+}
+
+func (upload Upload) MatchFile(r *regexp.Regexp) bool {
+ return r.MatchString(upload.File)
+}
+
+func (form Form) MatchExpire(r *regexp.Regexp) bool {
+ return r.MatchString(form.Expire)
+}
+
+func (form Form) MatchDescription(r *regexp.Regexp) bool {
+ return r.MatchString(form.Description)
+}
+
+func (form Form) MatchCreated(r *regexp.Regexp) bool {
+ return r.MatchString(form.Created.Time.String())
+}
+
+func (form Form) MatchFile(r *regexp.Regexp) bool {
+ return false
+}
+
+func (upload Upload) IsType(t int) bool {
+ if upload.Type == t {
+ return true
+ }
+ return false
+}
+
+func (form Form) IsType(t int) bool {
+ if form.Type == t {
+ return true
+ }
+ return false
+}
+
/*
Response methods
*/
diff --git a/ephemerup.hcl b/ephemerup.hcl
index 274f3f0..69be05c 100644
--- a/ephemerup.hcl
+++ b/ephemerup.hcl
@@ -2,7 +2,7 @@
listen = ":8080"
bodylimit = 10000
-apicontext = [
+apicontexts = [
{
context = "root"
key = "0fddbff5d8010f81cd28a7d77f3e38981b13d6164c2fd6e1c3f60a4287630c37",
diff --git a/templates/formtemplate.html b/templates/formtemplate.html
index b4ac878..c67318a 100644
--- a/templates/formtemplate.html
+++ b/templates/formtemplate.html
@@ -27,6 +27,10 @@
Use this form to upload one or more files. The creator of the form will automatically get notified.
@@ -71,8 +75,8 @@
$('.statusMsg').html('');
if(response.success){
$('#UploadForm')[0].reset();
- $('.statusMsg').html('
Your upload is available at '
- +response.uploads[0].url+' for download
');
+ $('.statusMsg').html('
Your upload is available for download.');
$('#UploadForm').hide();
}else{
$('.statusMsg').html('
'+response.message+'
');
diff --git a/upctl/Makefile b/upctl/Makefile
index 636da5d..f5316a0 100644
--- a/upctl/Makefile
+++ b/upctl/Makefile
@@ -28,9 +28,14 @@ COMMIT = $(shell git rev-parse --short=8 HEAD)
BUILD = $(shell date +%Y.%m.%d.%H%M%S)
VERSION := $(if $(filter $(BRANCH), development),$(version)-$(BRANCH)-$(COMMIT)-$(BUILD),$(version))
HAVE_POD := $(shell pod2text -h 2>/dev/null)
+HAVE_LINT:= $(shell golangci-lint -h 2>/dev/null)
-all: buildlocal
+all: lint buildlocal
+lint:
+ifdef HAVE_LINT
+ golangci-lint run
+endif
buildlocal:
go build -ldflags "-X 'github.com/tlinden/ephemerup/upctl/cfg.VERSION=$(VERSION)'"
diff --git a/upctl/cfg/config.go b/upctl/cfg/config.go
index c283ba4..f50c771 100644
--- a/upctl/cfg/config.go
+++ b/upctl/cfg/config.go
@@ -44,6 +44,9 @@ type Config struct {
// required to intercept requests using httpmock in tests
Mock bool
+ // used to filter lists
+ Query string
+
// required for forms
Description string
Notify string
diff --git a/upctl/cmd/formcommands.go b/upctl/cmd/formcommands.go
index b95d192..15929a9 100644
--- a/upctl/cmd/formcommands.go
+++ b/upctl/cmd/formcommands.go
@@ -18,7 +18,9 @@ package cmd
import (
//"errors"
+ "errors"
"github.com/spf13/cobra"
+ "github.com/tlinden/ephemerup/common"
"github.com/tlinden/ephemerup/upctl/cfg"
"github.com/tlinden/ephemerup/upctl/lib"
"os"
@@ -33,8 +35,7 @@ func FormCommand(conf *cfg.Config) *cobra.Command {
// 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 cmd.Help()
}
return nil
},
@@ -44,6 +45,9 @@ func FormCommand(conf *cfg.Config) *cobra.Command {
formCmd.Aliases = append(formCmd.Aliases, "f")
formCmd.AddCommand(FormCreateCommand(conf))
+ formCmd.AddCommand(FormListCommand(conf))
+ formCmd.AddCommand(FormDeleteCommand(conf))
+ formCmd.AddCommand(FormDescribeCommand(conf))
return formCmd
}
@@ -71,3 +75,73 @@ func FormCreateCommand(conf *cfg.Config) *cobra.Command {
return formCreateCmd
}
+
+func FormListCommand(conf *cfg.Config) *cobra.Command {
+ var listCmd = &cobra.Command{
+ Use: "list [options]",
+ Short: "List formss",
+ Long: `List formss.`,
+ 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.List(os.Stdout, conf, nil, common.TypeForm)
+ },
+ }
+
+ // options
+ listCmd.PersistentFlags().StringVarP(&conf.Apicontext, "apicontext", "", "", "Filter by given API context")
+ listCmd.PersistentFlags().StringVarP(&conf.Query, "query", "q", "", "Filter by given query regexp")
+
+ listCmd.Aliases = append(listCmd.Aliases, "ls")
+ listCmd.Aliases = append(listCmd.Aliases, "l")
+
+ return listCmd
+}
+
+func FormDeleteCommand(conf *cfg.Config) *cobra.Command {
+ var deleteCmd = &cobra.Command{
+ Use: "delete [options]
",
+ Short: "Delete an form",
+ Long: `Delete an form identified by its id`,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ if len(args) == 0 {
+ return errors.New("No id specified to delete!")
+ }
+
+ // errors at this stage do not cause the usage to be shown
+ cmd.SilenceUsage = true
+
+ return lib.Delete(os.Stdout, conf, args, common.TypeForm)
+ },
+ }
+
+ deleteCmd.Aliases = append(deleteCmd.Aliases, "rm")
+ deleteCmd.Aliases = append(deleteCmd.Aliases, "d")
+
+ return deleteCmd
+}
+
+func FormDescribeCommand(conf *cfg.Config) *cobra.Command {
+ var listCmd = &cobra.Command{
+ Use: "describe [options] form-id",
+ Long: "Show detailed informations about an form object.",
+ Short: `Describe an form.`,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ if len(args) == 0 {
+ return errors.New("No id specified to delete!")
+ }
+
+ // errors at this stage do not cause the usage to be shown
+ cmd.SilenceUsage = true
+
+ return lib.Describe(os.Stdout, conf, args, common.TypeForm)
+ },
+ }
+
+ listCmd.Aliases = append(listCmd.Aliases, "des")
+ listCmd.Aliases = append(listCmd.Aliases, "info")
+ listCmd.Aliases = append(listCmd.Aliases, "i")
+
+ return listCmd
+}
diff --git a/upctl/cmd/maincommands.go b/upctl/cmd/maincommands.go
index 180bc01..fc20d62 100644
--- a/upctl/cmd/maincommands.go
+++ b/upctl/cmd/maincommands.go
@@ -19,6 +19,7 @@ package cmd
import (
"errors"
"github.com/spf13/cobra"
+ "github.com/tlinden/ephemerup/common"
"github.com/tlinden/ephemerup/upctl/cfg"
"github.com/tlinden/ephemerup/upctl/lib"
"os"
@@ -43,6 +44,7 @@ func UploadCommand(conf *cfg.Config) *cobra.Command {
// options
uploadCmd.PersistentFlags().StringVarP(&conf.Expire, "expire", "e", "", "Expire setting: asap or duration (accepted shortcuts: dmh)")
+ uploadCmd.PersistentFlags().StringVarP(&conf.Description, "description", "D", "", "Description of the form")
uploadCmd.Aliases = append(uploadCmd.Aliases, "up")
uploadCmd.Aliases = append(uploadCmd.Aliases, "u")
@@ -54,17 +56,18 @@ func ListCommand(conf *cfg.Config) *cobra.Command {
var listCmd = &cobra.Command{
Use: "list [options] [file ..]",
Short: "List uploads",
- Long: `List uploads.`,
+ Long: `List uploads`,
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.List(os.Stdout, conf, args)
+ return lib.List(os.Stdout, conf, args, common.TypeUpload)
},
}
// options
listCmd.PersistentFlags().StringVarP(&conf.Apicontext, "apicontext", "", "", "Filter by given API context")
+ listCmd.PersistentFlags().StringVarP(&conf.Query, "query", "q", "", "Filter by given query regexp")
listCmd.Aliases = append(listCmd.Aliases, "ls")
listCmd.Aliases = append(listCmd.Aliases, "l")
@@ -85,7 +88,7 @@ func DeleteCommand(conf *cfg.Config) *cobra.Command {
// errors at this stage do not cause the usage to be shown
cmd.SilenceUsage = true
- return lib.Delete(os.Stdout, conf, args)
+ return lib.Delete(os.Stdout, conf, args, common.TypeUpload)
},
}
@@ -99,7 +102,7 @@ func DescribeCommand(conf *cfg.Config) *cobra.Command {
var listCmd = &cobra.Command{
Use: "describe [options] upload-id",
Long: "Show detailed informations about an upload object.",
- Short: `Describe an upload.`,
+ Short: `Describe an upload`,
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
return errors.New("No id specified to delete!")
@@ -108,7 +111,7 @@ func DescribeCommand(conf *cfg.Config) *cobra.Command {
// errors at this stage do not cause the usage to be shown
cmd.SilenceUsage = true
- return lib.Describe(os.Stdout, conf, args)
+ return lib.Describe(os.Stdout, conf, args, common.TypeUpload)
},
}
@@ -123,7 +126,7 @@ func DownloadCommand(conf *cfg.Config) *cobra.Command {
var listCmd = &cobra.Command{
Use: "download [options] upload-id",
Long: "Download the file associated with an upload object.",
- Short: `Download a file.`,
+ Short: `Download a file`,
RunE: func(cmd *cobra.Command, args []string) error {
if len(args) == 0 {
return errors.New("No id specified to delete!")
diff --git a/upctl/cmd/root.go b/upctl/cmd/root.go
index b2e5b46..7e52e52 100644
--- a/upctl/cmd/root.go
+++ b/upctl/cmd/root.go
@@ -130,13 +130,12 @@ func initConfig(cmd *cobra.Command, cfg *cfg.Config) error {
v.SetEnvPrefix("upctl")
// map flags to viper
- bindFlags(cmd, v)
-
- return nil
+ return bindFlags(cmd, v)
}
// bind flags to viper settings (env+cfgfile)
-func bindFlags(cmd *cobra.Command, v *viper.Viper) {
+func bindFlags(cmd *cobra.Command, v *viper.Viper) error {
+ var fail error
cmd.Flags().VisitAll(func(f *pflag.Flag) {
// map flag name to config variable
configName := f.Name
@@ -144,7 +143,11 @@ func bindFlags(cmd *cobra.Command, v *viper.Viper) {
// use config variable if flag is not set and config is set
if !f.Changed && v.IsSet(configName) {
val := v.Get(configName)
- cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val))
+ if err := cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val)); err != nil {
+ fail = err
+ }
}
})
+
+ return fail
}
diff --git a/upctl/lib/client.go b/upctl/lib/client.go
index 2850b53..4f7c560 100644
--- a/upctl/lib/client.go
+++ b/upctl/lib/client.go
@@ -48,6 +48,7 @@ type Request struct {
type ListParams struct {
Apicontext string `json:"apicontext"`
+ Query string `json:"query"`
}
const Maxwidth = 12
@@ -181,14 +182,17 @@ func UploadFiles(w io.Writer, c *cfg.Config, args []string) error {
var left float64
rq.R.SetUploadCallbackWithInterval(func(info req.UploadInfo) {
left = float64(info.UploadedSize) / float64(info.FileSize) * 100.0
- bar.Add(int(left))
+ if err := bar.Add(int(left)); err != nil {
+ fmt.Print("\r")
+ }
}, 10*time.Millisecond)
}
// actual post w/ settings
resp, err := rq.R.
SetFormData(map[string]string{
- "expire": c.Expire,
+ "expire": c.Expire,
+ "description": c.Description,
}).
Post(rq.Url)
@@ -203,10 +207,17 @@ func UploadFiles(w io.Writer, c *cfg.Config, args []string) error {
return RespondExtended(w, resp)
}
-func List(w io.Writer, c *cfg.Config, args []string) error {
- rq := Setup(c, "/uploads")
+func List(w io.Writer, c *cfg.Config, args []string, typ int) error {
+ var rq *Request
- params := &ListParams{Apicontext: c.Apicontext}
+ switch typ {
+ case common.TypeUpload:
+ rq = Setup(c, "/uploads")
+ case common.TypeForm:
+ rq = Setup(c, "/forms")
+ }
+
+ params := &ListParams{Apicontext: c.Apicontext, Query: c.Query}
resp, err := rq.R.
SetBodyJsonMarshal(params).
Get(rq.Url)
@@ -219,12 +230,28 @@ func List(w io.Writer, c *cfg.Config, args []string) error {
return err
}
- return UploadsRespondTable(w, resp)
+ switch typ {
+ case common.TypeUpload:
+ return UploadsRespondTable(w, resp)
+ case common.TypeForm:
+ return FormsRespondTable(w, resp)
+ }
+
+ return nil
}
-func Delete(w io.Writer, c *cfg.Config, args []string) error {
+func Delete(w io.Writer, c *cfg.Config, args []string, typ int) error {
for _, id := range args {
- rq := Setup(c, "/uploads/"+id+"/")
+ var rq *Request
+ caption := "Upload"
+
+ switch typ {
+ case common.TypeUpload:
+ rq = Setup(c, "/uploads/"+id)
+ case common.TypeForm:
+ rq = Setup(c, "/forms/"+id)
+ caption = "Form"
+ }
resp, err := rq.R.Delete(rq.Url)
@@ -236,20 +263,27 @@ func Delete(w io.Writer, c *cfg.Config, args []string) error {
return err
}
- fmt.Fprintf(w, "Upload %s successfully deleted.\n", id)
+ fmt.Fprintf(w, "%s %s successfully deleted.\n", caption, id)
}
return nil
}
-func Describe(w io.Writer, c *cfg.Config, args []string) error {
+func Describe(w io.Writer, c *cfg.Config, args []string, typ int) error {
if len(args) == 0 {
return errors.New("No id provided!")
}
+ var rq *Request
id := args[0] // we describe only 1 object
- rq := Setup(c, "/uploads/"+id)
+ switch typ {
+ case common.TypeUpload:
+ rq = Setup(c, "/uploads/"+id)
+ case common.TypeForm:
+ rq = Setup(c, "/forms/"+id)
+ }
+
resp, err := rq.R.Get(rq.Url)
if err != nil {
@@ -278,7 +312,9 @@ func Download(w io.Writer, c *cfg.Config, args []string) error {
callback := func(info req.DownloadInfo) {
if info.Response.Response != nil {
- bar.Add(1)
+ if err := bar.Add(1); err != nil {
+ fmt.Print("\r")
+ }
}
}
@@ -328,10 +364,10 @@ func CreateForm(w io.Writer, c *cfg.Config) error {
// actual post w/ settings
resp, err := rq.R.
- SetFormData(map[string]string{
- "expire": c.Expire,
- "description": c.Description,
- "notify": c.Notify,
+ SetBody(&common.Form{
+ Expire: c.Expire,
+ Description: c.Description,
+ Notify: c.Notify,
}).
Post(rq.Url)
@@ -344,6 +380,4 @@ func CreateForm(w io.Writer, c *cfg.Config) error {
}
return RespondExtended(w, resp)
-
- return nil
}
diff --git a/upctl/lib/client_test.go b/upctl/lib/client_test.go
index b2fc1fb..3b92a22 100644
--- a/upctl/lib/client_test.go
+++ b/upctl/lib/client_test.go
@@ -22,6 +22,7 @@ import (
"bytes"
"fmt"
"github.com/jarcoal/httpmock"
+ "github.com/tlinden/ephemerup/common"
"github.com/tlinden/ephemerup/upctl/cfg"
"io/ioutil"
"net/http"
@@ -205,7 +206,7 @@ func TestList(t *testing.T) {
sendjson: listing,
files: []string{},
method: "GET",
- expect: `cc2c965a\s*asap\s*foo\s*2023-03-21 12:06:54`, // expect tabular output
+ expect: `cc2c965a\s*asap\s*foo\s*2023-03-21`, // expect tabular output
},
{
name: "list-catch-empty-json",
@@ -232,7 +233,7 @@ func TestList(t *testing.T) {
for _, unit := range tests {
var w bytes.Buffer
Intercept(unit)
- Check(t, unit, &w, List(&w, conf, []string{}))
+ Check(t, unit, &w, List(&w, conf, []string{}, common.TypeUpload))
}
}
@@ -266,7 +267,7 @@ func TestDescribe(t *testing.T) {
sendjson: listing,
files: []string{"cc2c965a"},
method: "GET",
- expect: `Created: 2023-03-21 12:06:54.890501888`,
+ expect: `Created: 2023-03-21`,
},
{
name: "describe-catch-empty-json",
@@ -294,7 +295,7 @@ func TestDescribe(t *testing.T) {
var w bytes.Buffer
unit.route += unit.files[0]
Intercept(unit)
- Check(t, unit, &w, Describe(&w, conf, unit.files))
+ Check(t, unit, &w, Describe(&w, conf, unit.files, common.TypeUpload))
}
}
@@ -344,9 +345,9 @@ func TestDelete(t *testing.T) {
for _, unit := range tests {
var w bytes.Buffer
- unit.route += unit.files[0] + "/"
+ unit.route += unit.files[0]
Intercept(unit)
- Check(t, unit, &w, Delete(&w, conf, unit.files))
+ Check(t, unit, &w, Delete(&w, conf, unit.files, common.TypeUpload))
}
}
diff --git a/upctl/lib/output.go b/upctl/lib/output.go
index 63c8861..ef250c0 100644
--- a/upctl/lib/output.go
+++ b/upctl/lib/output.go
@@ -21,10 +21,12 @@ import (
"encoding/json"
"errors"
"fmt"
+ //"github.com/alecthomas/repr"
"github.com/imroc/req/v3"
"github.com/olekukonko/tablewriter"
"github.com/tlinden/ephemerup/common"
"io"
+ "sort"
"strings"
"time"
)
@@ -38,8 +40,6 @@ func prepareExpire(expire string, start common.Timestamp) string {
return time.Unix(start.Unix()+int64(common.Duration2int(expire)), 0).
Format("2006-01-02 15:04:05")
}
-
- return ""
}
// generic table writer
@@ -79,7 +79,8 @@ func WriteExtended(w io.Writer, response *common.Response) {
// we shall only have 1 element, however, if we ever support more, here we go
for _, entry := range response.Uploads {
expire := prepareExpire(entry.Expire, entry.Created)
- fmt.Fprintf(w, format, "Id", entry.Id)
+ fmt.Fprintf(w, format, "Upload-Id", entry.Id)
+ fmt.Fprintf(w, format, "Description", entry.Id)
fmt.Fprintf(w, format, "Expire", expire)
fmt.Fprintf(w, format, "Context", entry.Context)
fmt.Fprintf(w, format, "Created", entry.Created)
@@ -90,18 +91,18 @@ func WriteExtended(w io.Writer, response *common.Response) {
for _, entry := range response.Forms {
expire := prepareExpire(entry.Expire, entry.Created)
- fmt.Fprintf(w, format, "Id", entry.Id)
+ fmt.Fprintf(w, format, "Form-Id", entry.Id)
+ fmt.Fprintf(w, format, "Description", entry.Description)
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, "Notify", entry.Notify)
fmt.Fprintf(w, format, "Url", entry.Url)
fmt.Fprintln(w)
}
}
-// extract an common.Uploads{} struct from json response
+// extract an common.Response{} struct from json response
func GetResponse(resp *req.Response) (*common.Response, error) {
response := common.Response{}
@@ -127,15 +128,49 @@ func UploadsRespondTable(w io.Writer, resp *req.Response) error {
fmt.Fprintln(w, response.Message)
}
+ sort.SliceStable(response.Uploads, func(i, j int) bool {
+ return response.Uploads[i].Created.Time.Unix() < response.Uploads[j].Created.Time.Unix()
+ })
+
// tablewriter
data := [][]string{}
for _, entry := range response.Uploads {
data = append(data, []string{
- entry.Id, entry.Expire, entry.Context, entry.Created.Format("2006-01-02 15:04:05"),
+ entry.Id, entry.Description, entry.Expire, entry.Context,
+ entry.Created.Format("2006-01-02 15:04:05"), entry.File,
})
}
- WriteTable(w, []string{"ID", "EXPIRE", "CONTEXT", "CREATED"}, data)
+ WriteTable(w, []string{"UPLOAD-ID", "DESCRIPTION", "EXPIRE", "CONTEXT", "CREATED", "FILE"}, data)
+
+ return nil
+}
+
+// turn the Forms{} struct into a table and print it
+func FormsRespondTable(w io.Writer, resp *req.Response) error {
+ response, err := GetResponse(resp)
+ if err != nil {
+ return err
+ }
+
+ if response.Message != "" {
+ fmt.Fprintln(w, response.Message)
+ }
+
+ sort.SliceStable(response.Forms, func(i, j int) bool {
+ return response.Forms[i].Created.Time.Unix() < response.Forms[j].Created.Time.Unix()
+ })
+
+ // tablewriter
+ data := [][]string{}
+ for _, entry := range response.Forms {
+ data = append(data, []string{
+ entry.Id, entry.Description, entry.Expire, entry.Context,
+ entry.Created.Format("2006-01-02 15:04:05"), entry.Notify,
+ })
+ }
+
+ WriteTable(w, []string{"FORM-ID", "DESCRIPTION", "EXPIRE", "CONTEXT", "CREATED", "NOTIFY"}, data)
return nil
}
diff --git a/upctl/t/t1 b/upctl/t/t1
index 7c0bf85..d87562a 100644
--- a/upctl/t/t1
+++ b/upctl/t/t1
@@ -1 +1 @@
-Mon Mar 20 12:16:26 PM CET 2023
+Wed Mar 29 03:01:21 PM CEST 2023
diff --git a/upctl/upctl.hcl b/upctl/upctl.hcl
index fc989e6..4031105 100644
--- a/upctl/upctl.hcl
+++ b/upctl/upctl.hcl
@@ -1,2 +1,3 @@
endpoint = "http://localhost:8080/v1"
apikey = "970b391f22f515d96b3e9b86a2c62c627968828e47b356994d2e583188b4190a"
+notify = "root@localhost"