Changeset 58 in code for trunk

Timestamp:

Jan 18, 2022, 6:03:39 AM (3 years ago)

Author:

dev

Message:

Add test for errors

File:

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

trunk/partage-trash/partage-trash.go

@@ -52 +52 @@
         }
 
-        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 {
@@ -61 +65 @@
                         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
@@ -68 +76 @@
                 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