mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-24 04:58:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

extract handleOriginalAction and check if Before() exists before calling it

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2020-12-23 11:59:29 +00:00
parent 63ae28fff1
commit 36d86aa87e
21 changed files with 34 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis/pkg/command/accounts.go
+1 -6
View File
@@ -29,12 +29,7 @@ func AccountsCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureAccounts(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/common.go
+14
View File
@@ -0,0 +1,14 @@
package command
import "github.com/micro/cli/v2"
func handleOriginalAction(c *cli.Context, cmd *cli.Command) error {
if cmd.Before != nil {
if err := cmd.Before(c); err != nil {
return err
}
}
return cli.HandleAction(cmd.Action, c)
}
ocis/pkg/command/glauth.go
+1 -6
View File
@@ -19,12 +19,7 @@ func GLAuthCommand(cfg *config.Config) *cli.Command {
Flags: flagset.ServerWithConfig(cfg.GLAuth),
Action: func(c *cli.Context) error {
origCmd := command.Server(configureGLAuth(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/ocs.go
+1 -6
View File
@@ -24,12 +24,7 @@ func OCSCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureOCS(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/onlyoffice.go
+1 -6
View File
@@ -18,12 +18,7 @@ func OnlyofficeCommand(cfg *config.Config) *cli.Command {
Flags: flagset.ServerWithConfig(cfg.Onlyoffice),
Action: func(c *cli.Context) error {
origCmd := command.Server(configureOnlyoffice(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/proxy.go
+1 -6
View File
@@ -24,12 +24,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureProxy(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/settings.go
+1 -6
View File
@@ -24,12 +24,7 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureSettings(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storageauthbasic.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageAuthBasicCommand(cfg *config.Config) *cli.Command {
Flags: flagset.AuthBasicWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.AuthBasic(configureStorageAuthBasic(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storageauthbearer.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageAuthBearerCommand(cfg *config.Config) *cli.Command {
Flags: flagset.AuthBearerWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.AuthBearer(configureStorageAuthBearer(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagefrontend.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageFrontendCommand(cfg *config.Config) *cli.Command {
Flags: flagset.FrontendWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.Frontend(configureStorageFrontend(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagegateway.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageGatewayCommand(cfg *config.Config) *cli.Command {
Flags: flagset.GatewayWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.Gateway(configureStorageGateway(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagehome.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageHomeCommand(cfg *config.Config) *cli.Command {
Flags: flagset.StorageHomeWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.StorageHome(configureStorageHome(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagemetadata.go
+1 -6
View File
@@ -18,12 +18,7 @@ func StorageMetadataCommand(cfg *config.Config) *cli.Command {
Flags: flagset.StorageMetadata(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.StorageMetadata(configureStorageMetadata(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagepubliclink.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
Flags: flagset.StoragePublicLink(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.StoragePublicLink(configureStoragePublicLink(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storagesharing.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageSharingCommand(cfg *config.Config) *cli.Command {
Flags: flagset.SharingWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.Sharing(configureStorageSharing(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storageuserprovider.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageUserProviderCommand(cfg *config.Config) *cli.Command {
Flags: flagset.UsersWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.Users(configureStorageUserProvider(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/storageusers.go
+1 -6
View File
@@ -20,12 +20,7 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
Flags: flagset.StorageUsersWithConfig(cfg.Storage),
Action: func(c *cli.Context) error {
origCmd := command.StorageUsers(configureStorageUsers(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/store.go
+1 -6
View File
@@ -24,12 +24,7 @@ func StoreCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureStore(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/thumbnails.go
+1 -6
View File
@@ -25,12 +25,7 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureThumbnails(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/web.go
+1 -6
View File
@@ -18,12 +18,7 @@ func WebCommand(cfg *config.Config) *cli.Command {
Flags: flagset.ServerWithConfig(cfg.Web),
Action: func(c *cli.Context) error {
origCmd := command.Server(configureWeb(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}
ocis/pkg/command/webdav.go
+1 -6
View File
@@ -24,12 +24,7 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureWebDAV(cfg))
if err := origCmd.Before(c); err != nil {
return err
}
return cli.HandleAction(origCmd.Action, c)
return handleOriginalAction(c, origCmd)
},
}
}