Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Use "file size" instead of "filesize", then also apply camel case.

remotes/origin/ldap_group_count
Andreas Fischer 12 years ago
parent
0417e52134
commit
ea246d058e
2 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      lib/private/largefilehelper.php
  2. 32
      tests/lib/largefilehelpergetfilesize.php

48
lib/private/largefilehelper.php
View File

@ -62,7 +62,7 @@ class LargeFileHelper {
}
/**
* @brief Tries to get the filesize of a file via various workarounds that
* @brief Tries to get the size of a file via various workarounds that
* even work for large files on 32-bit platforms.
*
* @param string $filename Path to the file.
@ -70,31 +70,31 @@ class LargeFileHelper {
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
*/
public function getFilesize($filename) {
$filesize = $this->getFilesizeViaCurl($filename);
if (!is_null($filesize)) {
return $filesize;
public function getFileSize($filename) {
$fileSize = $this->getFileSizeViaCurl($filename);
if (!is_null($fileSize)) {
return $fileSize;
}
$filesize = $this->getFilesizeViaCOM($filename);
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;
$fileSize = $this->getFileSizeViaExec($filename);
if (!is_null($fileSize)) {
return $fileSize;
}
return $this->getFilesizeNative($filename);
return $this->getFileSizeNative($filename);
}
/**
* @brief Tries to get the filesize of a file via a CURL HEAD request.
* @brief Tries to get the size of a file via a CURL HEAD request.
*
* @param string $filename Path to the file.
*
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
*/
public function getFilesizeViaCurl($filename) {
public function getFileSizeViaCurl($filename) {
if (function_exists('curl_init')) {
$ch = curl_init("file://$filename");
curl_setopt($ch, CURLOPT_NOBODY, true);
@ -114,14 +114,14 @@ class LargeFileHelper {
}
/**
* @brief Tries to get the filesize of a file via the Windows DOM extension.
* @brief Tries to get the size of a file via the Windows DOM extension.
*
* @param string $filename Path to the file.
*
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
*/
public function getFilesizeViaCOM($filename) {
public function getFileSizeViaCOM($filename) {
if (class_exists('COM')) {
$fsobj = new \COM("Scripting.FileSystemObject");
$file = $fsobj->GetFile($filename);
@ -131,14 +131,14 @@ class LargeFileHelper {
}
/**
* @brief Tries to get the filesize of a file via an exec() call.
* @brief Tries to get the size of a file via an exec() call.
*
* @param string $filename Path to the file.
*
* @return null|int|float Number of bytes as number (float or int) or
* null on failure.
*/
public function getFilesizeViaExec($filename) {
public function getFileSizeViaExec($filename) {
if (\OC_Helper::is_function_enabled('exec')) {
$os = strtolower(php_uname('s'));
$arg = escapeshellarg($filename);
@ -160,19 +160,19 @@ class LargeFileHelper {
}
/**
* @brief Gets the filesize via a filesize() call and converts negative
* signed int to positive float. As the result of filesize() will
* wrap around after a filesize of 2^32 bytes = 4 GiB, this should
* only be used as a last resort.
* @brief Gets the size of a file via a filesize() call and converts
* negative signed int to positive float. As the result of filesize()
* will wrap around after a file size of 2^32 bytes = 4 GiB, this
* should only be used as a last resort.
*
* @param string $filename Path to the file.
*
* @return int|float Number of bytes as number (float or int).
*/
public function getFilesizeNative($filename) {
public function getFileSizeNative($filename) {
$result = filesize($filename);
if ($result < 0) {
// For filesizes between 2 GiB and 4 GiB, filesize() will return a
// For file sizes between 2 GiB and 4 GiB, filesize() will return a
// negative int, as the PHP data type int is signed. Interpret the
// returned int as an unsigned integer and put it into a float.
return (float) sprintf('%u', $result);

32
tests/lib/largefilehelpergetfilesize.php
View File

@ -9,61 +9,61 @@
namespace Test;
/**
* Tests whether LargeFileHelper is able to determine filesize at all.
* Tests whether LargeFileHelper is able to determine file size at all.
* Large files are not considered yet.
*/
class LargeFileHelperGetFilesize extends \PHPUnit_Framework_TestCase {
class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
protected $filename;
protected $filesize;
protected $fileSize;
protected $helper;
public function setUp() {
parent::setUp();
$this->filename = __DIR__ . '/../data/data.tar.gz';
$this->filesize = 4195;
$this->fileSize = 4195;
$this->helper = new \OC\LargeFileHelper;
}
public function testGetFilesizeViaCurl() {
public function testGetFileSizeViaCurl() {
if (!extension_loaded('curl')) {
$this->markTestSkipped(
'The PHP curl extension is required for this test.'
);
}
$this->assertSame(
$this->filesize,
$this->helper->getFilesizeViaCurl($this->filename)
$this->fileSize,
$this->helper->getFileSizeViaCurl($this->filename)
);
}
public function testGetFilesizeViaCOM() {
public function testGetFileSizeViaCOM() {
if (!extension_loaded('COM')) {
$this->markTestSkipped(
'The PHP Windows COM extension is required for this test.'
);
}
$this->assertSame(
$this->filesize,
$this->helper->getFilesizeViaDOM($this->filename)
$this->fileSize,
$this->helper->getFileSizeViaDOM($this->filename)
);
}
public function testGetFilesizeViaExec() {
public function testGetFileSizeViaExec() {
if (!\OC_Helper::is_function_enabled('exec')) {
$this->markTestSkipped(
'The exec() function needs to be enabled for this test.'
);
}
$this->assertSame(
$this->filesize,
$this->helper->getFilesizeViaExec($this->filename)
$this->fileSize,
$this->helper->getFileSizeViaExec($this->filename)
);
}
public function testGetFilesizeNative() {
public function testGetFileSizeNative() {
$this->assertSame(
$this->filesize,
$this->helper->getFilesizeNative($this->filename)
$this->fileSize,
$this->helper->getFileSizeNative($this->filename)
);
}
}
Write Preview
Loading…
Cancel
Save