blefs/all.go

@@ -38,19 +38,12 @@ func (blefs *FS) removeAllChildren(path string) error {
 	}
 
 	for _, entry := range list {
-		name := entry.Name()
-
-		if name == "." || name == ".." {
-			continue
-		}
-		entryPath := filepath.Join(path, name)
-
 		if entry.IsDir() {
-			err = blefs.removeAllChildren(entryPath)
+			err = blefs.removeAllChildren(filepath.Join(path, entry.Name()))
 		} else {
-			err = blefs.Remove(entryPath)
+			err = blefs.Remove(path)
 		}
-		if err != nil && err.(FSError).Code != -2 {
+		if err != nil {
 			return err
 		}
 	}
@@ -65,7 +58,7 @@ func (blefs *FS) MkdirAll(path string) error {
 
 	splitPath := strings.Split(path, "/")
 	for i := 1; i < len(splitPath); i++ {
-		curPath := strings.Join(splitPath[0:i+1], "/")
+		curPath := strings.Join(splitPath[0:i], "/")
 
 		err := blefs.Mkdir(curPath)
 		if err != nil && err.(FSError).Code != -17 {

resources.go

@@ -77,16 +77,12 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 		return nil, err
 	}
 
-	log.Debug().Msg("Decoded manifest file")
-
 	go func() {
 		defer close(out)
 
 		for _, file := range manifest.Obsolete {
 			name := filepath.Base(file.Path)
 
-			log.Debug().Str("file", file.Path).Msg("Removing file")
-
 			err := fs.RemoveAll(file.Path)
 			if err != nil {
 				out <- ResourceLoadProgress{
@@ -97,8 +93,6 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 				return
 			}
 
-			log.Debug().Str("file", file.Path).Msg("Removed file")
-
 			out <- ResourceLoadProgress{
 				Name:      name,
 				Operation: ResourceOperationRemoveObsolete,
@@ -127,11 +121,8 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 				return
 			}
 
-			log.Debug().Str("file", file.Path).Msg("Making directories")
-
 			err = fs.MkdirAll(filepath.Dir(file.Path))
 			if err != nil {
-				log.Debug().Err(err).Msg("Error making directories")
 				out <- ResourceLoadProgress{
 					Name:      file.Name,
 					Operation: ResourceOperationUpload,
@@ -141,14 +132,8 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 				return
 			}
 
-			log.Debug().
-				Str("file", file.Path).
-				Int64("size", srcFi.Size()).
-				Msg("Creating file")
-
 			dst, err := fs.Create(file.Path, uint32(srcFi.Size()))
 			if err != nil {
-				log.Debug().Err(err).Msg("Error creating file")
 				out <- ResourceLoadProgress{
 					Name:      file.Name,
 					Operation: ResourceOperationUpload,
@@ -161,11 +146,6 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 			progCh := dst.Progress()
 			go func() {
 				for sent := range progCh {
-					log.Debug().
-						Int64("total", srcFi.Size()).
-						Uint32("sent", sent).
-						Msg("Progress event sent")
-
 					out <- ResourceLoadProgress{
 						Name:      file.Name,
 						Operation: ResourceOperationUpload,
@@ -181,7 +161,6 @@ func LoadResources(file *os.File, fs *blefs.FS) (<-chan ResourceLoadProgress, er
 
 			n, err := io.Copy(dst, src)
 			if err != nil {
-				log.Debug().Err(err).Msg("Error writing to file")
 				out <- ResourceLoadProgress{
 					Name:      file.Name,
 					Operation: ResourceOperationUpload,