From 18626b9821fbaa7f54ba249fcb352ea62d365c7c Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 18 Jan 2022 06:03:39 +0000 Subject: [PATCH] Add test for errors git-svn-id: file:///srv/svn/repo/marisa/trunk@58 d6811dac-2434-b64a-9ddc-f563ab233461 --- partage-trash/partage-trash.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/partage-trash/partage-trash.go b/partage-trash/partage-trash.go index e269f21..e010dd0 100644 --- a/partage-trash/partage-trash.go +++ b/partage-trash/partage-trash.go @@ -51,23 +51,31 @@ func checkexpiry(path string, info os.FileInfo, err error) error { log.Fatal(err) } - now := time.Now().Unix() 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 verbose { expiration := humanize.Time(time.Unix(meta.Expiry, 0)) log.Printf("%s/%s: expired %s\n", conf.filepath, meta.Filename, expiration) } - os.Remove(conf.filepath + "/" + meta.Filename) - os.Remove(path) + if err = os.Remove(conf.filepath + "/" + meta.Filename); err != nil { + log.Fatal(err) + } + if err = os.Remove(path); err != nil { + log.Fatal(err) + } deleted++ return nil } else { if verbose { 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 }