introduce NodeInfo

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>

internal/grpc/services/publicstorageprovider/publicstorageprovider.go

@@ -46,14 +46,13 @@ func init() {
 
 type config struct {
 	MountPath   string `mapstructure:"mount_path"`
-	MountID     string `mapstructure:"mount_id"`
 	GatewayAddr string `mapstructure:"gateway_addr"`
 }
 
 type service struct {
-	conf               *config
-	mountPath, mountID string
-	gateway            gateway.GatewayAPIClient
+	conf      *config
+	mountPath string
+	gateway   gateway.GatewayAPIClient
 }
 
 func (s *service) Close() error {
@@ -85,7 +84,6 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 	}
 
 	mountPath := c.MountPath
-	mountID := c.MountID
 
 	gateway, err := pool.GetGatewayServiceClient(c.GatewayAddr)
 	if err != nil {
@@ -95,7 +93,6 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 	service := &service{
 		conf:      c,
 		mountPath: mountPath,
-		mountID:   mountID,
 		gateway:   gateway,
 	}
 

pkg/storage/fs/loader/loader.go

@@ -28,6 +28,5 @@ import (
 	_ "github.com/cs3org/reva/pkg/storage/fs/ocis"
 	_ "github.com/cs3org/reva/pkg/storage/fs/owncloud"
 	_ "github.com/cs3org/reva/pkg/storage/fs/s3"
-	_ "github.com/cs3org/reva/pkg/storage/fs/stub"
 	// Add your own here
 )

pkg/storage/fs/ocis/node.go

@@ -0,0 +1,58 @@
+package ocis
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+)
+
+// NodeInfo allows referencing a node by id and optionally a relative path
+type NodeInfo struct {
+	ParentID string
+	ID       string
+	Name     string
+	Exists   bool
+}
+
+// BecomeParent rewrites the internal state to point to the parent id
+func (n *NodeInfo) BecomeParent() {
+	n.ID = n.ParentID
+	n.ParentID = ""
+	n.Name = ""
+	n.Exists = false
+}
+
+// Create creates a new node in the given root and add symlinks to parent node
+// TODO use a reference to the tree to access tho root?
+func (n *NodeInfo) Create(root string) (err error) {
+
+	if n.ID != "" {
+		return errors.Wrap(err, "ocisfs: node already his an id")
+	}
+	// create a new file node
+	n.ID = uuid.New().String()
+
+	nodePath := filepath.Join(root, "nodes", n.ID)
+
+	err = os.MkdirAll(nodePath, 0700)
+	if err != nil {
+		return errors.Wrap(err, "ocisfs: could not create node dir")
+	}
+	// create back link
+	// we are not only linking back to the parent, but also to the filename
+	link := "../" + n.ParentID + "/children/" + n.Name
+	err = os.Symlink(link, filepath.Join(nodePath, "parentname"))
+	if err != nil {
+		return errors.Wrap(err, "ocisfs: could not symlink parent node")
+	}
+
+	// link child name to node
+	err = os.Symlink("../../"+n.ID, filepath.Join(root, "nodes", n.ParentID, "children", n.Name))
+	if err != nil {
+		return errors.Wrap(err, "ocisfs: could not symlink child entry")
+	}
+
+	return nil
+}