upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

add a seperate storage method to distinguish between 'path exists' and 'path is available'

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2024-04-08 14:55:49 +02:00
parent e10853450e
commit 77cd7560a5
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Files/Storage/Common.php
View file

@ -919,4 +919,8 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
}
}
}
public function pathAvailable(string $path): bool {
return !$this->file_exists($path);
}
}

9
lib/private/Files/Storage/Local.php
View file

@ -95,7 +95,7 @@ class Local extends \OC\Files\Storage\Common {
$this->config = \OC::$server->get(IConfig::class);
$this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class);
$this->defUMask = $this->config->getSystemValue('localstorage.umask', 0022);
$this->caseInsensitive = $this->config->getSystemValueBool('localstorage.case_insensitive', false);
$this->caseInsensitive = $arguments['case_insensitive'] ?? $this->config->getSystemValueBool('localstorage.case_insensitive', false);
// support Write-Once-Read-Many file systems
$this->unlinkOnTruncate = $this->config->getSystemValueBool('localstorage.unlink_on_truncate', false);
@ -281,6 +281,8 @@ class Local extends \OC\Files\Storage\Common {
public function file_exists($path) {
if ($this->caseInsensitive) {
// if the underlying filesystem is case-insensitive, we do our own case-sensitive
// comparison to ensure our `file_exists` implementation is always case-sensitive
$fullPath = $this->getSourcePath($path);
$parentPath = dirname($fullPath);
if (!is_dir($parentPath)) {
@ -293,6 +295,11 @@ class Local extends \OC\Files\Storage\Common {
}
}
public function pathAvailable(string $path): bool {
// use the native file-exists even for case-insensitive filesystems
return !file_exists($this->getSourcePath($path));
}
public function filemtime($path) {
$fullPath = $this->getSourcePath($path);
clearstatcache(true, $fullPath);

12
lib/private/Files/Storage/Storage.php
View file

@ -136,4 +136,16 @@ interface Storage extends \OCP\Files\Storage {
* - permissions
*/
public function getDirectoryContent($directory): \Traversable;
/**
* Check if a filepath is available/unused
*
* This is usually the inverse of `file_exists` but some filesystems might have additional restrictions for
* which file names are available.
* For example with case-insensitive filesystems where names that only differ by case would conflict.
*
* @param string $path
* @return bool
*/
public function pathAvailable(string $path): bool;
}