Skip to content

dont reuse etag for folders marked explicitly unscanned #41327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 4 commits into from
Jan 31, 2024
Merged

dont reuse etag for folders marked explicitly unscanned #41327

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e14bceb
dont reuse etag for folders marked explicitly unscanned
icewind1991 Nov 7, 2023
2cf9ed7
add test for updating etag with unchanged mtime
icewind1991 Nov 7, 2023
7aed19a
add test for updating etag with unchanged mtime in child folder
icewind1991 Nov 22, 2023
b777304
also updated parent etags when a changed etag is detected during scan…
icewind1991 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
dont reuse etag for folders marked explicitly unscanned 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Jan 31, 2024
commit e14bceb63fc07a9bde7c8e62605b779d673e91c0
3 changes: 2 additions & 1 deletion lib/private/Files/Cache/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData =
$fileId = $cacheData['fileid'];
$data['fileid'] = $fileId;
// only reuse data if the file hasn't explicitly changed
if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) {
$mtimeUnchanged = isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime'];
if ($mtimeUnchanged && $cacheData['size'] !== -1) {
$data['mtime'] = $cacheData['mtime'];
if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
$data['size'] = $cacheData['size'];
Expand Down