CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-02 02:07:04 +13:00
Code Issues Projects Releases Wiki Activity

fix view method

Browse source
This commit is contained in:
Damodar Lohani 2021-09-30 15:32:53 +05:45
parent 18dc0f6a90
commit 7b6a637301
1 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/controllers/api/storage.php
View file

@ -1192,31 +1192,24 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
$size = $file->getAttribute('sizeOriginal', 0);
$rangeHeader = $request->getHeader('range');
if(!empty($rangeHeader)) {
list($unit, $range) = explode('=', $rangeHeader);
if($unit == 'bytes' && !empty($range)) {
list($rangeStart, $rangeEnd) = explode('-', $range);
if(strlen($rangeStart) == 0 || strstr($range, '-') === false) {
throw new Exception('Invalid range', 416);
}
$rangeStart = (int) $rangeStart;
if(strlen($rangeEnd) == 0) {
$rangeEnd = min(($rangeStart + 2000000-1), ($size - 1));
} else {
$rangeEnd = (int) $rangeEnd;
}
if(($rangeStart >= $rangeEnd) || $rangeEnd >= $size) {
throw new Exception('Invalid range', 416);
}
$response
->addHeader('Accept-Ranges', 'bytes')
->addHeader('Content-Range', 'bytes ' . $rangeStart . '-' . $rangeEnd . '/' . $size)
->addHeader('Content-Length', $rangeEnd - $rangeStart + 1)
->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
} else {
if(!empty($rangeHeader)) {
$start = $request->getRangeStart();
$end = $request->getRangeEnd();
$unit = $request->getRangeUnit();
if($end == null) {
$end = min(($start + 2000000-1), ($size - 1));
}
if($unit != 'bytes' || $start >= $end || $end >= $size) {
throw new Exception('Invalid range', 416);
}
$response
->addHeader('Accept-Ranges', 'bytes')
->addHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $size)
->addHeader('Content-Length', $end - $start + 1)
->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
}
$source = '';
@ -1247,13 +1240,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
if(!empty($source)) {
if(!empty($rangeHeader)) {
$response->send(substr($source, $rangeStart, ($rangeEnd - $rangeStart + 1)));
$response->send(substr($source, $start, ($end - $start + 1)));
}
$response->send($source);
}
if(!empty($rangeHeader)) {
$response->send($device->read($path, $rangeStart, ($rangeEnd - $rangeStart + 1)));
$response->send($device->read($path, $start, ($end - $start + 1)));
}
$size = $device->getFileSize($path);