Skip to content

Improve bulk upload and add a config switch for it #33697

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
come-nc merged 9 commits into from
Aug 30, 2022
Merged

Improve bulk upload and add a config switch for it #33697

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be7082e
Add fileid and permissions to response of bulk upload
come-nc Aug 25, 2022
5ae185a
Add bulkupload.enabled configuration switch
come-nc Aug 25, 2022
e34f2c4
Call the correct functions to get BulkUpload metadata to return
come-nc Aug 29, 2022
b3cd9b5
Move Dav fileid and permissions logic into OCP\Util to be able to use…
come-nc Aug 29, 2022
d90b314
Fix OCP\Util documentation blocks
come-nc Aug 29, 2022
9874557
Fix Capabilities tests for dav application
come-nc Aug 29, 2022
7f80dcc
Flip bulkupload.enabled default value to true
come-nc Aug 29, 2022
4f3b323
Move dav utils functions to OCP\Files\DavUtil
come-nc Aug 30, 2022
30bfd5f
Add DavUtil to autoloader
come-nc Aug 30, 2022
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
3 changes: 3 additions & 0 deletions apps/dav/lib/BulkUpload/BulkUploadPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* @copyright Copyright (c) 2021, Louis Chemineau <[email protected]>
*
* @author Louis Chemineau <[email protected]>
* @author Côme Chilliet <[email protected]>
*
* @license AGPL-3.0
*
Expand Down Expand Up @@ -95,6 +96,8 @@ public function httpPost(RequestInterface $request, ResponseInterface $response)
$writtenFiles[$headers['x-file-path']] = [
"error" => false,
"etag" => $node->getETag(),
"fileid" => $node->getId(),
"permissions" => $node->getPermissions(),
];
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]);
Expand Down
16 changes: 13 additions & 3 deletions apps/dav/lib/Capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* @author Thomas Müller <[email protected]>
* @author Louis Chemineau <[email protected]>
* @author Côme Chilliet <[email protected]>
*
* @license AGPL-3.0
*
Expand All @@ -23,15 +24,24 @@
namespace OCA\DAV;

use OCP\Capabilities\ICapability;
use OCP\IConfig;

class Capabilities implements ICapability {
private IConfig $config;

public function __construct(IConfig $config) {
$this->config = $config;
}

public function getCapabilities() {
return [
$capabilities = [
'dav' => [
'chunking' => '1.0',
// disabled because of https://github.com/nextcloud/desktop/issues/4243
// 'bulkupload' => '1.0',
]
];
if ($this->config->getSystemValueBool('bulkupload.enabled', false)) {
Copy link
Contributor

@szaimen szaimen Aug 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm... I think the idea was to enable it by default.

cc @PVince81

Copy link
Contributor Author

@come-nc come-nc Aug 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah but it needs to be confirmed working first :-P

Copy link
Member

@PVince81 PVince81 Aug 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can set it to true at least for master, if we're optimistic 😄

we can then delay the backports until proven stable

$capabilities['dav']['bulkupload'] = '1.0';
}
return $capabilities;
}
}
7 changes: 7 additions & 0 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2238,4 +2238,11 @@
* Defaults to ``false``
*/
'projects.enabled' => false,

/**
* Enable the bulk upload feature.
*
* Defaults to ``false``
*/
'bulkupload.enabled' => false,
];