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

addressing comments

Browse Source
This commit is contained in:
shimon
2022-08-23 17:17:40 +03:00
parent 59b188755c
commit ebe794926c
23 changed files with 618 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -2
View File
@@ -50,8 +50,7 @@ RUN \
yaml-dev \
imagemagick \
imagemagick-dev \
libmaxminddb-dev \
ffmpeg
libmaxminddb-dev
RUN docker-php-ext-install sockets
app/config/collections.php
+21 -21
View File
@@ -3025,9 +3025,9 @@ $collections = [
],
[
'$id' => 'width',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3036,9 +3036,9 @@ $collections = [
],
[
'$id' => 'height',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3058,12 +3058,12 @@ $collections = [
],
[
'$id' => 'videoBitrate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => Database::LENGTH_KEY,
'signed' => true,
'required' => false,
'default' => 0,
'default' => null,
'array' => false,
'filters' => [],
],
@@ -3091,23 +3091,23 @@ $collections = [
],
[
'$id' => 'audioBitrate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => Database::LENGTH_KEY,
'signed' => true,
'required' => false,
'default' => 0,
'default' => null,
'array' => false,
'filters' => [],
],
[
'$id' => 'audioSamplerate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => Database::LENGTH_KEY,
'signed' => true,
'required' => false,
'default' => 0,
'default' => null,
'array' => false,
'filters' => [],
],
@@ -3217,9 +3217,9 @@ $collections = [
],
[
'$id' => 'width',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3228,9 +3228,9 @@ $collections = [
],
[
'$id' => 'height',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3250,9 +3250,9 @@ $collections = [
],
[
'$id' => 'videoBitrate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3283,9 +3283,9 @@ $collections = [
],
[
'$id' => 'audioBitrate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3294,9 +3294,9 @@ $collections = [
],
[
'$id' => 'audioSamplerate',
'type' => Database::VAR_INTEGER,
'type' => Database::VAR_STRING,
'format' => '',
'size' => 0,
'size' => Database::LENGTH_KEY,
'signed' => false,
'required' => false,
'default' => null,
@@ -3701,4 +3701,4 @@ $collections = [
],
];
return $collections;
return $collections;
app/config/specs/open-api3-latest-client.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/open-api3-latest-console.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/open-api3-latest-server.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/swagger2-latest-client.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/swagger2-latest-console.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/config/specs/swagger2-latest-server.json
+1 -1
View File
File diff suppressed because one or more lines are too long
app/controllers/api/account.php
+1 -1
View File
@@ -2383,4 +2383,4 @@ App::put('/v1/account/verification/phone')
;
$response->dynamic($verificationDocument, Response::MODEL_TOKEN);
});
});
app/controllers/api/projects.php
-2
View File
@@ -1443,5 +1443,3 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
$response->noContent();
});
app/controllers/api/storage.php
+1 -1
View File
@@ -1676,4 +1676,4 @@ App::get('/v1/storage/:bucketId/usage')
}
$response->dynamic($usage, Response::MODEL_USAGE_BUCKETS);
});
});
app/controllers/api/users.php
+1 -1
View File
@@ -948,4 +948,4 @@ App::get('/v1/users/usage')
}
$response->dynamic($usage, Response::MODEL_USAGE_USERS);
});
});
app/controllers/api/videos.php
+546 -465
View File
File diff suppressed because it is too large Load Diff
app/http.php
+1 -1
View File
@@ -349,4 +349,4 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
}
});
$http->start();
$http->start();
app/init.php
+3 -3
View File
@@ -12,7 +12,7 @@ if (\file_exists(__DIR__ . '/../vendor/autoload.php')) {
require_once __DIR__ . '/../vendor/autoload.php';
}
ini_set('memory_limit', '1024M');
ini_set('memory_limit', '512M');
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('default_socket_timeout', -1);
@@ -845,7 +845,7 @@ App::setResource('project', function ($dbForConsole, $request, $console) {
/** @var Utopia\Database\Document $console */
$projectId = 'dev';
$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console'));
//$projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console'));
if ($projectId === 'console') {
return $console;
@@ -1004,4 +1004,4 @@ App::setResource('phone', function () {
'vonage' => new Vonage($user, $secret),
default => null
};
});
});
app/workers/transcoding.php
+12 -12
View File
@@ -128,7 +128,7 @@ class TranscodingV1 extends Worker
$general = $this->getVideoSourceInfo($ffprobe->streams($inPath));
if (!empty($general)) {
foreach ($general as $key => $value) {
$sourceVideo->setAttribute($key, $value);
$sourceVideo->setAttribute($key, (string)$value);
}
Authorization::skip(fn() => $this->database->updateDocument(
@@ -237,7 +237,7 @@ class TranscodingV1 extends Worker
$general = $this->transcode($profile['stream'], $video, $format, $representation, $subs);
if (!empty($general)) {
foreach ($general as $key => $value) {
$query->setAttribute($key, $value);
$query->setAttribute($key, (string)$value);
}
}
@@ -485,14 +485,14 @@ class TranscodingV1 extends Worker
{
return [
'duration' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('duration') : '0',
'height' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('height') : 0,
'width' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('width') : 0,
'height' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('height') : '0',
'width' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('width') : '0',
'videoCodec' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('codec_name') : '',
'videoFramerate' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('avg_frame_rate') : '',
'videoBitrate' => $streams->videos()->count() > 0 ? (int)$streams->videos()->first()->get('bit_rate') : 0,
'videoFramerate' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('avg_frame_rate') : '0',
'videoBitrate' => $streams->videos()->count() > 0 ? $streams->videos()->first()->get('bit_rate') : '0',
'audioCodec' => $streams->audios()->count() > 0 ? $streams->audios()->first()->get('codec_name') : '',
'audioSamplerate' => $streams->audios()->count() > 0 ? (int)$streams->audios()->first()->get('sample_rate') : 0,
'audioBitrate' => $streams->audios()->count() > 0 ? (int)$streams->audios()->first()->get('bit_rate') : 0,
'audioSamplerate' => $streams->audios()->count() > 0 ? $streams->audios()->first()->get('sample_rate') : '0',
'audioBitrate' => $streams->audios()->count() > 0 ? $streams->audios()->first()->get('bit_rate') : '0',
];
}
@@ -514,12 +514,12 @@ class TranscodingV1 extends Worker
if ($streams['codec_type'] === 'video') {
$info['duration'] = !empty($streams['duration']) ? $streams['duration'] : '0';
$info['videoCodec'] = !empty($streams['codec_name']) ? $streams['codec_name'] : '';
$info['videoBitrate'] = !empty($streams['bit_rate']) ? (int)$streams['bit_rate'] : $representation->getKiloBitrate();
$info['videoFramerate'] = !empty($streams['avg_frame_rate']) ? $streams['avg_frame_rate'] : '';
$info['videoBitrate'] = !empty($streams['bit_rate']) ? $streams['bit_rate'] : $representation->getKiloBitrate();
$info['videoFramerate'] = !empty($streams['avg_frame_rate']) ? $streams['avg_frame_rate'] : '0';
} elseif ($streams['codec_type'] === 'audio') {
$info['audioCodec'] = !empty($streams['codec_name']) ? $streams['codec_name'] : '' ;
$info['audioSamplerate'] = !empty($streams['sample_rate']) ? (int)$streams['sample_rate'] : 0;
$info['audioBitrate'] = !empty($streams['bit_rate']) ? (int)$streams['bit_rate'] : $representation->getAudioKiloBitrate();
$info['audioSamplerate'] = !empty($streams['sample_rate']) ? $streams['sample_rate'] : '0';
$info['audioBitrate'] = !empty($streams['bit_rate']) ? $streams['bit_rate'] : $representation->getAudioKiloBitrate();
}
}
return $info;
src/Appwrite/Extend/Exception.php
+1 -2
View File
@@ -174,10 +174,9 @@ class Exception extends \Exception
public const VIDEO_PROFILE_NOT_FOUND = 'video_profile_not_found';
public const VIDEO_PROFILE_ALREADY_EXISTS = 'video_profile_already_exists';
public const VIDEO_RENDITION_NOT_FOUND = 'video_rendition_not_found';
public const VIDEO_RENDITION_ALREADY_EXISTS = 'video_rendition_already_exists';
public const VIDEO_SUBTITLE_NOT_FOUND = 'video_subtitle_not_found';
public const VIDEO_NOT_FOUND = 'video_not_found';
public const VIDEO_RENDITION_SEGMENT_NOT_FOUND = 'video_rendition_segment_not__found';
public const VIDEO_RENDITION_SEGMENT_NOT_FOUND = 'video_rendition_segment_not_found';
public const VIDEO_SUBTITLE_SEGMENT_NOT_FOUND = 'video_subtitle_segment_not_found';
src/Appwrite/Utopia/Response.php
+17 -15
View File
@@ -71,9 +71,9 @@ use Appwrite\Utopia\Response\Model\UsageProject;
use Appwrite\Utopia\Response\Model\UsageStorage;
use Appwrite\Utopia\Response\Model\UsageUsers;
use Appwrite\Utopia\Response\Model\Video;
use Appwrite\Utopia\Response\Model\VideoProfile;
use Appwrite\Utopia\Response\Model\VideoRendition;
use Appwrite\Utopia\Response\Model\VideoSubtitle;
use Appwrite\Utopia\Response\Model\Profile;
use Appwrite\Utopia\Response\Model\Rendition;
use Appwrite\Utopia\Response\Model\Subtitle;
/**
* @method Response setStatusCode(int $code = 200)
@@ -138,12 +138,13 @@ class Response extends SwooleResponse
//video
public const MODEL_VIDEO = 'video';
public const MODEL_VIDEO_PROFILE = 'videoProfile';
public const MODEL_VIDEO_PROFILE_LIST = 'videoProfileList';
public const MODEL_VIDEO_RENDITION = 'videoRendition';
public const MODEL_VIDEO_RENDITION_LIST = 'videoRenditionList';
public const MODEL_VIDEO_SUBTITLE = 'videoSubtitle';
public const MODEL_VIDEO_SUBTITLE_LIST = 'videoSubtitleList';
public const MODEL_VIDEO_LIST = 'videoList';
public const MODEL_PROFILE = 'profile';
public const MODEL_PROFILE_LIST = 'profileList';
public const MODEL_RENDITION = 'rendition';
public const MODEL_RENDITION_LIST = 'renditionList';
public const MODEL_SUBTITLE = 'subtitle';
public const MODEL_SUBTITLE_LIST = 'subtitleList';
// Locale
public const MODEL_LOCALE = 'locale';
@@ -255,9 +256,10 @@ class Response extends SwooleResponse
->setModel(new BaseList('Currencies List', self::MODEL_CURRENCY_LIST, 'currencies', self::MODEL_CURRENCY))
->setModel(new BaseList('Phones List', self::MODEL_PHONE_LIST, 'phones', self::MODEL_PHONE))
->setModel(new BaseList('Metric List', self::MODEL_METRIC_LIST, 'metrics', self::MODEL_METRIC, true, false))
->setModel(new BaseList('video profile List', self::MODEL_VIDEO_PROFILE_LIST, 'profiles', self::MODEL_VIDEO_PROFILE))
->setModel(new BaseList('Video Rendition List', self::MODEL_VIDEO_RENDITION_LIST, 'renditions', self::MODEL_VIDEO_RENDITION))
->setModel(new BaseList('Video Subtitle List', self::MODEL_VIDEO_SUBTITLE_LIST, 'subtitles', self::MODEL_VIDEO_SUBTITLE))
->setModel(new BaseList('Profile List', self::MODEL_PROFILE_LIST, 'profiles', self::MODEL_PROFILE))
->setModel(new BaseList('Rendition List', self::MODEL_RENDITION_LIST, 'renditions', self::MODEL_RENDITION))
->setModel(new BaseList('Subtitle List', self::MODEL_SUBTITLE_LIST, 'subtitles', self::MODEL_SUBTITLE))
->setModel(new BaseList('Video List', self::MODEL_VIDEO_LIST, 'videos', self::MODEL_VIDEO))
// Entities
->setModel(new Database())
->setModel(new Collection())
@@ -314,9 +316,9 @@ class Response extends SwooleResponse
->setModel(new UsageFunctions())
->setModel(new UsageProject())
->setModel(new Video())
->setModel(new VideoProfile())
->setModel(new VideoRendition())
->setModel(new VideoSubtitle())
->setModel(new Profile())
->setModel(new Rendition())
->setModel(new Subtitle())
// Verification
// Recovery
src/Appwrite/Utopia/Response/Model/videoProfile.php → src/Appwrite/Utopia/Response/Model/Profile.php
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Appwrite\Utopia\Response\Model;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Model;
class VideoProfile extends Model
class Profile extends Model
{
public function __construct()
{
@@ -73,6 +73,6 @@ class VideoProfile extends Model
*/
public function getType(): string
{
return Response::MODEL_VIDEO_PROFILE;
return Response::MODEL_PROFILE;
}
}
src/Appwrite/Utopia/Response/Model/VideoRendition.php → src/Appwrite/Utopia/Response/Model/Rendition.php
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Appwrite\Utopia\Response\Model;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Model;
class VideoRendition extends Model
class Rendition extends Model
{
public function __construct()
{
@@ -139,6 +139,6 @@ class VideoRendition extends Model
*/
public function getType(): string
{
return Response::MODEL_VIDEO_RENDITION;
return Response::MODEL_RENDITION;
}
}
src/Appwrite/Utopia/Response/Model/VideoSubtitle.php → src/Appwrite/Utopia/Response/Model/Subtitle.php
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Appwrite\Utopia\Response\Model;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Model;
class VideoSubtitle extends Model
class Subtitle extends Model
{
public function __construct()
{
@@ -84,6 +84,6 @@ class VideoSubtitle extends Model
*/
public function getType(): string
{
return Response::MODEL_VIDEO_SUBTITLE;
return Response::MODEL_SUBTITLE;
}
}
tests/e2e/Scopes/ProjectCustom.php
+1 -1
View File
@@ -149,4 +149,4 @@ trait ProjectCustom
return $key['body']['secret'];
}
}
}
tests/e2e/Services/Videos/VideoCustomServerTest.php
-1
View File
@@ -828,6 +828,5 @@ class VideoCustomServerTest extends Scope
$this->assertTrue($isVideo);
$this->assertTrue($isAudio);
}
}