Changeset 3135

Timestamp:

04/27/08 11:47:59 (2 months ago)

Author:

pmjones

Message:

Solar_Cache_Adapter_File: [CHG] New config param 'hash' allows you to turn hashing of the entry key on and off (default 'true', on).

Files:

• trunk/Solar/Cache/Adapter/File.php (modified) (5 diffs)

trunk/Solar/Cache/Adapter/File.php

@@ -69 +69 @@
-        'mode'    => 0740,
-        'context' => null,
+        'hash'    => true,
-    );
-    
@@ -79 +80 @@
-     */
-    protected $_path;
+    
+    /**
+     * 
+     * Whether or not to hash key names.
+     * 
+     * @var bool
+     * 
+     */
+    protected $_hash;
-    
-    /**
@@ -105 +115 @@
-        parent::__construct($config);
-        
-keep local values so they can't be changed
+path to storage
-        $this->_path = Solar_Dir::fix($this->_config['path']);
+        
+        // whether or not to hash
+        $this->_hash = $this->_config['hash'];
-        
-        // build the context property
@@ -155 +168 @@
-        }
-        
+        // what file should we write to?
+        $file = $this->entry($key);
+        
+        // does the directory exist?
+        $dir = dirname($file);
+        if (! is_dir($dir)) {
+            mkdir($dir, $this->_config['mode'], true, $this->_context);
+        }
+        
-        // open the file for over-writing. not using file_put_contents 
-        // becuase we may need to write a serial file too (and avoid race
-        // conditions while doing so). don't use include path.
-
-
+
-        
-        // was it opened?
-
-
-// yes.  exclusive lock for writing.
-    flock($fp, LOCK_EX);
-    
-    // don't need the 3rd param (byte length) because Solar has
-    // already turned off magic_quotes_runtime.
-    // <http://php.net/fwrite>
-    fwrite($fp, $data);
-    
-    // add a .serial file? (do this while the file is locked to avoid
-    // race conditions)
-    if ($serial) {
-        // use this instead of touch() because it supports stream
-        // contexts.
-        file_put_contents($file . '.serial', null, LOCK_EX, $this->_context);
-} else {
-    // make sure no serial file is there from any previous entries
-    // with the same name
-        @unlink($file . '.serial', $this->_context);
-}
-
-// unlock and close, then done.
-    flock($fp, LOCK_UN);
-    fclose($fp);
-    return true;
-}
-
-// could not open the file for writing.
-return false;
+! 
+// could not open the file for writing.
+return false;
+}
+
+// set exclusive lock for writing.
+flock($fp, LOCK_EX);
+
+// don't need the 3rd param (byte length) because Solar has
+// already turned off magic_quotes_runtime.
+// <http://php.net/fwrite>
+fwrite($fp, $data);
+
+// add a .serial file? (do this while the file is locked to avoid
+// race conditions)
+if ($serial) {
+// use this instead of touch() because it supports stream
+// contexts.
+file_put_contents($file . '.serial', null, LOCK_EX, $this->_context);
+} else {
+// make sure no serial file is there from any previous entries
+// with the same name
+@unlink($file . '.serial', $this->_context);
+}
+
+// unlock and close, then done.
+flock($fp, LOCK_UN);
+fclose($fp);
+return true;
+
-    }
-    
@@ -372 +393 @@
-    public function entry($key)
-    {
-
+
+
+
+
+
+
+
+
+
+
-    }
-} 
-