mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-05 11:10:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server][cmd] fix default storage directory

Browse Source
This commit is contained in:
Abhishek Shroff
2024-10-17 11:19:39 +05:30
parent 3720a1c1c7
commit dc9b2b90d7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/internal/command/appcmd/appcmd.go
View File

@@ -24,7 +24,7 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
logrus.Fatal(err)
}
if err := storage.Create(context.Background(), *db, viper.GetString("content-dir")); err != nil {
if err := storage.Create(context.Background(), *db, viper.GetString("default_storage_dir")); err != nil {
logrus.Fatal(err)
}
if err := core.Create(context.Background(), *db, storage.Default, debug); err != nil {
@@ -36,8 +36,8 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
flags.Bool("no-auto-migrate", false, "Do not automatically migrate database schema")
viper.BindPFlag("no_auto_migrate", flags.Lookup("no-auto-migrate"))
flags.StringP("content-dir", "C", "content", "Content Directory")
viper.BindPFlag("content_dir", flags.Lookup("content-dir"))
flags.StringP("default-storage-dir", "S", "storage/default", "Default Storage Directory")
viper.BindPFlag("default_storage_dir", flags.Lookup("default-storage-dir"))
cmd.AddCommand([]*cobra.Command{
setupServeCommand(),

6
server/internal/storage/storage.go
View File

@@ -28,14 +28,16 @@ type storage struct {
var Default Storage
func Create(ctx context.Context, db *db.DbHandler, contentDir string) error {
func Create(ctx context.Context, db *db.DbHandler, defaultStorageDir string) error {
if backends, err := restoreBackends(db, ctx); err != nil {
return err
} else if defaultBackend, err := newLocalStorage("<default>", defaultStorageDir); err != nil {
return err
} else {
Default = storage{
db: db,
backends: backends,
defaultBackend: localStorage{name: "<default>", root: contentDir},
defaultBackend: defaultBackend,
}
return nil
}