Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
feat(files): Add capability for clients to check WCF state
This adds a non-initial-state capability for the
windows-compatibile-filemnames feature.
It is not required by the webui and it might have performance impacts
(always compares system config against windows presets), so it is not
included in every page load, but instead for querying from the clients.

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux committed Mar 18, 2025
commit a697da30634a19d78a7410e0102c7c5ec7a875cd
1 change: 1 addition & 0 deletions apps/files/composer/composer/autoload_classmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => $baseDir . '/../lib/Activity/Settings/FileActivitySettings.php',
'OCA\\Files\\Activity\\Settings\\FileChanged' => $baseDir . '/../lib/Activity/Settings/FileChanged.php',
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => $baseDir . '/../lib/Activity/Settings/FileFavoriteChanged.php',
'OCA\\Files\\AdvancedCapabilities' => $baseDir . '/../lib/AdvancedCapabilities.php',
'OCA\\Files\\App' => $baseDir . '/../lib/App.php',
'OCA\\Files\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => $baseDir . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
Expand Down
1 change: 1 addition & 0 deletions apps/files/composer/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class ComposerStaticInitFiles
'OCA\\Files\\Activity\\Settings\\FileActivitySettings' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileActivitySettings.php',
'OCA\\Files\\Activity\\Settings\\FileChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileChanged.php',
'OCA\\Files\\Activity\\Settings\\FileFavoriteChanged' => __DIR__ . '/..' . '/../lib/Activity/Settings/FileFavoriteChanged.php',
'OCA\\Files\\AdvancedCapabilities' => __DIR__ . '/..' . '/../lib/AdvancedCapabilities.php',
'OCA\\Files\\App' => __DIR__ . '/..' . '/../lib/App.php',
'OCA\\Files\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
'OCA\\Files\\BackgroundJob\\CleanupDirectEditingTokens' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupDirectEditingTokens.php',
Expand Down
38 changes: 38 additions & 0 deletions apps/files/lib/AdvancedCapabilities.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Files;

use OCA\Files\Service\SettingsService;
use OCP\Capabilities\ICapability;
use OCP\Capabilities\IInitialStateExcludedCapability;

/**
* Capabilities not needed for every request.
* This capabilities might be hard to compute or no used by the webui.
*/
class AdvancedCapabilities implements ICapability, IInitialStateExcludedCapability {

public function __construct(
protected SettingsService $service,
) {
}

/**
* Return this classes capabilities
*
* @return array{files: array{'windows_compatible_filenames': bool}}
*/
public function getCapabilities(): array {
return [
'files' => [
'windows_compatible_filenames' => $this->service->hasFilesWindowsSupport(),
],
];
}
}
2 changes: 2 additions & 0 deletions apps/files/lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace OCA\Files\AppInfo;

use Closure;
use OCA\Files\AdvancedCapabilities;
use OCA\Files\Capabilities;
use OCA\Files\Collaboration\Resources\Listener;
use OCA\Files\Collaboration\Resources\ResourceProvider;
Expand Down Expand Up @@ -107,6 +108,7 @@ public function register(IRegistrationContext $context): void {
* Register capabilities
*/
$context->registerCapability(Capabilities::class);
$context->registerCapability(AdvancedCapabilities::class);
$context->registerCapability(DirectEditingCapabilities::class);

$context->registerDeclarativeSettings(DeclarativeAdminSettings::class);
Expand Down
4 changes: 4 additions & 0 deletions apps/files/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"files": {
"type": "object",
"required": [
"windows_compatible_filenames",
"$comment",
"bigfilechunking",
"blacklisted_files",
Expand All @@ -41,6 +42,9 @@
"directEditing"
],
"properties": {
"windows_compatible_filenames": {
"type": "boolean"
},
"$comment": {
"type": "string",
"nullable": true
Expand Down
47 changes: 47 additions & 0 deletions apps/files/tests/AdvancedCapabilitiesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OCA\Files;

use OCA\Files\Service\SettingsService;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;

class AdvancedCapabilitiesTest extends TestCase {

protected SettingsService&MockObject $service;
protected AdvancedCapabilities $capabilities;

protected function setUp(): void {
$this->service = $this->createMock(SettingsService::class);
$this->capabilities = new AdvancedCapabilities($this->service);
}

/**
* @dataProvider dataGetCapabilities
*/
public function testGetCapabilities(bool $wcf): void {
$this->service
->expects(self::once())
->method('hasFilesWindowsSupport')
->willReturn($wcf);

self::assertEqualsCanonicalizing(['files' => [ 'windows_compatible_filenames' => $wcf ]], $this->capabilities->getCapabilities());
}

public static function dataGetCapabilities(): array {
return [
'WCF enabled' => [
true,
],
'WCF disabled' => [
false,
],
];
}
}
Loading