backup: unbackup, Bucket.ItemsCount for state management

core/textile/bucket/bucket.go

@@ -64,6 +64,11 @@ type BucketInterface interface {
 		ctx context.Context,
 		path string,
 	) (path.Resolved, error)
+	ItemsCount(
+		ctx context.Context,
+		path string,
+		withRecursive bool,
+	) (int32, error)
 }
 
 type Notifier interface {

core/textile/bucket/bucket_dir.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/FleekHQ/space-daemon/core/textile/utils"
 	"github.com/FleekHQ/space-daemon/log"
 	"github.com/ipfs/interface-go-ipfs-core/path"
 )
@@ -80,3 +81,37 @@ func (b *Bucket) DeleteDirOrFile(ctx context.Context, path string) (path.Resolve
 
 	return b.bucketsClient.RemovePath(ctx, b.Key(), path)
 }
+
+// return the recursive items count for a path
+func (b *Bucket) ItemsCount(ctx context.Context, path string, withRecursive bool) (int32, error) {
+	b.lock.RLock()
+	defer b.lock.RUnlock()
+
+	var count int32
+
+	dir, err := b.ListDirectory(ctx, path)
+	if err != nil {
+		return 0, err
+	}
+
+	count = dir.Item.ItemsCount
+
+	if withRecursive {
+		for _, item := range dir.Item.Items {
+			if utils.IsMetaFileName(item.Name) {
+				continue
+			}
+
+			if item.IsDir {
+				n, err := b.ItemsCount(ctx, item.Path, withRecursive)
+				if err != nil {
+					return 0, err
+				}
+
+				count += n
+			}
+		}
+	}
+
+	return count, nil
+}

core/textile/sync/task-executors.go

@@ -65,8 +65,13 @@ func (s *synchronizer) processRemoveItem(ctx context.Context, task *Task) error
 
 	s.notifySyncNeeded()
 
-	// TODO: Remove file from mirror
-	return nil
+	if err := s.unsetMirrorFileBackup(ctx, path, bucket); err != nil {
+		return err
+	}
+
+	err := s.deleteFileFromRemote(ctx, bucket, path)
+
+	return err
 }
 
 func (s *synchronizer) processPinFile(ctx context.Context, task *Task) error {

grpc/handlers_textile.go

@@ -8,14 +8,18 @@ import (
 	"github.com/FleekHQ/space-daemon/grpc/pb"
 )
 
-func parseBucket(b textile.Bucket) *pb.Bucket {
+func parseBucket(ctx context.Context, b textile.Bucket) *pb.Bucket {
 	bd := b.GetData()
+
+	itemsCount, _ := b.ItemsCount(ctx, bd.Path, false)
+
 	br := &pb.Bucket{
-		Key:       bd.Key,
-		Name:      bd.Name,
-		Path:      bd.Path,
-		CreatedAt: bd.CreatedAt,
-		UpdatedAt: bd.UpdatedAt,
+		Key:        bd.Key,
+		Name:       bd.Name,
+		Path:       bd.Path,
+		CreatedAt:  bd.CreatedAt,
+		UpdatedAt:  bd.UpdatedAt,
+		ItemsCount: itemsCount,
 
 		// TODO: Fill these out from metathread + identity service call
 		Members:          []*pb.BucketMember{},
@@ -31,7 +35,7 @@ func (srv *grpcServer) CreateBucket(ctx context.Context, request *pb.CreateBucke
 		return nil, err
 	}
 
-	parsedBucket := parseBucket(b)
+	parsedBucket := parseBucket(ctx, b)
 	return &pb.CreateBucketResponse{
 		Bucket: parsedBucket,
 	}, nil
@@ -46,7 +50,7 @@ func (srv *grpcServer) ListBuckets(ctx context.Context, request *pb.ListBucketsR
 	parsedBuckets := []*pb.Bucket{}
 
 	for _, b := range buckets {
-		parsedBucket := parseBucket(b)
+		parsedBucket := parseBucket(ctx, b)
 		parsedBuckets = append(parsedBuckets, parsedBucket)
 	}
 

grpc/proto/space.proto

@@ -399,6 +399,7 @@ message Bucket {
   repeated BucketMember members = 6;
   bool isPersonalBucket = 7;
   bool isBackupEnabled = 8;
+  int32 itemsCount = 9;
 }
 
 message CreateBucketResponse {
@@ -690,4 +691,4 @@ message GetRecentlySharedWithRequest {}
 
 message GetRecentlySharedWithResponse {
  repeated FileMember members = 1;
-}
+}

swagger/ui/space.swagger.json

@@ -1440,6 +1440,10 @@
         "isBackupEnabled": {
           "type": "boolean",
           "format": "boolean"
+        },
+        "itemsCount": {
+          "type": "integer",
+          "format": "int32"
         }
       }
     },