From a1b401c1483905523f3d501595368287aefd77c7 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Mon, 22 Apr 2019 21:55:45 +0200 Subject: [PATCH] refactor: Use less confusing variable names in YoutubeStream --- classes/streams/YoutubeStream.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/classes/streams/YoutubeStream.php b/classes/streams/YoutubeStream.php index 3557110..bb804c0 100644 --- a/classes/streams/YoutubeStream.php +++ b/classes/streams/YoutubeStream.php @@ -24,16 +24,17 @@ class YoutubeStream extends AppendStream parent::__construct(); $stream = $video->getHttpResponse(); - $fileSize = $stream->getHeader('Content-Length'); + $contentLenghtHeader = $stream->getHeader('Content-Length'); $curSize = 0; - while ($curSize < $fileSize[0]) { - $newSize = $curSize + $video->downloader_options->http_chunk_size; - if ($newSize > $fileSize[0]) { - $newSize = $fileSize[0] - 1; + + while ($rangeStart < $contentLenghtHeader[0]) { + $rangeEnd = $rangeStart + $video->downloader_options->http_chunk_size; + if ($rangeEnd > $contentLenghtHeader[0]) { + $rangeEnd = $contentLenghtHeader[0] - 1; } - $response = $video->getHttpResponse(['Range' => 'bytes='.$curSize.'-'.$newSize]); + $response = $video->getHttpResponse(['Range' => 'bytes='.$rangeStart.'-'.$rangeEnd]); $this->addStream(new YoutubeChunkStream($response)); - $curSize = $newSize + 1; + $rangeStart = $rangeEnd + 1; } } }