Changeset 55 in code for trunk

Timestamp:

Oct 26, 2021, 4:04:39 PM (4 years ago)

Author:

dev

Message:

Provide more info with partage-trash verbose mode

File:

• trunk/partage-trash/partage-trash.go (modified) (3 diffs)

trunk/partage-trash/partage-trash.go

@@ -25 +25 @@
 var verbose bool
 var count int64
+var deleted int64
 var size int64
 
@@ -53 +54 @@
         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
         }
@@ -82 +89 @@
 
         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)))
         }
 }