Ensembia/nextcloud-ng_backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Restore through Nextcloud: also a restored folder that is itself empty gets its time back

Browse Source
This commit is contained in:
Dillard Blom
2026-11-06 18:40:10 +01:00
parent 0b9fa1ae92
commit 8897d8074f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Service/RestoreService.php
+2 -1
View File
@@ -150,6 +150,7 @@ final class RestoreService {
} elseif ($mode !== self::MODE_MERGE && $mode !== self::MODE_REPLACE) { } elseif ($mode !== self::MODE_MERGE && $mode !== self::MODE_REPLACE) {
throw new \InvalidArgumentException("Unknown mode $mode"); throw new \InvalidArgumentException("Unknown mode $mode");
} }
$destExisted = $parentRel === '' || $userFolder->nodeExists($parentRel);
$dest = $this->ensureFolder($userFolder, $parentRel); $dest = $this->ensureFolder($userFolder, $parentRel);
$names = $single ? [basename($rel) => $entries['']] : $entries; $names = $single ? [basename($rel) => $entries['']] : $entries;
@@ -174,7 +175,7 @@ final class RestoreService {
foreach ($emptyDirs as $dir => $mtime) { foreach ($emptyDirs as $dir => $mtime) {
$dir = (string)$dir; $dir = (string)$dir;
$existed = $dir === '' || $dest->nodeExists($dir); // one that is there keeps its own time $existed = $dir === '' ? $destExisted : $dest->nodeExists($dir); // one that is there keeps its own time
$folder = $this->ensureFolder($dest, $dir); $folder = $this->ensureFolder($dest, $dir);
if (!$existed) { if (!$existed) {
$folder->touch($mtime); $folder->touch($mtime);