From c7687232ef09ea984dced2a8c187a29fadea82de Mon Sep 17 00:00:00 2001
From: dev <dev@d6811dac-2434-b64a-9ddc-f563ab233461>
Date: Tue, 26 Oct 2021 16:04:39 +0000
Subject: [PATCH] Provide more info with partage-trash verbose mode

git-svn-id: file:///srv/svn/repo/marisa/trunk@55 d6811dac-2434-b64a-9ddc-f563ab233461
---
 partage-trash/partage-trash.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/partage-trash/partage-trash.go b/partage-trash/partage-trash.go
index 07dcb1d..e269f21 100644
--- a/partage-trash/partage-trash.go
+++ b/partage-trash/partage-trash.go
@@ -24,6 +24,7 @@ var conf struct {
 
 var verbose bool
 var count int64
+var deleted int64
 var size int64
 
 func readmeta(filename string) (metadata, error) {
@@ -52,16 +53,22 @@ func checkexpiry(path string, info os.FileInfo, err error) error {
 
 	now := time.Now().Unix()
 
+	count++
+
 	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)
+			log.Printf("%s/%s: expired %s\n", conf.filepath, meta.Filename, expiration)
 		}
 		os.Remove(conf.filepath + "/" + meta.Filename)
 		os.Remove(path)
+		deleted++
 		return nil
 	} else {
-		count++
+		if verbose {
+			expiration :=  humanize.Time(time.Unix(meta.Expiry, 0))
+			log.Printf("%s/%s: expire %s\n", conf.filepath, meta.Filename, expiration)
+		}
 		size += meta.Size
 	}
 
@@ -81,6 +88,6 @@ func main() {
 	}
 
 	if verbose && count > 0 {
-		log.Printf("%d file(s) remain on disk (total: %s)", count, humanize.IBytes(uint64(size)))
+		log.Printf("%d/%d file(s) deleted (remaining: %s)", deleted, count, humanize.IBytes(uint64(size)))
 	}
 }