adding data

vandi37 · Dec 30, 2024 · 2322770 · 2322770
1 parent 64a679d
commit 2322770
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/pkg/directory/directory.go b/pkg/directory/directory.go
@@ -166,26 +166,31 @@ func (d *Directory) removeDir(path string, errorIfNotExist bool) error {
 	}
 
 	if path[0] == '/' {
-		return d.root.addDir(path[1:], errorIfNotExist)
+		return d.root.removeDir(path[1:], errorIfNotExist)
 	}
+
 	paths := strings.Split(path, "/")
 
 	currentDir := d
 	if len(paths) > 1 {
 		var err error
-		currentDir, err = d.OpenDirOrCreate(strings.Join(paths[:len(paths)-1], "/"))
-		if err != nil && errorIfNotExist {
-			return err
-		} else if err != nil {
+		currentDir, err = d.OpenDir(strings.Join(paths[:len(paths)-1], "/"))
+		if vanerrors.GetName(err) == DirectoryDoesNotExists && !errorIfNotExist {
 			return nil
 		}
+		if err != nil {
+			return err
+		}
 	}
 
 	dir, ok := currentDir.dirs[paths[len(paths)-1]]
 	if errorIfNotExist && (!ok || dir == nil) {
 		return vanerrors.NewSimple(DirectoryDoesNotExists, paths[len(paths)-1])
 	} else if ok {
-		currentDir.selfRemove()
+		err :=dir.selfRemove()
+		if err != nil {
+			return err
+		}
 		delete(currentDir.dirs, paths[len(paths)-1])
 	}
 	return nil

diff --git a/pkg/directory/file.go b/pkg/directory/file.go
@@ -27,7 +27,7 @@ func (d *Directory) addFile(path string, errorIfExist bool) error {
 	currentDir := d
 	if len(paths) > 1 {
 		var err error
-		currentDir, err = d.OpenDirOrCreate(strings.Join(paths[:len(paths)-1], "/"))
+		currentDir, err = d.OpenDirOrCreate(strings.Join(paths[:last], "/"))
 		if err != nil {
 			return err
 		}
@@ -70,12 +70,13 @@ func (d *Directory) removeFile(path string, errorIfNotExist bool) error {
 	currentDir := d
 	if len(paths) > 1 {
 		var err error
-		currentDir, err = d.OpenDirOrCreate(strings.Join(paths[:len(paths)-1], "/"))
-		if err != nil && errorIfNotExist {
-			return err
-		} else if err != nil {
+		currentDir, err = d.OpenDir(strings.Join(paths[:len(paths)-1], "/"))
+		if vanerrors.GetName(err) == FileDoesNotExists && !errorIfNotExist {
 			return nil
 		}
+		if err != nil {
+			return err
+		}
 	}
 
 	file, ok := currentDir.files[paths[len(paths)-1]]