Elara6331/infinitime
Archived
2
0
Fork 4
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Elara6331:3e9957d419616768438692ae476c72a8be8a1649
Branches Tags
Elara6331:master
...
compare: Elara6331:01970b2bb7701a5e78e35348247eb4292cc12b0d
Branches Tags
Elara6331:master

2 Commits
3e9957d419 ... 01970b2bb7

Author SHA1 Message Date
Arsen Musayelyan
01970b2bb7 Add debug logging to resource loading 2022-10-16 12:39:42 -07:00
Arsen Musayelyan
b476853dc0 Fix RemoveAll() and MkdirAll() functions 2022-10-16 12:39:11 -07:00
2 changed files with 34 additions and 6 deletions
Show Stats Expand all files Collapse all files

19
blefs/all.go
View File

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

21
resources.go
View File

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