mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1902 from nextcloud/fix-largefile-helper-not-existent 

Remove not existent function call
This commit is contained in:
Lukas Reschke 2016-10-25 12:25:41 +02:00 committed by GitHub
parent e23a298a81 df3444493b
commit 324e5b02ba
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Storage/Local.php
View File

@ -155,7 +155,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);
return $helper->getFileSize($fullPath);
}
return filesize($fullPath);
}

12
lib/private/LargeFileHelper.php
View File

@ -51,7 +51,7 @@ class LargeFileHelper {
public function __construct() {
$pow_2_53 = floatval(self::POW_2_53_MINUS_1) + 1.0;
if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
throw new \RunTimeException(
throw new \RuntimeException(
'This class assumes floats to be double precision or "better".'
);
}
@ -98,10 +98,6 @@ class LargeFileHelper {
if (!is_null($fileSize)) {
return $fileSize;
}
$fileSize = $this->getFileSizeViaCOM($filename);
if (!is_null($fileSize)) {
return $fileSize;
}
$fileSize = $this->getFileSizeViaExec($filename);
if (!is_null($fileSize)) {
return $fileSize;
@ -154,12 +150,6 @@ class LargeFileHelper {
$result = $this->exec("stat -c %s $arg");
} else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
$result = $this->exec("stat -f %z $arg");
} else if (strpos($os, 'win') !== false) {
$result = $this->exec("for %F in ($arg) do @echo %~zF");
if (is_null($result)) {
// PowerShell
$result = $this->exec("(Get-Item $arg).length");
}
}
return $result;
}