lazy open first source stream in assemblystream
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
5de5db0280
commit
13317da19a
|
@ -73,9 +73,6 @@ class AssemblyStream implements \Icewind\Streams\File {
|
|||
return strnatcmp($a->getName(), $b->getName());
|
||||
});
|
||||
$this->nodes = array_values($nodes);
|
||||
if (count($this->nodes) > 0) {
|
||||
$this->currentStream = $this->getStream($this->nodes[0]);
|
||||
}
|
||||
$this->size = array_reduce($this->nodes, function ($size, IFile $file) {
|
||||
return $size + $file->getSize();
|
||||
}, 0);
|
||||
|
@ -104,7 +101,11 @@ class AssemblyStream implements \Icewind\Streams\File {
|
|||
*/
|
||||
public function stream_read($count) {
|
||||
if (is_null($this->currentStream)) {
|
||||
return '';
|
||||
if ($this->currentNode < count($this->nodes)) {
|
||||
$this->currentStream = $this->getStream($this->nodes[$this->currentNode]);
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
do {
|
||||
|
@ -182,7 +183,7 @@ class AssemblyStream implements \Icewind\Streams\File {
|
|||
* @return bool
|
||||
*/
|
||||
public function stream_eof() {
|
||||
return $this->pos >= $this->size || $this->currentStream === null;
|
||||
return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue