shinyoukai/marisa
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add test for errors

Browse Source 
git-svn-id: file:///srv/svn/repo/marisa/trunk@58 d6811dac-2434-b64a-9ddc-f563ab233461
This commit is contained in:
dev
2022-01-18 06:03:39 +00:00
parent 3b350820f1
commit 18626b9821
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
partage-trash/partage-trash.go
View File

@@ -51,23 +51,31 @@ func checkexpiry(path string, info os.FileInfo, err error) error {
log.Fatal(err) log.Fatal(err)
} }
now := time.Now().Unix()
count++ count++
now := time.Now().Unix()
if verbose {
log.Printf("now: %s, expiry: %s\n", now, meta.Expiry);
}
if meta.Expiry > 0 && now >= meta.Expiry { if meta.Expiry > 0 && now >= meta.Expiry {
if verbose { if verbose {
expiration := humanize.Time(time.Unix(meta.Expiry, 0)) expiration := humanize.Time(time.Unix(meta.Expiry, 0))
log.Printf("%s/%s: expired %s\n", conf.filepath, meta.Filename, expiration) log.Printf("%s/%s: expired %s\n", conf.filepath, meta.Filename, expiration)
} }
os.Remove(conf.filepath + "/" + meta.Filename) if err = os.Remove(conf.filepath + "/" + meta.Filename); err != nil {
os.Remove(path) log.Fatal(err)
}
if err = os.Remove(path); err != nil {
log.Fatal(err)
}
deleted++ deleted++
return nil return nil
} else { } else {
if verbose { if verbose {
expiration := humanize.Time(time.Unix(meta.Expiry, 0)) expiration := humanize.Time(time.Unix(meta.Expiry, 0))
log.Printf("%s/%s: expire %s\n", conf.filepath, meta.Filename, expiration) log.Printf("%s/%s: expire in %s\n", conf.filepath, meta.Filename, expiration)
} }
size += meta.Size size += meta.Size
} }