Skip to content
Permalink
Browse files

First steps into removing internal usage of File and Folder class in …

…favor of SPL equivalents
  • Loading branch information...
lorenzo authored and predominant committed Apr 26, 2010
1 parent 9243f66 commit 5dce79e42488c8cc3e1c987bafba059b6d232748
Showing with 34 additions and 36 deletions.
  1. +34 −36 cake/libs/cache/file.php
@@ -78,19 +78,11 @@ public function init($settings = array()) {
),
$settings
));
if (!isset($this->_File)) {
$this->_File =& new File($this->settings['path'] . DS . 'cake');
}
if (DIRECTORY_SEPARATOR === '\\') {
$this->settings['isWindows'] = true;
}
$path = $this->_File->Folder->cd($this->settings['path']);
if ($path) {
$this->settings['path'] = $path;
}
return $this->__active();
return $this->_active();
}
/**
@@ -115,7 +107,7 @@ public function write($key, $data, $duration) {
return false;
}
if ($this->_setKey($key) === false) {
if ($this->_setKey($key, true) === false) {
return false;
}
@@ -134,12 +126,11 @@ public function write($key, $data, $duration) {
}
if ($this->settings['lock']) {
$this->_File->lock = true;
//$this->_File->lock = true;
}
$expires = time() + $duration;
$contents = $expires . $lineBreak . $data . $lineBreak;
$success = $this->_File->write($contents);
$this->_File->close();
$success = $this->_File->ftruncate(0) && $this->_File->fwrite($contents);
return $success;
}
@@ -150,28 +141,34 @@ public function write($key, $data, $duration) {
* @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
*/
public function read($key) {
if ($this->_setKey($key) === false || !$this->_init || !$this->_File->exists()) {
if (!$this->_init || $this->_setKey($key) === false) {
return false;
}
if ($this->settings['lock']) {
$this->_File->lock = true;
//$this->_File->lock = true;
}
$this->_File->rewind();
$time = time();
$cachetime = intval($this->_File->read(11));
$cachetime = intval($this->_File->current());
if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
$this->_File->close();
return false;
}
$data = $this->_File->read(true);
$data = '';
$this->_File->next();
while ($this->_File->valid()) {
$data .= $this->_File->current();
$this->_File->next();
}
$data = trim($data);
if ($data !== '' && !empty($this->settings['serialize'])) {
if ($this->settings['isWindows']) {
$data = str_replace('\\\\\\\\', '\\', $data);
}
$data = unserialize((string)$data);
}
$this->_File->close();
return $data;
}
@@ -185,7 +182,7 @@ public function delete($key) {
if ($this->_setKey($key) === false || !$this->_init) {
return false;
}
return $this->_File->delete();
return unlink($this->_File->getRealPath());
}
/**
@@ -208,20 +205,19 @@ public function clear($check) {
continue;
}
if ($check) {
$mtime = $this->_File->lastChange();
$mtime = $this->_File->getMTime();
if ($mtime === false || $mtime > $threshold) {
if ($mtime > $threshold) {
continue;
}
$expires = $this->_File->read(11);
$this->_File->close();
$expires = (int)$this->_File->current();
if ($expires > $now) {
continue;
}
}
$this->_File->delete();
unlink($this->_File->getRealPath());
}
$dir->close();
return true;
@@ -252,27 +248,29 @@ public function increment($key, $offset = 1) {
*
* @param string $key The key
* @return mixed Absolute cache file for the given key or false if erroneous
* @access private
* @access protected
*/
function _setKey($key) {
$this->_File->Folder->cd($this->settings['path']);
if ($key !== $this->_File->name) {
$this->_File->name = $key;
$this->_File->path = null;
}
if (!$this->_File->Folder->inPath($this->_File->pwd(), true)) {
protected function _setKey($key, $createKey = false) {
$path = new SplFileInfo($this->settings['path'] . DS . $key);
if (!$createKey && !$path->isFile()) {
return false;
}
if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
$this->_File = $path->openFile('a+');
}
}
/**
* Determine is cache directory is writable
*
* @return boolean
* @access private
* @access protected
*/
function __active() {
if ($this->_init && !is_writable($this->settings['path'])) {
protected function _active() {
$dir = new SplFileInfo($this->settings['path']);
if ($this->_init && !($dir->isDir() && $dir->isWritable())) {
$this->_init = false;
trigger_error(sprintf(__('%s is not writable'), $this->settings['path']), E_USER_WARNING);
}

0 comments on commit 5dce79e

Please sign in to comment.
You can’t perform that action at this time.