fixes #141, rmdir updates feed with magicword

fairDataSociety · Nov 10, 2021 · 121f534 · 121f534
1 parent cf3e6c6
commit 121f534
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/pkg/dir/dir_present.go b/pkg/dir/dir_present.go
@@ -23,6 +23,9 @@ import (
 // IsDirectoryPresent this function check if a given directory is present inside the pod.
 func (d *Directory) IsDirectoryPresent(directoryNameWithPath string) bool {
 	topic := utils.HashString(directoryNameWithPath)
-	_, _, err := d.fd.GetFeedData(topic, d.userAddress)
+	_, metaBytes, err := d.fd.GetFeedData(topic, d.userAddress)
+	if string(metaBytes) == utils.DeletedFeedMagicWord {
+		return false
+	}
 	return err == nil
 }
diff --git a/pkg/dir/mkdir.go b/pkg/dir/mkdir.go
@@ -70,9 +70,9 @@ func (d *Directory) MkDir(dirToCreateWithPath string) error {
 	}
 
 	// upload the metadata as blob
-	previousAddr, previousData, err := d.fd.GetFeedData(topic, d.userAddress)
-	if err == nil && previousAddr != nil && previousData != nil {
-		_, err = d.fd.UpdateFeed(topic, d.userAddress, previousData)
+	previousAddr, _, err := d.fd.GetFeedData(topic, d.userAddress)
+	if err == nil && previousAddr != nil {
+		_, err = d.fd.UpdateFeed(topic, d.userAddress, data)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/dir/rmdir.go b/pkg/dir/rmdir.go
@@ -77,7 +77,7 @@ func (d *Directory) RmDir(directoryNameWithPath string) error {
 
 	// remove the feed and clear the data structure
 	topic := utils.HashString(totalPath)
-	err := d.fd.DeleteFeed(topic, d.userAddress)
+	_, err := d.fd.UpdateFeed(topic, d.userAddress, []byte(utils.DeletedFeedMagicWord))
 	if err != nil {
 		return err
 	}