diff options
author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-08-30 09:55:57 +0200 |
---|---|---|
committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-08-30 09:58:12 +0200 |
commit | 4f3b323fbace6afcf50b95073c2560c5b2a0b8f1 (patch) | |
tree | 7efc9d584ff05f649c544d916597896c4ee3e518 | |
parent | 7f80dccbaccd90c0ec015a24e5e564d0a5f5d57c (diff) | |
download | nextcloud-server-4f3b323fbace6afcf50b95073c2560c5b2a0b8f1.tar.gz nextcloud-server-4f3b323fbace6afcf50b95073c2560c5b2a0b8f1.zip |
Move dav utils functions to OCP\Files\DavUtil
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r-- | apps/dav/lib/BulkUpload/BulkUploadPlugin.php | 5 | ||||
-rw-r--r-- | apps/dav/lib/Connector/Sabre/Node.php | 6 | ||||
-rw-r--r-- | lib/public/Files/DavUtil.php | 89 | ||||
-rw-r--r-- | lib/public/Util.php | 49 |
4 files changed, 95 insertions, 54 deletions
diff --git a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php index b5400ec58d2..0d5cce88d0d 100644 --- a/apps/dav/lib/BulkUpload/BulkUploadPlugin.php +++ b/apps/dav/lib/BulkUpload/BulkUploadPlugin.php @@ -28,6 +28,7 @@ use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; use Sabre\HTTP\RequestInterface; use Sabre\HTTP\ResponseInterface; +use OCP\Files\DavUtil; use OCP\Files\Folder; use OCP\AppFramework\Http; use OCA\DAV\Connector\Sabre\MtimeSanitizer; @@ -95,8 +96,8 @@ class BulkUploadPlugin extends ServerPlugin { $writtenFiles[$headers['x-file-path']] = [ "error" => false, "etag" => $node->getETag(), - "fileid" => \OCP\Util::getDavFileId($node->getId()), - "permissions" => \OCP\Util::getDavPermissions($node), + "fileid" => DavUtil::getDavFileId($node->getId()), + "permissions" => DavUtil::getDavPermissions($node), ]; } catch (\Exception $e) { $this->logger->error($e->getMessage(), ['path' => $headers['x-file-path']]); diff --git a/apps/dav/lib/Connector/Sabre/Node.php b/apps/dav/lib/Connector/Sabre/Node.php index c4fc6282f84..5fb811ad1ab 100644 --- a/apps/dav/lib/Connector/Sabre/Node.php +++ b/apps/dav/lib/Connector/Sabre/Node.php @@ -38,9 +38,9 @@ namespace OCA\DAV\Connector\Sabre; use OC\Files\Mount\MoveableMount; use OC\Files\Node\File; use OC\Files\Node\Folder; -use OC\Files\Storage\Wrapper\Wrapper; use OC\Files\View; use OCA\DAV\Connector\Sabre\Exception\InvalidPath; +use OCP\Files\DavUtil; use OCP\Files\FileInfo; use OCP\Files\IRootFolder; use OCP\Files\StorageNotAvailableException; @@ -253,7 +253,7 @@ abstract class Node implements \Sabre\DAV\INode { */ public function getFileId() { if ($id = $this->info->getId()) { - return \OCP\Util::getDavFileId($id); + return DavUtil::getDavFileId($id); } return null; @@ -379,7 +379,7 @@ abstract class Node implements \Sabre\DAV\INode { * @return string */ public function getDavPermissions() { - return \OCP\Util::getDavPermissions($this->info); + return DavUtil::getDavPermissions($this->info); } public function getOwner() { diff --git a/lib/public/Files/DavUtil.php b/lib/public/Files/DavUtil.php new file mode 100644 index 00000000000..343f3c2ac0f --- /dev/null +++ b/lib/public/Files/DavUtil.php @@ -0,0 +1,89 @@ +<?php +/** + * @copyright Copyright (c) 2022 Côme Chilliet <come.chilliet@nextcloud.com> + * + * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Bart Visscher <bartv@thisnet.nl> + * @author Jakob Sack <mail@jakobsack.de> + * @author Jörn Friedrich Dreyer <jfd@butonic.de> + * @author Klaas Freitag <freitag@owncloud.com> + * @author Markus Goetz <markus@woboq.com> + * @author Morris Jobke <hey@morrisjobke.de> + * @author Robin Appelman <icewind@owncloud.com> + * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> + * @author Côme Chilliet <come.chilliet@nextcloud.com> + * + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCP\Files; + +/** + * This class provides different helper functions related to WebDAV protocol + * + * @since 25.0.0 + */ +class DavUtil { + /** + * Compute the fileId to use for dav responses + * + * @param int $id Id of the file returned by FileInfo::getId + * @since 25.0.0 + */ + public static function getDavFileId(int $id): string { + $instanceId = \OC_Util::getInstanceId(); + $id = sprintf('%08d', $id); + return $id . $instanceId; + } + + /** + * Compute the format needed for returning permissions for dav + * + * @since 25.0.0 + */ + public static function getDavPermissions(FileInfo $info): string { + $p = ''; + if ($info->isShared()) { + $p .= 'S'; + } + if ($info->isShareable()) { + $p .= 'R'; + } + if ($info->isMounted()) { + $p .= 'M'; + } + if ($info->isReadable()) { + $p .= 'G'; + } + if ($info->isDeletable()) { + $p .= 'D'; + } + if ($info->isUpdateable()) { + $p .= 'NV'; // Renameable, Moveable + } + if ($info->getType() === FileInfo::TYPE_FILE) { + if ($info->isUpdateable()) { + $p .= 'W'; + } + } else { + if ($info->isCreatable()) { + $p .= 'CK'; + } + } + return $p; + } +} diff --git a/lib/public/Util.php b/lib/public/Util.php index 85472b9c912..6cd3eaa7f85 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -628,53 +628,4 @@ class Util { } return true; } - - /** - * Compute the fileId to use for dav responses - * - * @param int $id Id of the file returned by FileInfo::getId - * @since 25.0.0 - */ - public static function getDavFileId(int $id): string { - $instanceId = \OC_Util::getInstanceId(); - $id = sprintf('%08d', $id); - return $id . $instanceId; - } - - /** - * Compute the format needed for returning permissions for dav - * - * @since 25.0.0 - */ - public static function getDavPermissions(\OCP\Files\FileInfo $info): string { - $p = ''; - if ($info->isShared()) { - $p .= 'S'; - } - if ($info->isShareable()) { - $p .= 'R'; - } - if ($info->isMounted()) { - $p .= 'M'; - } - if ($info->isReadable()) { - $p .= 'G'; - } - if ($info->isDeletable()) { - $p .= 'D'; - } - if ($info->isUpdateable()) { - $p .= 'NV'; // Renameable, Moveable - } - if ($info->getType() === \OCP\Files\FileInfo::TYPE_FILE) { - if ($info->isUpdateable()) { - $p .= 'W'; - } - } else { - if ($info->isCreatable()) { - $p .= 'CK'; - } - } - return $p; - } } |