tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split Icinga\Protocol\File\FileReader into ...\FileReader and ...\FileIterator

This commit is contained in:
Alexander Klimov 2014-09-04 16:33:57 +02:00
parent fcd12073f8
commit f0969e0b2e
2 changed files with 95 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
library/Icinga/Protocol/File/FileIterator.php Normal file
View File

@ -0,0 +1,82 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Protocol\File;
use FilterIterator;
use Icinga\Util\File;
/**
* Class FileIterator
*
* Iterate over a file, yielding only fields of non-empty lines which match a PCRE expression
*/
class FileIterator extends FilterIterator
{
/**
* A PCRE string with the fields to extract from the file's lines as named subpatterns
*
* @var string
*/
protected $fields;
/**
* An associative array of the current line's fields ($field => $value)
*
* @var array
*/
protected $currentData;
public function __construct($filename, $fields)
{
$this->fields = $fields;
$f = new File($filename);
$f->setFlags(
File::DROP_NEW_LINE |
File::READ_AHEAD |
File::SKIP_EMPTY
);
parent::__construct($f);
}
/**
* Return the current data
*
* @return array
*/
public function current()
{
return $this->currentData;
}
/**
* Accept lines matching the given PCRE pattern
*
* @return bool
*
* @throws FileReaderException If PHP failed parsing the PCRE pattern
*/
public function accept()
{
$data = array();
$matched = preg_match(
$this->fields,
$this->getInnerIterator()->current(),
$data
);
if ($matched === false) {
throw new FileReaderException('Failed parsing regular expression!');
} else if ($matched === 1) {
foreach ($data as $key => $value) {
if (is_int($key)) {
unset($data[$key]);
}
}
$this->currentData = $data;
return true;
}
return false;
}
}

65
library/Icinga/Protocol/File/FileReader.php
View File

@ -4,16 +4,12 @@
namespace Icinga\Protocol\File;
use FilterIterator;
use Iterator;
use Zend_Config;
use Icinga\Protocol\File\FileReaderException;
use Icinga\Util\File;
/**
* Read file line by line
*/
class FileReader extends FilterIterator
class FileReader
{
/**
* A PCRE string with the fields to extract from the file's lines as named subpatterns
@ -23,11 +19,11 @@ class FileReader extends FilterIterator
protected $fields;
/**
* An associative array of the current line's fields ($field => $value)
* Name of the target file
*
* @var array
* @var string
*/
protected $currentData;
protected $filename;
/**
* Create a new reader
@ -39,57 +35,22 @@ class FileReader extends FilterIterator
public function __construct(Zend_Config $config)
{
foreach (array('filename', 'fields') as $key) {
if (! isset($config->{$key})) {
if (isset($config->{$key})) {
$this->{$key} = $config->{$key};
} else {
throw new FileReaderException('The directive `%s\' is required', $key);
}
}
$this->fields = $config->fields;
$f = new File($config->filename);
$f->setFlags(
File::DROP_NEW_LINE |
File::READ_AHEAD |
File::SKIP_EMPTY
);
parent::__construct($f);
}
/**
* Return the current data
* Instantiate a FileIterator object with the target file
*
* @return array
* @return FileIterator
*/
public function current()
public function iterate()
{
return $this->currentData;
}
/**
* Accept lines matching the given PCRE pattern
*
* @return bool
*
* @throws FileReaderException If PHP failed parsing the PCRE pattern
*/
public function accept()
{
$data = array();
$matched = @preg_match(
$this->fields,
$this->getInnerIterator()->current(),
$data
);
if ($matched === false) {
throw new FileReaderException('Failed parsing regular expression!');
} else if ($matched === 1) {
foreach ($data as $key => $value) {
if (is_int($key)) {
unset($data[$key]);
}
}
$this->currentData = $data;
return true;
}
return false;
return new FileIterator($this->filename, $this->fields);
}
/**
@ -109,7 +70,7 @@ class FileReader extends FilterIterator
*/
public function count()
{
return iterator_count($this);
return iterator_count($this->iterate());
}
/**
@ -155,7 +116,7 @@ class FileReader extends FilterIterator
}
}
$index = 0;
foreach ($this as $line) {
foreach ($this->iterate() as $line) {
if ($index >= $skip) {
if ($index >= $skip + $read) {
break;