upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #37344 from nextcloud/backport/35734/master

Browse source 
[master] [stable25] Quota value as float for 32-bit systems
This commit is contained in:
MichaIng 2023-04-01 15:04:44 +02:00 committed by GitHub
commit 06ab4f25eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -477,7 +477,7 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
* get the free space in the storage
*
* @param string $path
* @return int|false
* @return int|float|false
*/
public function free_space($path) {
return \OCP\Files\FileInfo::SPACE_UNKNOWN;

2
lib/private/Files/Storage/DAV.php
View file

@ -486,7 +486,7 @@ class DAV extends Common {
/**
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
*/
public function file_put_contents($path, $data) {
$path = $this->cleanPath($path);

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

@ -249,7 +249,7 @@ class Local extends \OC\Files\Storage\Common {
$fullPath = $this->getSourcePath($path);
if (PHP_INT_SIZE === 4) {
$helper = new \OC\LargeFileHelper;
return $helper->getFileSize($fullPath) ?? false;
return $helper->getFileSize($fullPath);
}
return filesize($fullPath);
}
@ -617,6 +617,7 @@ class Local extends \OC\Files\Storage\Common {
}
public function writeStream(string $path, $stream, int $size = null): int {
/** @var int|false $result We consider here that returned size will never be a float because we write less than 4GB */
$result = $this->file_put_contents($path, $stream);
if (is_resource($stream)) {
fclose($stream);

4
lib/private/Files/Storage/Wrapper/Encoding.php
View file

@ -311,7 +311,7 @@ class Encoding extends Wrapper {
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
*/
public function file_put_contents($path, $data) {
return $this->storage->file_put_contents($this->findPathToUse($path), $data);
@ -396,7 +396,7 @@ class Encoding extends Wrapper {
* see https://www.php.net/manual/en/function.free_space.php
*
* @param string $path
* @return int|bool
* @return int|float|bool
*/
public function free_space($path) {
return $this->storage->free_space($this->findPathToUse($path));

4
lib/private/Files/Storage/Wrapper/Jail.php
View file

@ -259,7 +259,7 @@ class Jail extends Wrapper {
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
*/
public function file_put_contents($path, $data) {
return $this->getWrapperStorage()->file_put_contents($this->getUnjailedPath($path), $data);
@ -335,7 +335,7 @@ class Jail extends Wrapper {
* see https://www.php.net/manual/en/function.free_space.php
*
* @param string $path
* @return int|bool
* @return int|float|bool
*/
public function free_space($path) {
return $this->getWrapperStorage()->free_space($this->getUnjailedPath($path));

18
lib/private/Files/Storage/Wrapper/Quota.php
View file

@ -41,7 +41,8 @@ use OCP\Files\Storage\IStorage;
class Quota extends Wrapper {
/** @var callable|null */
protected $quotaCallback;
protected ?int $quota;
/** @var int|float|null int on 64bits, float on 32bits for bigint */
protected int|float|null $quota;
protected string $sizeRoot;
private SystemConfig $config;
@ -57,9 +58,9 @@ class Quota extends Wrapper {
}
/**
* @return int quota value
* @return int|float quota value
*/
public function getQuota(): int {
public function getQuota(): int|float {
if ($this->quota === null) {
$quotaCallback = $this->quotaCallback;
if ($quotaCallback === null) {
@ -77,7 +78,8 @@ class Quota extends Wrapper {
/**
* @param string $path
* @param \OC\Files\Storage\Storage $storage
* @param IStorage $storage
* @return int|float
*/
protected function getSize($path, $storage = null) {
if ($this->config->getValue('quota_include_external_storage', false)) {
@ -101,7 +103,7 @@ class Quota extends Wrapper {
* Get free space as limited by the quota
*
* @param string $path
* @return int|bool
* @return int|float|bool
*/
public function free_space($path) {
if (!$this->hasQuota()) {
@ -128,7 +130,7 @@ class Quota extends Wrapper {
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
*/
public function file_put_contents($path, $data) {
if (!$this->hasQuota()) {
@ -177,7 +179,7 @@ class Quota extends Wrapper {
// don't apply quota for part files
if (!$this->isPartFile($path)) {
$free = $this->free_space($path);
if ($source && is_int($free) && $free >= 0 && $mode !== 'r' && $mode !== 'rb') {
if ($source && (is_int($free) || is_float($free)) && $free >= 0 && $mode !== 'r' && $mode !== 'rb') {
// only apply quota for files, not metadata, trash or others
if ($this->shouldApplyQuota($path)) {
return \OC\Files\Stream\Quota::wrap($source, $free);
@ -192,7 +194,7 @@ class Quota extends Wrapper {
* Checks whether the given path is a part file
*
* @param string $path Path that may identify a .part file
* @return string File path without .part extension
* @return bool
* @note this is needed for reusing keys
*/
private function isPartFile($path) {

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

@ -249,7 +249,7 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
*/
public function file_put_contents($path, $data) {
return $this->getWrapperStorage()->file_put_contents($path, $data);
@ -325,7 +325,7 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea
* see https://www.php.net/manual/en/function.free_space.php
*
* @param string $path
* @return int|bool
* @return int|float|bool
*/
public function free_space($path) {
return $this->getWrapperStorage()->free_space($path);

5
lib/private/LargeFileHelper.php
View file

@ -95,10 +95,9 @@ class LargeFileHelper {
*
* @param string $filename Path to the file.
*
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
* @return int|float Number of bytes as number (float or int)
*/
public function getFileSize(string $filename): null|int|float {
public function getFileSize(string $filename): int|float {
$fileSize = $this->getFileSizeViaCurl($filename);
if (!is_null($fileSize)) {
return $fileSize;

4
lib/public/Files/Storage.php
View file

@ -227,7 +227,7 @@ interface Storage extends IStorage {
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
* @since 6.0.0
*/
public function file_put_contents($path, $data);
@ -296,7 +296,7 @@ interface Storage extends IStorage {
* see https://www.php.net/manual/en/function.disk-free-space.php
*
* @param string $path
* @return int|bool
* @return int|float|bool
* @since 6.0.0
*/
public function free_space($path);

4
lib/public/Files/Storage/IStorage.php
View file

@ -224,7 +224,7 @@ interface IStorage {
*
* @param string $path
* @param mixed $data
* @return int|false
* @return int|float|false
* @since 9.0.0
*/
public function file_put_contents($path, $data);
@ -293,7 +293,7 @@ interface IStorage {
* see https://www.php.net/manual/en/function.free_space.php
*
* @param string $path
* @return int|bool
* @return int|float|bool
* @since 9.0.0
*/
public function free_space($path);