danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow downloadToResponse for media without size (#817)

Browse Source
This commit is contained in:
Alexander Pankratov 2020-05-23 15:08:04 +03:00 committed by GitHub
parent d5b2cbefd3
commit ddc81d8764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/danog/MadelineProto/MTProtoTools/Files.php
View File

@ -996,7 +996,7 @@ trait Files
} }
$response = new Response($result['code'], $result['headers'], $body); $response = new Response($result['code'], $result['headers'], $body);
if ($result['serve']) { if ($result['serve'] && !empty($result['headers']['Content-Length'])) {
$response->setHeader('content-length', $result['headers']['Content-Length']); $response->setHeader('content-length', $result['headers']['Content-Length']);
} }
@ -1063,7 +1063,8 @@ trait Files
} }
[$seek_start, $seek_end] = $listseek; [$seek_start, $seek_end] = $listseek;
$seek_end = empty($seek_end) ? ($messageMedia['size'] - 1) : \min(\abs(\intval($seek_end)), $messageMedia['size'] - 1); $size = $messageMedia['size'] ?? 0;
$seek_end = empty($seek_end) ? ($size - 1) : \min(\abs(\intval($seek_end)), $size - 1);
if (!empty($seek_start) && $seek_end < \abs(\intval($seek_start))) { if (!empty($seek_start) && $seek_end < \abs(\intval($seek_start))) {
return [ return [
@ -1079,12 +1080,12 @@ trait Files
'code' => Status::OK, 'code' => Status::OK,
'headers' => [] 'headers' => []
]; ];
if ($seek_start > 0 || $seek_end < $messageMedia['size'] - 1) { if ($seek_start > 0 || $seek_end < $size - 1) {
$result['code'] = Status::PARTIAL_CONTENT; $result['code'] = Status::PARTIAL_CONTENT;
$result['headers']['Content-Range'] = "bytes ${seek_start}-${seek_end}/${messageMedia['size']}"; $result['headers']['Content-Range'] = "bytes ${seek_start}-${seek_end}/${$size}";
$result['headers']['Content-Length'] = $seek_end - $seek_start + 1; $result['headers']['Content-Length'] = $seek_end - $seek_start + 1;
} else { } elseif ($size > 0) {
$result['headers']['Content-Length'] = $messageMedia['size']; $result['headers']['Content-Length'] = $size;
} }
$result['headers']['Content-Type'] = $messageMedia['mime']; $result['headers']['Content-Type'] = $messageMedia['mime'];
$result['headers']['Cache-Control'] = 'max-age=31556926'; $result['headers']['Cache-Control'] = 'max-age=31556926';
@ -1092,7 +1093,11 @@ trait Files
$result['headers']['Accept-Ranges'] = 'bytes'; $result['headers']['Accept-Ranges'] = 'bytes';
if ($result['serve']) { if ($result['serve']) {
$result['serve'] = [$seek_start, $seek_end + 1]; if ($seek_start === 0 && $seek_end === -1) {
$result['serve'] = [0, -1];
} else {
$result['serve'] = [$seek_start, $seek_end + 1];
}
} }
return $result; return $result;