Normalize file name before existence check in scanner

The scanner would not find a NFD-encoded file name in an
existing file list that is normalized.

This normalizes the file name before scanning.

Fixes issues where scanning repeatedly would make NFD files flicker in
and out of existence in the file cache.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php
index 8baab8746fcf5366347288a78720005b00e78658..a88d49d32c23325914fe3145351618629547b378 100644 (file)
--- a/lib/private/Files/Cache/Scanner.php
+++ b/lib/private/Files/Cache/Scanner.php
@@ -420,6 +420,7 @@ class Scanner extends BasicEmitter implements IScanner {
                                continue;
                        }
                        $file = $fileMeta['name'];
+                       $file = trim(\OC\Files\Filesystem::normalizePath($file), '/');
                        $newChildNames[] = $file;
                        $child = $path ? $path . '/' . $file : $file;
                        try {