MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure errors are handled

Browse Source
This commit is contained in:
Dane Everitt 2020-07-18 10:47:15 -07:00
parent 115131575d
commit 1b5684e6f8
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/filesystem.go
View File

@ -224,6 +224,10 @@ func (fs *Filesystem) getCachedDiskUsage() (int64, error) {
func (fs *Filesystem) DirectorySize(dir string) (int64, error) { func (fs *Filesystem) DirectorySize(dir string) (int64, error) {
var size int64 var size int64
err := fs.Walk(dir, func(_ string, f os.FileInfo, err error) error { err := fs.Walk(dir, func(_ string, f os.FileInfo, err error) error {
if err != nil {
return err
}
if !f.IsDir() { if !f.IsDir() {
atomic.AddInt64(&size, f.Size()) atomic.AddInt64(&size, f.Size())
} }
@ -663,6 +667,10 @@ func (fs *Filesystem) GetIncludedFiles(dir string, ignored []string) (*backup.In
inc := new(backup.IncludedFiles) inc := new(backup.IncludedFiles)
if err := fs.Walk(cleaned, func(p string, f os.FileInfo, err error) error { if err := fs.Walk(cleaned, func(p string, f os.FileInfo, err error) error {
if err != nil {
return err
}
// Avoid unnecessary parsing if there are no ignored files, nothing will match anyways // Avoid unnecessary parsing if there are no ignored files, nothing will match anyways
// so no reason to call the function. // so no reason to call the function.
if len(ignored) == 0 || !i.MatchesPath(strings.TrimPrefix(p, fs.Path()+"/")) { if len(ignored) == 0 || !i.MatchesPath(strings.TrimPrefix(p, fs.Path()+"/")) {
@ -716,6 +724,10 @@ func (fs *Filesystem) CompressFiles(dir string, paths []string) (os.FileInfo, er
if f.IsDir() { if f.IsDir() {
err := fs.Walk(p, func(s string, info os.FileInfo, err error) error { err := fs.Walk(p, func(s string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if !info.IsDir() { if !info.IsDir() {
inc.Push(&info, s) inc.Push(&info, s)
} }