moved code to /lib/private/tempmanager.php
fix for unit test some fixes
This commit is contained in:
parent
723f8c8f1b
commit
acae208f2f
17
lib/base.php
17
lib/base.php
|
@ -1108,27 +1108,16 @@ class OC {
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!function_exists('get_temp_dir')) {
|
|
||||||
/**
|
/**
|
||||||
* Get the temporary dir to store uploaded data
|
* Get the temporary dir to store uploaded data
|
||||||
* @return null|string Path to the temporary directory or null
|
* @return null|string Path to the temporary directory or null
|
||||||
*/
|
*/
|
||||||
function get_temp_dir() {
|
function get_temp_dir() {
|
||||||
if ($temp = ini_get('upload_tmp_dir')) return $temp;
|
return \OC::$server->getTempManager()->t_get_temp_dir();
|
||||||
if ($temp = getenv('TMP')) return $temp;
|
|
||||||
if ($temp = getenv('TEMP')) return $temp;
|
|
||||||
if ($temp = getenv('TMPDIR')) return $temp;
|
|
||||||
$temp = tempnam(__FILE__, '');
|
|
||||||
if (file_exists($temp)) {
|
|
||||||
unlink($temp);
|
|
||||||
return dirname($temp);
|
|
||||||
}
|
|
||||||
if ($temp = sys_get_temp_dir()) return $temp;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OC::init();
|
OC::init();
|
||||||
|
|
|
@ -344,7 +344,7 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$this->registerService('TempManager', function (Server $c) {
|
$this->registerService('TempManager', function (Server $c) {
|
||||||
return new TempManager(get_temp_dir(), $c->getLogger());
|
return new TempManager($c->getLogger());
|
||||||
});
|
});
|
||||||
$this->registerService('AppManager', function(Server $c) {
|
$this->registerService('AppManager', function(Server $c) {
|
||||||
return new \OC\App\AppManager(
|
return new \OC\App\AppManager(
|
||||||
|
|
|
@ -38,11 +38,10 @@ class TempManager implements ITempManager {
|
||||||
const TMP_PREFIX = 'oc_tmp_';
|
const TMP_PREFIX = 'oc_tmp_';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $baseDir
|
|
||||||
* @param \OCP\ILogger $logger
|
* @param \OCP\ILogger $logger
|
||||||
*/
|
*/
|
||||||
public function __construct($baseDir, ILogger $logger) {
|
public function __construct(ILogger $logger) {
|
||||||
$this->tmpBaseDir = $baseDir;
|
$this->tmpBaseDir = $this->t_get_temp_dir();
|
||||||
$this->log = $logger;
|
$this->log = $logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,4 +189,59 @@ class TempManager implements ITempManager {
|
||||||
}
|
}
|
||||||
return $files;
|
return $files;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the temporary directory to store transfer data
|
||||||
|
* @return null|string Path to the temporary directory or null
|
||||||
|
*/
|
||||||
|
public function t_get_temp_dir() {
|
||||||
|
// Get the temporary directory and log the path if loglevel is set to debug
|
||||||
|
// Info: based on the temp dir, further directories may be created unique to the instance
|
||||||
|
$temp = self::gather_temp_dir();
|
||||||
|
\OCP\Util::writeLog('Core', 'Temporary directory set to: ' . ($temp ? $temp : 'NULL'), \OCP\Util::DEBUG);
|
||||||
|
return $temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a temporary directory from possible sources
|
||||||
|
* If a temporary directory is set in config.php, use this one
|
||||||
|
* @return null|string Path to the temporary directory or null
|
||||||
|
*/
|
||||||
|
private function gather_temp_dir() {
|
||||||
|
if ($temp = self::get_config_temp_dir()) return $temp;
|
||||||
|
if ($temp = ini_get('upload_tmp_dir')) return $temp;
|
||||||
|
if ($temp = getenv('TMP')) return $temp;
|
||||||
|
if ($temp = getenv('TEMP')) return $temp;
|
||||||
|
if ($temp = getenv('TMPDIR')) return $temp;
|
||||||
|
$temp = tempnam(__FILE__, '');
|
||||||
|
if (file_exists($temp)) {
|
||||||
|
unlink($temp);
|
||||||
|
return dirname($temp);
|
||||||
|
}
|
||||||
|
if ($temp = sys_get_temp_dir()) return $temp;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if the temporary directory is defined in config.php and is present and writable
|
||||||
|
* @return bool|string Path to the temporary directory or false
|
||||||
|
*/
|
||||||
|
private function get_config_temp_dir() {
|
||||||
|
$temp = \OC::$server->getConfig()->getSystemValue('tempdirectory', false);
|
||||||
|
// surpress any possible errors caused by is_writable
|
||||||
|
// checks missing or invalid path or characters, wrong permissions ect
|
||||||
|
if ($temp) {
|
||||||
|
try {
|
||||||
|
if (is_writeable($temp)) {
|
||||||
|
return $temp;
|
||||||
|
} else {
|
||||||
|
\OCP\Util::writeLog('Core', 'Manually set temporary directory in config.php is not present or writable: ' . $temp, \OCP\Util::WARN);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,12 +22,11 @@ class NullLogger extends Log {
|
||||||
}
|
}
|
||||||
|
|
||||||
class TempManager extends \Test\TestCase {
|
class TempManager extends \Test\TestCase {
|
||||||
protected $baseDir;
|
|
||||||
|
|
||||||
protected function setUp() {
|
protected function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->baseDir = get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
|
$this->baseDir = $this->getManager()->t_get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
|
||||||
if (!is_dir($this->baseDir)) {
|
if (!is_dir($this->baseDir)) {
|
||||||
mkdir($this->baseDir);
|
mkdir($this->baseDir);
|
||||||
}
|
}
|
||||||
|
@ -46,7 +45,7 @@ class TempManager extends \Test\TestCase {
|
||||||
if (!$logger) {
|
if (!$logger) {
|
||||||
$logger = new NullLogger();
|
$logger = new NullLogger();
|
||||||
}
|
}
|
||||||
return new \OC\TempManager($this->baseDir, $logger);
|
return new \OC\TempManager($logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testGetFile() {
|
public function testGetFile() {
|
||||||
|
|
Loading…
Reference in New Issue