From 519a29bbad3926644c882e4568ead5f0f3497713 Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Sun, 20 Oct 2024 10:35:41 +0530 Subject: [PATCH] [server][cmd] split serve into separate package --- server/internal/command/appcmd/appcmd.go | 1 - server/internal/command/command.go | 4 +++- .../internal/command/{appcmd => serve}/serve.go | 16 +++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) rename server/internal/command/{appcmd => serve}/serve.go (89%) diff --git a/server/internal/command/appcmd/appcmd.go b/server/internal/command/appcmd/appcmd.go index 701a65ff..68045687 100644 --- a/server/internal/command/appcmd/appcmd.go +++ b/server/internal/command/appcmd/appcmd.go @@ -18,7 +18,6 @@ func SetupCommand() *cobra.Command { viper.BindPFlag("default_storage_dir", flags.Lookup("default-storage-dir")) cmd.AddCommand([]*cobra.Command{ - setupServeCommand(), setupUserCommand(), setupStorageCommand(), }...) diff --git a/server/internal/command/command.go b/server/internal/command/command.go index b64f73de..03eea96f 100644 --- a/server/internal/command/command.go +++ b/server/internal/command/command.go @@ -8,6 +8,7 @@ import ( "github.com/shroff/phylum/server/internal/command/common" "github.com/shroff/phylum/server/internal/command/fs" "github.com/shroff/phylum/server/internal/command/schema" + "github.com/shroff/phylum/server/internal/command/serve" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -52,8 +53,9 @@ func SetupCommand() { rootCmd.AddCommand([]*cobra.Command{ appcmd.SetupCommand(), - fs.SetupCommand(), schema.SetupCommand(), + fs.SetupCommand(), + serve.SetupCommand(), }...) rootCmd.Execute() } diff --git a/server/internal/command/appcmd/serve.go b/server/internal/command/serve/serve.go similarity index 89% rename from server/internal/command/appcmd/serve.go rename to server/internal/command/serve/serve.go index 79797a88..89ce72b8 100644 --- a/server/internal/command/appcmd/serve.go +++ b/server/internal/command/serve/serve.go @@ -1,4 +1,4 @@ -package appcmd +package serve import ( "bytes" @@ -17,8 +17,8 @@ import ( "github.com/spf13/viper" ) -func setupServeCommand() *cobra.Command { - var cmdServe = &cobra.Command{ +func SetupCommand() *cobra.Command { + var cmd = &cobra.Command{ Use: "serve", Short: "Run the server", Run: func(cmd *cobra.Command, args []string) { @@ -51,7 +51,13 @@ func setupServeCommand() *cobra.Command { } }, } - flags := cmdServe.Flags() + flags := cmd.Flags() + + flags.Bool("auto-migrate", true, "Automatically migrate database schema") + viper.BindPFlag("auto_migrate", flags.Lookup("auto-migrate")) + + flags.StringP("default-storage-dir", "S", "storage/default", "Default Storage Directory") + viper.BindPFlag("default_storage_dir", flags.Lookup("default-storage-dir")) flags.StringP("listen", "l", ":1234", "Listen Addres") viper.BindPFlag("listen", flags.Lookup("listen")) @@ -68,7 +74,7 @@ func setupServeCommand() *cobra.Command { flags.String("webdav-prefix", "/webdav", "Listen Addres") viper.BindPFlag("webdav_prefix", flags.Lookup("webdav-prefix")) - return cmdServe + return cmd } func createEngine(debug, logBody bool, corsEnabled bool, corsOrigins []string) *gin.Engine {