prune sim: correctly keep track of already included backups

This needs to happen in a separate loop, because some time intervals are not
subsets of others, i.e. weeks and months. Previously, with a daily backup
schedule, having:
* a backup on Sun, 06 Dec 2020 kept by keep-daily
* a backup on Sun, 29 Nov 2020 kept by keep-weekly
would lead to the backup on Mon, 30 Nov 2020 to be selected for keep-monthly,
because the iteration did not yet reach the backup on Sun, 29 Nov 2020 that
would mark November as being covered.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/docs/prune-simulator/prune-simulator.js b/docs/prune-simulator/prune-simulator.js
index 37d97e2c8e620e9676e1df1b30a6de633c00bbcb..7d79238375401d89393d7c3095c54c9ed9c512bf 100644 (file)
--- a/docs/prune-simulator/prune-simulator.js
+++ b/docs/prune-simulator/prune-simulator.js
@@ -482,16 +482,17 @@ Ext.onReady(function() {
 
                backups.forEach(function(backup) {
                    let mark = backup.mark;
-                   let id = idFunc(backup);
-
-                   if (finished || alreadyIncluded[id]) {
-                       return;
+                   if (mark && mark === 'keep') {
+                       let id = idFunc(backup);
+                       alreadyIncluded[id] = true;
                    }
+               });
 
-                   if (mark) {
-                       if (mark === 'keep') {
-                           alreadyIncluded[id] = true;
-                       }
+               backups.forEach(function(backup) {
+                   let mark = backup.mark;
+                   let id = idFunc(backup);
+
+                   if (finished || alreadyIncluded[id] || mark) {
                        return;
                    }