Changeset 12174 for trunk/wp-includes/pomo/streams.php

Timestamp:

11/12/2009 04:05:43 PM (16 years ago)

Author:

ryan

Message:

pomo performance improvements. Props nbachiyski. fixes #10165

File:

• trunk/wp-includes/pomo/streams.php (modified) (3 diffs)

trunk/wp-includes/pomo/streams.php

@@ -4 +4 @@
  * Based on the classes from Danilo Segan <danilo@kvota.net>
  *
- * @version $Id: streams.php 223 2009-09-07 21:20:13Z nbachiyski $
+ * @version $Id: streams.php 293 2009-11-12 15:43:50Z nbachiyski $
  * @package pomo
  * @subpackage streams
  */
 
-
-if ( !class_exists( 'POMO_StringReader' ) ):
-/**
- * Provides file-like methods for manipulating a string instead
- * of a physical file.
- */
-class POMO_StringReader {
-  var $_pos;
-  var $_str;
-
-    function POMO_StringReader($str = '') {
-        $this->_str = $str;
+if ( !class_exists( 'POMO_Reader' ) ):
+class POMO_Reader {
+    
+    var $endian = 'little';
+    var $_post = '';
+    
+    function POMO_Reader() {
+        $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
         $this->_pos = 0;
-        $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
-    }
-
-    function _substr($string, $start, $length) {
-        if ($this->is_overloaded) {
-            return mb_substr($string,$start,$length,'ascii');
-        } else {
-            return substr($string,$start,$length);
-        }
-    }
-    
-    function _strlen($string) {
-        if ($this->is_overloaded) {
-            return mb_strlen($string,'ascii');
-        } else {
-            return strlen($string);
-        }
-    }
-
-    function read($bytes) {
-        $data = $this->_substr($this->_str, $this->_pos, $bytes);
-        $this->_pos += $bytes;
-        if ($this->_strlen($this->_str) < $this->_pos) $this->_pos = $this->_strlen($this->_str);
-        return $data;
-    }
-
-    function seekto($pos) {
-        $this->_pos = $pos;
-        if ($this->_strlen($this->_str) < $this->_pos) $this->_pos = $this->_strlen($this->_str);
-        return $this->_pos;
-    }
-
-    function pos() {
-        return $this->_pos;
-    }
-
-    function length() {
-        return $this->_strlen($this->_str);
-    }
-
-}
-endif;
-
-if ( !class_exists( 'POMO_CachedFileReader' ) ):
-/**
- * Reads the contents of the file in the beginning.
- */
-class POMO_CachedFileReader extends POMO_StringReader {
-    function POMO_CachedFileReader($filename) {
-        parent::POMO_StringReader();
-        $this->_str = file_get_contents($filename);
-        if (false === $this->_str)
-            return false;
-        $this->_pos = 0;
-    }
-}
-endif;
-
-if ( !class_exists( 'POMO_CachedIntFileReader' ) ):
-/**
- * Allows reading integers from a file.
- */
-class POMO_CachedIntFileReader extends POMO_CachedFileReader {
-
-    var $endian = 'little';
-
-    /**
-     * Opens a file and caches it.
-     *
-     * @param $filename string name of the file to be opened
-     * @param $endian string endianness of the words in the file, allowed
-     *  values are 'little' or 'big'. Default value is 'little'
-     */
-    function POMO_CachedIntFileReader($filename, $endian = 'little') {
-        $this->endian = $endian;
-        parent::POMO_CachedFileReader($filename);
-    }
-
+    }
+    
     /**
      * Sets the endianness of the file.
@@ -117 +37 @@
     function readint32() {
         $bytes = $this->read(4);
-        if (4 != $this->_strlen($bytes))
+        if (4 != $this->strlen($bytes))
             return false;
         $endian_letter = ('big' == $this->endian)? 'N' : 'V';
@@ -133 +53 @@
     function readint32array($count) {
         $bytes = $this->read(4 * $count);
-        if (4*$count != $this->_strlen($bytes))
+        if (4*$count != $this->strlen($bytes))
             return false;
         $endian_letter = ('big' == $this->endian)? 'N' : 'V';
         return unpack($endian_letter.$count, $bytes);
     }
-}
-endif;
+    
+    
+    function substr($string, $start, $length) {
+        if ($this->is_overloaded) {
+            return mb_substr($string, $start, $length, 'ascii');
+        } else {
+            return substr($string, $start, $length);
+        }
+    }
+    
+    function strlen($string) {
+        if ($this->is_overloaded) {
+            return mb_strlen($string, 'ascii');
+        } else {
+            return strlen($string);
+        }
+    }
+    
+    function str_split($string, $chunk_size) {
+        if (!function_exists('str_split')) {
+            $length = $this->strlen($string);
+            $out = array();
+            for ($i = 0; $i < $length; $i += $chunk_size)
+                $out[] = $this->substr($string, $i, $chunk_size);
+            return $out;
+        } else {
+            return str_split( $string, $chunk_size );
+        }
+    }
+    
+        
+    function pos() {
+        return $this->_pos;
+    }
+
+    function is_resource() {
+        return true;
+    }
+    
+    function close() {
+        return true;
+    }
+}
+endif;
+
+if ( !class_exists( 'POMO_FileReader' ) ):
+class POMO_FileReader extends POMO_Reader {
+    function POMO_FileReader($filename) {
+        parent::POMO_Reader();
+        $this->_f = fopen($filename, 'r');
+    }
+    
+    function read($bytes) {
+        return fread($this->_f, $bytes);
+    }
+    
+    function seekto($pos) {
+        if ( -1 == fseek($this->_f, $pos, SEEK_SET)) {
+            return false;
+        }
+        $this->_pos = $pos;
+        return true;
+    }
+    
+    function is_resource() {
+        return is_resource($this->_f);
+    }
+    
+    function feof() {
+        return feof($this->_f);
+    }
+    
+    function close() {
+        return fclose($this->_f);
+    }
+    
+    function read_all() {
+        $all = '';
+        while ( !$this->feof() )
+            $all .= $this->read(4096);
+        return $all;
+    }
+}
+endif;
+
+if ( !class_exists( 'POMO_StringReader' ) ):
+/**
+ * Provides file-like methods for manipulating a string instead
+ * of a physical file.
+ */
+class POMO_StringReader extends POMO_Reader {
+    
+    var $_str = '';
+    
+    function POMO_StringReader($str = '') {
+        parent::POMO_Reader();
+        $this->_str = $str;
+        $this->_pos = 0;
+    }
+
+
+    function read($bytes) {
+        $data = $this->substr($this->_str, $this->_pos, $bytes);
+        $this->_pos += $bytes;
+        if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+        return $data;
+    }
+
+    function seekto($pos) {
+        $this->_pos = $pos;
+        if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
+        return $this->_pos;
+    }
+
+    function length() {
+        return $this->strlen($this->_str);
+    }
+
+    function read_all() {
+        return $this->substr($this->_str, $this->_pos, $this->strlen($this->_str));
+    }
+    
+}
+endif;
+
+if ( !class_exists( 'POMO_CachedFileReader' ) ):
+/**
+ * Reads the contents of the file in the beginning.
+ */
+class POMO_CachedFileReader extends POMO_StringReader {
+    function POMO_CachedFileReader($filename) {
+        parent::POMO_StringReader();
+        $this->_str = file_get_contents($filename);
+        if (false === $this->_str)
+            return false;
+        $this->_pos = 0;
+    }
+}
+endif;
+
+if ( !class_exists( 'POMO_CachedIntFileReader' ) ):
+/**
+ * Reads the contents of the file in the beginning.
+ */
+class POMO_CachedIntFileReader extends POMO_CachedFileReader {
+    function POMO_CachedIntFileReader($filename) {
+        parent::POMO_CachedFileReader($filename);
+    }
+}
+endif;