diff --git a/README.md b/README.md index 3070818..b3bc4c3 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ require __DIR__ . '/vendor/autoload.php'; use YoutubeDl\YoutubeDl; $yt = new YoutubeDl(); -$yt->onProgress(static function (?string $progressTarget, string $percentage, string $size, string $speed, string $eta, ?string $totalTime): void { +$yt->onProgress(static function (?string $progressTarget, string $percentage, string $size, ?string $speed, ?string $eta, ?string $totalTime): void { echo "Download file: $progressTarget; Percentage: $percentage; Size: $size"; if ($speed) { echo "; Speed: $speed"; diff --git a/src/YoutubeDl.php b/src/YoutubeDl.php index 98b9a92..15271ce 100644 --- a/src/YoutubeDl.php +++ b/src/YoutubeDl.php @@ -36,7 +36,7 @@ class YoutubeDl { - public const PROGRESS_PATTERN = '#\[download\]\s+(?\d+(?:\.\d+)?%)\s+of\s+(?[~]?\d+(?:\.\d+)?(?:K|M|G)iB)(?:\s+at\s+(?(\d+(?:\.\d+)?(?:K|M|G)iB/s)|Unknown speed))?(?:\s+ETA\s+(?([\d:]{2,8}|Unknown ETA)))?(\s+in\s+(?[\d:]{2,8}))?#i'; + public const PROGRESS_PATTERN = '#\[download\]\s+(?\d+(?:\.\d+)?%)\s+of\s+(?[~]?[\S|\s]+?\d+(?:\.\d+)?(?:K|M|G)iB)(?:\s+at\s+(?(\d+(?:\.\d+)?(?:K|M|G)iB/s)|Unknown speed))?(?:\s+ETA\s+(?([\d:]{2,8}|Unknown ETA)))?(\s+in\s+(?[\d:]{2,8}))?#i'; private ProcessBuilderInterface $processBuilder; private MetadataReaderInterface $metadataReader;