upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 15:53:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

add some support for rename on case insensitive local filesystems

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2023-10-16 17:39:23 +02:00 committed by Benjamin Gaussorgues
parent 11764ffec1
commit 482deca354
No known key found for this signature in database
GPG key ID: 5DAC1CAFAA6DB883
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,8 @@ class Local extends \OC\Files\Storage\Common {
protected bool $unlinkOnTruncate;
protected bool $caseInsensitive = false;
public function __construct($arguments) {
if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
throw new \InvalidArgumentException('No data directory set for local storage');
@ -92,6 +94,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);
// support Write-Once-Read-Many file systems
$this->unlinkOnTruncate = $this->config->getSystemValueBool('localstorage.unlink_on_truncate', false);
@ -155,6 +158,9 @@ class Local extends \OC\Files\Storage\Common {
}
public function is_dir($path) {
if ($this->caseInsensitive && !$this->file_exists($path)) {
return false;
}
if (substr($path, -1) == '/') {
$path = substr($path, 0, -1);
}
@ -162,6 +168,9 @@ class Local extends \OC\Files\Storage\Common {
}
public function is_file($path) {
if ($this->caseInsensitive && !$this->file_exists($path)) {
return false;
}
return is_file($this->getSourcePath($path));
}
@ -264,7 +273,13 @@ class Local extends \OC\Files\Storage\Common {
}
public function file_exists($path) {
return file_exists($this->getSourcePath($path));
if ($this->caseInsensitive) {
$fullPath = $this->getSourcePath($path);
$content = scandir(dirname($fullPath), SCANDIR_SORT_NONE);
return is_array($content) && array_search(basename($fullPath), $content) !== false;
} else {
return file_exists($this->getSourcePath($path));
}
}
public function filemtime($path) {
@ -375,7 +390,16 @@ class Local extends \OC\Files\Storage\Common {
$this->checkTreeForForbiddenItems($this->getSourcePath($source));
}
return rename($this->getSourcePath($source), $this->getSourcePath($target));
if (rename($this->getSourcePath($source), $this->getSourcePath($target))) {
if ($this->caseInsensitive) {
if (mb_strtolower($target) === mb_strtolower($source) && !$this->file_exists($target)) {
return false;
}
}
return true;
}
return false;
}
public function copy($source, $target) {
@ -388,6 +412,11 @@ class Local extends \OC\Files\Storage\Common {
}
$result = copy($this->getSourcePath($source), $this->getSourcePath($target));
umask($oldMask);
if ($this->caseInsensitive) {
if (mb_strtolower($target) === mb_strtolower($source) && !$this->file_exists($target)) {
return false;
}
}
return $result;
}
}