Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore

Browse Source
This commit is contained in:
shimon
2022-06-19 11:52:56 +03:00
parent e97957d46e
commit 56545a7344
10 changed files with 105 additions and 6281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections.php
+1 -1
View File
@@ -2920,7 +2920,7 @@ $collections = [
'$id' => 'metadata',
'type' => Database::VAR_STRING,
'format' => '',
'size' => 16384, // https://tools.ietf.org/html/rfc4288#section-4.2
'size' => 16384,
'signed' => true,
'required' => false,
'default' => null,
app/config/services.php
+13
View File
@@ -183,4 +183,17 @@ return [
'optional' => false,
'icon' => '',
],
'video' => [
'key' => 'video',
'name' => 'Video',
'subtitle' => 'Appwrite\'s Video Endpoint',
'description' => 'Video Endpoint',
'controller' => 'api/video.php',
'sdk' => false,
'docs' => false,
'docsUrl' => '',
'tests' => true,
'optional' => false,
'icon' => '',
],
];
app/controllers/api/storage.php
+30
View File
@@ -124,6 +124,36 @@ App::post('/v1/storage/buckets')
$bucket = $dbForProject->getDocument('buckets', $bucketId);
$dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
$attributes = [];
$indexes = [];
$videos = Config::getParam('collections', [])['videos'] ?? [];
foreach ($videos['attributes'] as $attribute) {
$attributes[] = new Document([
'$id' => $attribute['$id'],
'type' => $attribute['type'],
'size' => $attribute['size'],
'required' => $attribute['required'],
'signed' => $attribute['signed'],
'array' => $attribute['array'],
'filters' => $attribute['filters'],
'default' => $attribute['default'] ?? null,
'format' => $attribute['format'] ?? ''
]);
}
foreach ($videos['indexes'] as $index) {
$indexes[] = new Document([
'$id' => $index['$id'],
'type' => $index['type'],
'attributes' => $index['attributes'],
'lengths' => $index['lengths'],
'orders' => $index['orders'],
]);
}
$dbForProject->createCollection('bucket_' . $bucket->getInternalId() . '_video_renditions', $attributes, $indexes);
} catch (Duplicate $th) {
throw new Exception('Bucket already exists', 409, Exception::STORAGE_BUCKET_ALREADY_EXISTS);
}
app/init.php
+27
View File
@@ -89,6 +89,7 @@ const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1073741824; // 2^32 bits / 4 bits per char
const APP_STORAGE_UPLOADS = '/storage/uploads';
const APP_STORAGE_VIDEO = '/storage/video';
const APP_STORAGE_FUNCTIONS = '/storage/functions';
const APP_STORAGE_BUILDS = '/storage/builds';
const APP_STORAGE_CACHE = '/storage/cache';
@@ -153,6 +154,32 @@ App::setMode(App::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
/*
* ENV vars
*/
Config::load('renditions', __DIR__ . '/config/renditions.php');
Config::load('events', __DIR__ . '/config/events.php');
Config::load('auth', __DIR__ . '/config/auth.php');
Config::load('errors', __DIR__ . '/config/errors.php');
Config::load('providers', __DIR__ . '/config/providers.php');
Config::load('platforms', __DIR__ . '/config/platforms.php');
Config::load('collections', __DIR__ . '/config/collections.php');
Config::load('runtimes', __DIR__ . '/config/runtimes.php');
Config::load('roles', __DIR__ . '/config/roles.php'); // User roles and scopes
Config::load('scopes', __DIR__ . '/config/scopes.php'); // User roles and scopes
Config::load('services', __DIR__ . '/config/services.php'); // List of services
Config::load('variables', __DIR__ . '/config/variables.php'); // List of env variables
Config::load('avatar-browsers', __DIR__ . '/config/avatars/browsers.php');
Config::load('avatar-credit-cards', __DIR__ . '/config/avatars/credit-cards.php');
Config::load('avatar-flags', __DIR__ . '/config/avatars/flags.php');
Config::load('locale-codes', __DIR__ . '/config/locale/codes.php');
Config::load('locale-currencies', __DIR__ . '/config/locale/currencies.php');
Config::load('locale-eu', __DIR__ . '/config/locale/eu.php');
Config::load('locale-languages', __DIR__ . '/config/locale/languages.php');
Config::load('locale-phones', __DIR__ . '/config/locale/phones.php');
Config::load('locale-countries', __DIR__ . '/config/locale/countries.php');
Config::load('locale-continents', __DIR__ . '/config/locale/continents.php');
Config::load('storage-logos', __DIR__ . '/config/storage/logos.php');
Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
Config::load('events', __DIR__ . '/config/events.php');
Config::load('auth', __DIR__ . '/config/auth.php');
Config::load('errors', __DIR__ . '/config/errors.php');
app/views/video/dash.phtml
+1
View File
@@ -1,5 +1,6 @@
<?php
$params = $this->getParam('params', []);
?>
<?php echo '<?xml version="1.0" encoding="utf-8"?>'; ?>
<MPD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xlink="http://www.w3.org/1999/xlink"
app/workers/deletes.php
+6 -1
View File
@@ -572,8 +572,13 @@ class DeletesV1 extends Worker
protected function deleteBucket(Document $document, string $projectId)
{
$dbForProject = $this->getProjectDB($projectId);
$dbForProject->deleteCollection('bucket_' . $document->getInternalId());
$dbForProject->deleteCollection('bucket_' . $document->getInternalId());
$device = $this->getDevice(APP_STORAGE_UPLOADS . '/app-' . $projectId);
$device->deletePath($document->getId());
$dbForProject->deleteCollection('bucket_' . $document->getInternalId() . '_video_renditions');
$device = $this->getDevice(APP_STORAGE_VIDEO . '/app-' . $projectId);
$device = $this->getDevice(APP_STORAGE_UPLOADS . '/app-' . $projectId);
$device->deletePath($document->getId());
composer.lock
Generated
-6266
View File
File diff suppressed because it is too large Load Diff
src/Appwrite/Event/Event.php
+3
View File
@@ -32,6 +32,9 @@ class Event
public const BUILDS_QUEUE_NAME = 'v1-builds';
public const BUILDS_CLASS_NAME = 'BuildsV1';
const TRANSCODING_QUEUE_NAME = 'v1-transcoding';
const TRANSCODING_CLASS_NAME = 'TranscodingV1';
protected string $queue = '';
protected string $class = '';
protected string $event = '';
src/Appwrite/Resque/Worker.php
+11
View File
@@ -252,6 +252,17 @@ abstract class Worker
}
/**
* Get Video Storage Device
* @param string $projectId of the project
* @return Device
*/
protected function getVideoDevice($projectId): Device
{
return $this->getDevice(APP_STORAGE_VIDEO . '/app-' . $projectId);
}
/**
* Get Builds Storage Device
* @param string $projectId of the project
tests/e2e/Services/Video/VideoCustomServerTest.php
+13 -13
View File
@@ -72,11 +72,11 @@ class VideoCustomServerTest extends Scope
// var_dump($fid);
// var_dump($bid);
$pid = '62aaf3408decb0f5a0b3';
$key = '6e8bf2fd07e5206a9b90efbc3dfbf0794a8e35810838e6b906f0c651a510924b8cf0c535b3a4e84b0330344153a4d8d5e413a0d9314f6955a4b2693633ab120d4f674dd668820d4c195d3006bd814003de18dc2161d7ce639a03cd37fd6fa14151445eddb5c9a294ddf16276ec97d56ecb7275eddab3517254bc7201688d8f47';
$fid = '62aaf3423b91f5660b04';
$bid = '62aaf340e9c06064668d';
//
$pid = '62aedd7c27c6f34ca44d';
$key = '1cd0589616c0b0b98dbc42764399799e3dcf0fbcfa0d1f1db2a258573783802267551853ffa77d2895e57597835055afb645237e84d07cffd33f946af6598f40cdfdc11b9eb6bee09fdd0a325a4b5e3ef34fdf4ba745a87dc4de16f9935803c9ff6349f424774b2a4d3c8ce8a40a835b16486dec9e8c1f8fc16bc37e357f9daf';
$fid = '62aedd7dcdcc014783ff';
$bid = '62aedd7c90a8570ebf31';
$transcoding = $this->client->call(Client::METHOD_POST, '/video/buckets/' . $bid . '/files/' . $fid, [
'content-type' => 'application/json',
@@ -99,10 +99,10 @@ class VideoCustomServerTest extends Scope
public function testRenditions(): void
{
$pid = '62aaf3408decb0f5a0b3';
$key = '6e8bf2fd07e5206a9b90efbc3dfbf0794a8e35810838e6b906f0c651a510924b8cf0c535b3a4e84b0330344153a4d8d5e413a0d9314f6955a4b2693633ab120d4f674dd668820d4c195d3006bd814003de18dc2161d7ce639a03cd37fd6fa14151445eddb5c9a294ddf16276ec97d56ecb7275eddab3517254bc7201688d8f47';
$fid = '62aaf3423b91f5660b04';
$bid = '62aaf340e9c06064668d';
$pid = '62aedd7c27c6f34ca44d';
$key = '1cd0589616c0b0b98dbc42764399799e3dcf0fbcfa0d1f1db2a258573783802267551853ffa77d2895e57597835055afb645237e84d07cffd33f946af6598f40cdfdc11b9eb6bee09fdd0a325a4b5e3ef34fdf4ba745a87dc4de16f9935803c9ff6349f424774b2a4d3c8ce8a40a835b16486dec9e8c1f8fc16bc37e357f9daf';
$fid = '62aedd7dcdcc014783ff';
$bid = '62aedd7c90a8570ebf31';
$renditions = $this->client->call(Client::METHOD_GET, '/video/buckets/' . $bid . '/files/' . $fid . '/renditions', [
@@ -117,10 +117,10 @@ class VideoCustomServerTest extends Scope
public function testPlaylist(): void
{
$pid = '62aaf3408decb0f5a0b3';
$key = '6e8bf2fd07e5206a9b90efbc3dfbf0794a8e35810838e6b906f0c651a510924b8cf0c535b3a4e84b0330344153a4d8d5e413a0d9314f6955a4b2693633ab120d4f674dd668820d4c195d3006bd814003de18dc2161d7ce639a03cd37fd6fa14151445eddb5c9a294ddf16276ec97d56ecb7275eddab3517254bc7201688d8f47';
$fid = '62aaf3423b91f5660b04';
$bid = '62aaf340e9c06064668d';
$pid = '62aedd7c27c6f34ca44d';
$key = '1cd0589616c0b0b98dbc42764399799e3dcf0fbcfa0d1f1db2a258573783802267551853ffa77d2895e57597835055afb645237e84d07cffd33f946af6598f40cdfdc11b9eb6bee09fdd0a325a4b5e3ef34fdf4ba745a87dc4de16f9935803c9ff6349f424774b2a4d3c8ce8a40a835b16486dec9e8c1f8fc16bc37e357f9daf';
$fid = '62aedd7dcdcc014783ff';
$bid = '62aedd7c90a8570ebf31';
$stream = 'dash';
$renditions = $this->client->call(Client::METHOD_GET, '/video/buckets/' . $bid . '/files/' . $stream . '/' . $fid, [