CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-15 17:24:48 +12:00
Code Issues Projects Releases Wiki Activity

fix permission and other fixes for chunked upload

Browse source
This commit is contained in:
Damodar Lohani 2022-02-17 12:47:26 +00:00
parent 0dac3a7346
commit 9d5b6ef096
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/controllers/api/functions.php
View file

@ -543,14 +543,16 @@ App::post('/v1/functions/:functionId/deployments')
$deployment = $dbForProject->getDocument('deployments', $deploymentId);
if(!$deployment->isEmpty()) {
$metadata = ['content_type' => $deviceLocal->getFileMimeType($fileTmpName)];
if (!$deployment->isEmpty()) {
$chunks = $deployment->getAttribute('chunksTotal', 1);
if($chunk == -1) {
$metadata = $deployment->getAttribute('metadata', []);
if ($chunk === -1) {
$chunk = $chunks;
}
}
$chunksUploaded = $deviceFunctions->upload($fileTmpName, $path, $chunk, $chunks);
$chunksUploaded = $deviceFunctions->upload($fileTmpName, $path, $chunk, $chunks, $metadata);
if (empty($chunksUploaded)) {
throw new Exception('Failed moving file', 500);
@ -585,16 +587,28 @@ App::post('/v1/functions/:functionId/deployments')
'size' => $fileSize,
'search' => implode(' ', [$deploymentId, $entrypoint]),
'activate' => ((bool) $activate === true),
'metadata' => $metadata,
]));
} else {
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('size', $fileSize));
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('size', $fileSize)->setAttribute('metadata', $metadata));
}
// Enqueue a message to start the build
Resque::enqueue(Event::BUILDS_QUEUE_NAME, Event::BUILDS_CLASS_NAME, [
'projectId' => $project->getId(),
'resourceId' => $function->getId(),
'deploymentId' => $deploymentId,
'type' => BUILD_TYPE_DEPLOYMENT
]);
$usage
->setParam('storage', $deployment->getAttribute('size', 0))
;
} else {
if($deployment->isEmpty()) {
$deployment = $dbForProject->createDocument('deployments', new Document([
'$id' => $deploymentId,
'$read' => [],
'$write' => [],
'$read' => ['role:all'],
'$write' => ['role:all'],
'resourceId' => $function->getId(),
'dateCreated' => time(),
'entrypoint' => $entrypoint,
@ -604,24 +618,14 @@ App::post('/v1/functions/:functionId/deployments')
'chunksUploaded' => $chunksUploaded,
'search' => implode(' ', [$deploymentId, $entrypoint]),
'activate' => ((bool) $activate === true),
'metadata' => $metadata,
]));
} else {
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('chunksUploaded', $chunksUploaded));
$deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('chunksUploaded', $chunksUploaded)->setAttribute('metadata', $metadata));
}
}
// Enqueue a message to start the build
Resque::enqueue(Event::BUILDS_QUEUE_NAME, Event::BUILDS_CLASS_NAME, [
'projectId' => $project->getId(),
'resourceId' => $function->getId(),
'deploymentId' => $deploymentId,
'type' => BUILD_TYPE_DEPLOYMENT
]);
$usage
->setParam('storage', $deployment->getAttribute('size', 0))
;
$metadata = null;
$response->setStatusCode(Response::STATUS_CODE_CREATED);
$response->dynamic($deployment, Response::MODEL_DEPLOYMENT);