refactor: Use fileperm from absto const

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Aug 5, 2023 · a64e606 · a64e606
1 parent e0dcac2
commit a64e606
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/pkg/crud/create.go b/pkg/crud/create.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"path"
 
+	absto "github.com/ViBiOh/absto/pkg/model"
 	"github.com/ViBiOh/fibr/pkg/provider"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
@@ -32,7 +33,7 @@ func (a App) Create(w http.ResponseWriter, r *http.Request, request provider.Req
 
 	pathname := request.SubPath(name)
 
-	if err = a.storageApp.Mkdir(r.Context(), pathname, provider.DirectoryPerm); err != nil {
+	if err = a.storageApp.Mkdir(r.Context(), pathname, absto.DirectoryPerm); err != nil {
 		a.error(w, r, request, model.WrapInternal(err))
 		return
 	}

diff --git a/pkg/crud/list.go b/pkg/crud/list.go
@@ -219,7 +219,7 @@ func (a App) addFileToZip(ctx context.Context, zipWriter *zip.Writer, item absto
 		Modified:           item.Date,
 		Method:             zip.Deflate,
 	}
-	header.SetMode(0o600)
+	header.SetMode(absto.RegularFilePerm)
 
 	var writer io.Writer
 	writer, err = zipWriter.CreateHeader(header)

diff --git a/pkg/crud/upload_chunk.go b/pkg/crud/upload_chunk.go
@@ -34,13 +34,13 @@ func (a App) uploadChunk(w http.ResponseWriter, r *http.Request, request provide
 	tempDestination := filepath.Join(a.temporaryFolder, sha.New(fileName))
 	tempFile := filepath.Join(tempDestination, chunkNumber)
 
-	if err = os.MkdirAll(tempDestination, 0o700); err != nil {
+	if err = os.MkdirAll(tempDestination, absto.DirectoryPerm); err != nil {
 		a.error(w, r, request, model.WrapInternal(err))
 		return
 	}
 
 	var writer *os.File
-	writer, err = os.OpenFile(tempFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o600)
+	writer, err = os.OpenFile(tempFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, absto.RegularFilePerm)
 	if err != nil {
 		return
 	}
@@ -124,7 +124,7 @@ func (a App) mergeChunk(w http.ResponseWriter, r *http.Request, request provider
 }
 
 func (a App) mergeChunkFiles(directory, destination string) error {
-	writer, err := os.OpenFile(destination, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o600)
+	writer, err := os.OpenFile(destination, os.O_RDWR|os.O_CREATE|os.O_TRUNC, absto.RegularFilePerm)
 	if err != nil {
 		return fmt.Errorf("open destination file `%s`: %w", destination, err)
 	}

diff --git a/pkg/metadata/util.go b/pkg/metadata/util.go
@@ -56,7 +56,7 @@ func (a App) saveMetadata(ctx context.Context, item absto.Item, data any) error
 			return fmt.Errorf("check directory existence: %w", err)
 		}
 
-		if err = a.storageApp.Mkdir(ctx, dirname, provider.DirectoryPerm); err != nil {
+		if err = a.storageApp.Mkdir(ctx, dirname, absto.DirectoryPerm); err != nil {
 			return fmt.Errorf("create directory: %w", err)
 		}
 	}

diff --git a/pkg/provider/event.go b/pkg/provider/event.go
@@ -348,7 +348,7 @@ func (e EventBus) Start(ctx context.Context, storageApp absto.Storage, renamers
 }
 
 func RenameDirectory(ctx context.Context, storageApp absto.Storage, renamers []Renamer, old, new absto.Item) {
-	if err := storageApp.Mkdir(ctx, MetadataDirectory(new), DirectoryPerm); err != nil {
+	if err := storageApp.Mkdir(ctx, MetadataDirectory(new), absto.DirectoryPerm); err != nil {
 		logger.Error("create new metadata directory: %s", err)
 		return
 	}

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -7,7 +7,6 @@ import (
 )
 
 const (
-	DirectoryPerm         = 0o700
 	MetadataDirectoryName = "/.fibr"
 	MaxConcurrency        = uint64(6)
 )

diff --git a/pkg/provider/util.go b/pkg/provider/util.go
@@ -169,7 +169,7 @@ func WriteToStorage(ctx context.Context, storageApp absto.Storage, output string
 	var err error
 	directory := path.Dir(output)
 
-	if err = storageApp.Mkdir(ctx, directory, DirectoryPerm); err != nil {
+	if err = storageApp.Mkdir(ctx, directory, absto.DirectoryPerm); err != nil {
 		return fmt.Errorf("create directory: %w", err)
 	}
 

diff --git a/pkg/search/crud.go b/pkg/search/crud.go
@@ -105,7 +105,7 @@ func (a App) save(ctx context.Context, item absto.Item, content Searches) error
 			return fmt.Errorf("check directory existence: %w", err)
 		}
 
-		if err = a.storageApp.Mkdir(ctx, dirname, provider.DirectoryPerm); err != nil {
+		if err = a.storageApp.Mkdir(ctx, dirname, absto.DirectoryPerm); err != nil {
 			return fmt.Errorf("create directory: %w", err)
 		}
 	}

diff --git a/pkg/share/share.go b/pkg/share/share.go
@@ -132,7 +132,7 @@ func (a *App) refresh(ctx context.Context) error {
 			return err
 		}
 
-		if err := a.storageApp.Mkdir(ctx, provider.MetadataDirectoryName, provider.DirectoryPerm); err != nil {
+		if err := a.storageApp.Mkdir(ctx, provider.MetadataDirectoryName, absto.DirectoryPerm); err != nil {
 			return fmt.Errorf("create dir: %w", err)
 		}
 

diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -107,7 +107,7 @@ func (a *App) loadWebhooks(ctx context.Context) error {
 			return err
 		}
 
-		if err := a.storageApp.Mkdir(ctx, provider.MetadataDirectoryName, provider.DirectoryPerm); err != nil {
+		if err := a.storageApp.Mkdir(ctx, provider.MetadataDirectoryName, absto.DirectoryPerm); err != nil {
 			return fmt.Errorf("create dir: %w", err)
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ import ( @@
     )
     const (
-    	DirectoryPerm         = 0o700
     	MetadataDirectoryName = "/.fibr"
     	MaxConcurrency        = uint64(6)
     )
@@ Expand Down @@