feat(s3): Making browsing and uploading of file working

Signed-off-by: Vincent Boutour <[email protected]>

Author: ViBiOh

pkg/crud/upload.go

@@ -8,8 +8,10 @@ import (
 	"mime/multipart"
 	"net/http"
 	"path"
+	"time"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
 )
@@ -56,12 +58,17 @@ func (a App) saveUploadedFile(request provider.Request, part *multipart.Part) (f
 		return "", fmt.Errorf("error while copying file: %s", err)
 	}
 
-	info, err := a.storageApp.Info(filePath)
-	if err != nil {
-		return "", err
-	}
+	go func() {
+		// Waiting 5 seconds before sending hooks
+		time.Sleep(time.Second * 5)
 
-	go a.notify(provider.NewUploadEvent(info))
+		info, err := a.storageApp.Info(filePath)
+		if err != nil {
+			logger.Error("unable to get info for upload event: %s", err)
+		}
+
+		a.notify(provider.NewUploadEvent(info))
+	}()
 
 	return filename, nil
 }

pkg/provider/request.go

@@ -31,7 +31,13 @@ type Request struct {
 
 // GetFilepath of request
 func (r Request) GetFilepath(name string) string {
-	return GetPathname(r.Path, name, r.Share)
+	pathname := GetPathname(r.Path, name, r.Share)
+
+	if len(name) == 0 && strings.HasSuffix(r.Path, "/") {
+		pathname += "/"
+	}
+
+	return pathname
 }
 
 // URL of request

pkg/provider/request_test.go

@@ -19,6 +19,22 @@ func TestGetFilepath(t *testing.T) {
 			"",
 			"/index",
 		},
+		{
+			"directory",
+			Request{
+				Path: "www/",
+			},
+			"",
+			"/www/",
+		},
+		{
+			"directory file",
+			Request{
+				Path: "www/",
+			},
+			"index.html",
+			"/www/index.html",
+		},
 		{
 			"with given path",
 			Request{

pkg/s3/s3.go

@@ -5,11 +5,13 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"path"
 	"sort"
 	"time"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
 	"github.com/ViBiOh/httputils/v4/pkg/flags"
+	"github.com/ViBiOh/httputils/v4/pkg/logger"
 
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
@@ -77,7 +79,8 @@ func (a App) WithIgnoreFn(ignoreFn func(provider.StorageItem) bool) provider.Sto
 // Info provide metadata about given pathname
 func (a App) Info(pathname string) (provider.StorageItem, error) {
 	realPathname := getPath(pathname)
-	if len(realPathname) == 0 {
+
+	if realPathname == "/" {
 		return provider.StorageItem{
 			Name:     "/",
 			Pathname: "/",
@@ -90,18 +93,28 @@ func (a App) Info(pathname string) (provider.StorageItem, error) {
 		return provider.StorageItem{}, convertError(err)
 	}
 
-	return convertToItem(pathname, info), nil
+	return convertToItem(realPathname, info), nil
 }
 
 // List items in the storage
 func (a App) List(pathname string) ([]provider.StorageItem, error) {
+	realPathname := getPath(pathname)
+
+	if realPathname == "/" {
+		realPathname = ""
+	}
+
 	objectsCh := a.client.ListObjects(context.Background(), a.bucket, minio.ListObjectsOptions{
-		Prefix: getPath(pathname),
+		Prefix: realPathname,
 	})
 
 	var items []provider.StorageItem
 	for object := range objectsCh {
-		item := convertToItem(pathname, object)
+		item := convertToItem(realPathname, object)
+		if item.IsDir && item.Name == path.Base(realPathname) {
+			continue
+		}
+
 		if a.ignoreFn != nil && a.ignoreFn(item) {
 			continue
 		}
@@ -118,13 +131,15 @@ func (a App) List(pathname string) ([]provider.StorageItem, error) {
 func (a App) WriterTo(pathname string) (io.WriteCloser, error) {
 	reader, writer := io.Pipe()
 
-	if _, err := a.client.PutObject(context.Background(), a.bucket, getPath(pathname), reader, -1, minio.PutObjectOptions{}); err != nil {
-		if closeErr := writer.Close(); closeErr != nil {
-			err = fmt.Errorf("%s: %w", err, closeErr)
-		}
+	go func() {
+		if _, err := a.client.PutObject(context.Background(), a.bucket, getPath(pathname), reader, -1, minio.PutObjectOptions{}); err != nil {
+			if closeErr := writer.Close(); closeErr != nil {
+				err = fmt.Errorf("%s: %w", err, closeErr)
+			}
 
-		return nil, convertError(err)
-	}
+			logger.Error("unable to put object: %s", err)
+		}
+	}()
 
 	return writer, nil
 }
@@ -183,7 +198,5 @@ func (a App) Rename(oldName, newName string) error {
 
 // Remove file or directory from storage
 func (a App) Remove(pathname string) error {
-	// TODO
-
-	return nil
+	return convertError(a.client.RemoveObject(context.Background(), a.bucket, getPath(pathname), minio.RemoveObjectOptions{}))
 }

pkg/s3/utils.go

@@ -1,6 +1,7 @@
 package s3
 
 import (
+	"path"
 	"strings"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
@@ -13,8 +14,8 @@ func getPath(pathname string) string {
 
 func convertToItem(pathname string, info minio.ObjectInfo) provider.StorageItem {
 	return provider.StorageItem{
-		Name:     info.Key,
-		Pathname: pathname,
+		Name:     path.Base(info.Key),
+		Pathname: info.Key,
 		IsDir:    strings.HasSuffix(info.Key, "/"),
 		Date:     info.LastModified,
 		Size:     info.Size,