Skip to content

fix(files): report new files as new in the files:scan summary #62024

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

Open
seenickcode wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −1
Open

fix(files): report new files as new in the files:scan summary #62024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/private/Files/Utils/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public function scan(string $dir = '', $recursive = \OC\Files\Cache\Scanner::SCA
});
$scanner->listen('\OC\Files\Cache\Scanner', 'addToCache', function ($path, $storageId, $data, $fileId) use ($storage): void {
$this->triggerPropagator($storage, $path);
if ($fileId) {
if ($fileId !== -1) {
$this->eventDispatcher->dispatchTyped(new FileCacheUpdated($storage, $path));
} else {
$this->eventDispatcher->dispatchTyped(new NodeAddedToCache($storage, $path));
Expand Down
49 changes: 49 additions & 0 deletions tests/lib/Files/Utils/ScannerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
use OC\Files\Utils\Scanner;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Config\IMountProvider;
use OCP\Files\Events\FileCacheUpdated;
use OCP\Files\Events\NodeAddedToCache;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\Storage\IStorageFactory;
use OCP\IDBConnection;
Expand Down Expand Up @@ -209,6 +211,53 @@ public function testPropagateEtag(): void {
$this->assertNotEquals($oldRoot->getEtag(), $newRoot->getEtag());
}

public function testScanDispatchesAddedForNewAndUpdatedForChangedEntries(): void {
$storage = new Temporary([]);
$mount = new MountPoint($storage, '');
Filesystem::getMountManager()->addMount($mount);

$storage->mkdir('folder');
$storage->file_put_contents('folder/bar.txt', 'qwerty');
$storage->touch('folder/bar.txt', time() - 200);

/** @var list<object> $events */
$events = [];
$dispatcher = $this->createMock(IEventDispatcher::class);
$dispatcher->method('dispatchTyped')
->willReturnCallback(function (object $event) use (&$events): void {
$events[] = $event;
});

$scanner = new TestScanner(
Server::get(IUserManager::class)->get(''),
Server::get(IDBConnection::class),
$dispatcher,
Server::get(LoggerInterface::class),
Server::get(SetupManager::class),
);
$scanner->addMount($mount);

$pathsForEvents = function (string $class) use (&$events): array {
return array_values(array_map(
static fn (object $event): string => $event->getPath(),
array_filter($events, static fn (object $event): bool => $event instanceof $class),
));
};

// first scan: everything is new, nothing is updated
$scanner->scan('');
$this->assertContains('folder/bar.txt', $pathsForEvents(NodeAddedToCache::class));
$this->assertContains('folder', $pathsForEvents(NodeAddedToCache::class));
$this->assertSame([], $pathsForEvents(FileCacheUpdated::class));

// re-scan after modifying the file: updated, not new
$events = [];
$storage->file_put_contents('folder/bar.txt', 'qwerty asdf');
$scanner->scan('');
$this->assertContains('folder/bar.txt', $pathsForEvents(FileCacheUpdated::class));
$this->assertSame([], $pathsForEvents(NodeAddedToCache::class));
}

public function testShallow(): void {
$storage = new Temporary([]);
$mount = new MountPoint($storage, '');
Expand Down