Fixed exclusion

Commifreak · Mar 29, 2023 · b159d67 · b159d67
1 parent 7dfa708
commit b159d67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/include/ABHelper.php b/src/include/ABHelper.php
@@ -292,6 +292,10 @@ public static function backupContainer($container, $destination) {
                 foreach ($excludes as $exclude) {
                     $exclude = rtrim($exclude, "/");
                     if (!empty($exclude)) {
+                        if (str_starts_with($exclude, $dockerAppdataPath)) {
+                            self::backupLog("exclude is within appdata apth: stripping appdata path", self::LOGLEVEL_DEBUG);
+                            $exclude = ltrim(str_replace($dockerAppdataPath, '', $exclude), '/');
+                        }
                         array_unshift($tarOptions, '--exclude ' . escapeshellarg($exclude)); // Add excludes to the beginning - https://unix.stackexchange.com/a/33334
                         array_unshift($tarVerifyOptions, '--exclude ' . escapeshellarg($exclude)); // Add excludes to the beginning - https://unix.stackexchange.com/a/33334
                     }

diff --git a/src/scripts/backup.php b/src/scripts/backup.php
@@ -363,6 +363,7 @@
                 $backupDate    = date_create_from_format("??_Ymd_His", $correctedItem);
                 if (!$backupDate) {
                     ABHelper::backupLog("Cannot create date from " . $correctedItem, ABHelper::LOGLEVEL_DEBUG);
+                    $toKeep[] = $backupItem; // Keep the errornous object - Better safe than sorry.
                     continue;
                 }
                 if ($backupDate >= $nowDate && !in_array($backupItem, $toKeep)) {