scip/ephemerup
1
0
Fork 0
mirror of https://codeberg.org/scip/ephemerup.git synced 2025-12-17 12:40:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

some changes:

Browse Source 
- reorganized client code, using cobra subcommands
- more reorg in upd code
This commit is contained in:
Thomas von Dein
2023-03-02 18:31:07 +01:00
parent 632f7d6a2a
commit 2a2e41126d
7 changed files with 190 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
upctl/cmd/root.go
View File

@@ -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 {

47
upctl/cmd/upload.go Normal file
View File

@@ -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
}