Merge pull request #40 from FriendsOfREDAXO/snapshot_left

Keep at least 2 Snapshots closes #39

Author: dergel

lib/Index.php

@@ -153,17 +153,31 @@ public static function cleanUpSnapshots(): void
 
         $cleanup_interval = (int) $cleanup_interval;
 
-        $sql = rex_sql::factory();
-        $sql->setTable(rex::getTable('diff_detect_index'));
-        $sql->setWhere('createdate < DATE_SUB(:datetime, INTERVAL :interval SECOND)', [
-            'datetime' => date(rex_sql::FORMAT_DATETIME),
-            'interval' => $cleanup_interval,
-        ]);
-        $sql->delete();
-        if (null !== $sql->getError()) {
-            throw new rex_exception($sql->getError());
+        foreach (Url::getAll() as $URL) {
+            $indeces = rex_sql::factory()->getArray('
+                SELECT *
+                FROM ' . rex::getTable('diff_detect_index') . ' as t1
+                JOIN (
+                    SELECT id
+                    FROM ' . rex::getTable('diff_detect_index') . '
+                    WHERE url_id = :url_id
+                    ORDER BY createdate DESC
+                    LIMIT 2,100000
+                ) as t2 ON t1.id = t2.id
+                WHERE
+                url_id = :url_id
+                AND createdate < DATE_SUB(:datetime, INTERVAL :interval SECOND)
+            ', [
+                'url_id' => $URL->getId(),
+                'datetime' => date(rex_sql::FORMAT_DATETIME),
+                'interval' => $cleanup_interval,
+            ]);
+
+            foreach ($indeces as $Index) {
+                $Index = self::fromSqlData($Index);
+                $Index->delete();
+            }
         }
-
     }
 
     public function setUrl(Url $url): self
@@ -189,4 +203,21 @@ public function getContent(): string
         $content = (new Html2Text($content))->getText();
         return $content;
     }
+
+    public function delete(): void
+    {
+        $sql = rex_sql::factory()->setQuery(
+            '
+        DELETE from ' . rex::getTable('diff_detect_index') . '
+        WHERE id = :id
+        ',
+            [
+                'id' => $this->getId(),
+            ],
+        );
+
+        if (null !== $sql->getError()) {
+            throw new rex_exception($sql->getError());
+        }
+    }
 }

lib/Url.php

@@ -51,6 +51,24 @@ public static function get(int $id): ?self
         return self::fromSqlData($data);
     }
 
+    /**
+     * @throws rex_sql_exception
+     * @return array<Url>
+     */
+    public static function getAll(): array
+    {
+        $sql = rex_sql::factory();
+        $sql->setTable(rex::getTable('diff_detect_url'));
+        $sql->select();
+
+        $urls = [];
+        foreach ($sql->getArray() as $data) {
+            $urls[] = self::fromSqlData($data);
+        }
+
+        return $urls;
+    }
+
     public function getId(): ?int
     {
         return $this->id;

pages/url.list.php

@@ -134,7 +134,7 @@
     $urlParams = [
         'func' => 'status',
         'id' => $list->getValue('id'),
-        'status' => ('0' == $list->getValue('status')) ? '1' : '0',
+        'status' => ('0' === $list->getValue('status')) ? '1' : '0',
     ];
 
     $start = rex_request($startKey = $list->getName() . '_start', 'string', '');