upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

Merge 8fd10a534a into d09b8c99de

Browse source
This commit is contained in:
Robin Appelman 2026-02-03 19:58:22 -01:00 committed by GitHub
commit 1bfb8c652b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/private/Files/Cache/Updater.php
View file

@ -124,7 +124,7 @@ class Updater implements IUpdater {
if ($this->cache instanceof Cache && $sizeDifference === null) {
$this->cache->correctFolderSize($path, $data);
}
$this->correctParentStorageMtime($path);
$this->correctParentStorageMtime($path, $data['parent'] ?? null);
$this->propagator->propagateChange($path, $time, $sizeDifference ?? 0);
}
@ -147,10 +147,11 @@ class Updater implements IUpdater {
$this->cache->remove($path);
$this->correctParentStorageMtime($path);
if ($entry instanceof ICacheEntry) {
$this->correctParentStorageMtime($path, $entry->getParentId());
$this->propagator->propagateChange($path, time(), -$entry->getSize());
} else {
$this->correctParentStorageMtime($path);
$this->propagator->propagateChange($path, time());
if ($this->cache instanceof Cache) {
$this->cache->correctFolderSize($parent);
@ -244,7 +245,7 @@ class Updater implements IUpdater {
$this->cache->correctFolderSize($target);
}
if ($sourceUpdater instanceof Updater) {
$sourceUpdater->correctParentStorageMtime($source);
$sourceUpdater->correctParentStorageMtime($source, $sourceInfo ? $sourceInfo->getParentId() : null);
}
$this->correctParentStorageMtime($target);
$this->updateStorageMTimeOnly($target);
@ -269,11 +270,11 @@ class Updater implements IUpdater {
/**
* update the storage_mtime of the direct parent in the cache to the mtime from the storage
*
* @param string $internalPath
*/
private function correctParentStorageMtime($internalPath) {
$parentId = $this->cache->getParentId($internalPath);
private function correctParentStorageMtime(string $internalPath, ?int $parentId = null) {
if ($parentId === null) {
$parentId = $this->cache->getParentId($internalPath);
}
$parent = dirname($internalPath);
if ($parentId != -1) {
$mtime = $this->storage->filemtime($parent);