small fix

shimonewman · Jun 16, 2022 · Jun 19, 2022 · Jun 19, 2022 · Jun 20, 2022 · Jun 16, 2022
commit 6c7c5c189183991997b8129898e8763ea2dfbb8b
diff --git a/.env b/.env
@@ -58,7 +58,7 @@ _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
 _APP_PHONE_PROVIDER=phone://mock
 _APP_PHONE_FROM=+123456789
-_APP_STORAGE_LIMIT=30000000
+_APP_STORAGE_LIMIT=300000000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900

diff --git a/app/config/collections.php b/app/config/collections.php
@@ -3239,10 +3239,10 @@
             ],
             [
                 '$id' => 'videoBitrate',
-                'type' => Database::VAR_STRING,
+                'type' => Database::VAR_INTEGER,
                 'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
+                'size' => 0,
+                'signed' => false,
                 'required' => false,
                 'default' => null,
                 'array' => false,
@@ -3272,21 +3272,21 @@
             ],
             [
                 '$id' => 'audioBitrate',
-                'type' => Database::VAR_STRING,
+                'type' => Database::VAR_INTEGER,
                 'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
+                'size' => 0,
+                'signed' => false,
                 'required' => false,
                 'default' => null,
                 'array' => false,
                 'filters' => [],
             ],
             [
                 '$id' => 'audioSamplerate',
-                'type' => Database::VAR_STRING,
+                'type' => Database::VAR_INTEGER,
                 'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
+                'size' => 0,
+                'signed' => false,
                 'required' => false,
                 'default' => null,
                 'array' => false,
@@ -3296,7 +3296,7 @@
                 '$id' => 'metadata',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 2048,
+                'size' => 4096,
                 'signed' => true,
                 'required' => false,
                 'default' => null,

diff --git a/app/config/video-profiles.php b/app/config/video-profiles.php
@@ -8,20 +8,23 @@
         'audioBitrate' => 64, //audio bitrate in Kbps
         'width' =>  640, //width resolution in px
         'height' => 360, //height resolution in px
+        'stream' => 'mpeg-dash'
     ],
     [
         'name' => '576p',
         'videoBitrate' => 2538,
         'audioBitrate' => 128,
         'width' => 1024,
         'height' => 576,
+        'stream' => 'mpeg-dash'
     ],
     [
         'name' => '720p',
         'videoBitrate' => 3551,
         'audioBitrate' => 128,
         'width' => 1280,
         'height' => 720,
+        'stream' => 'mpeg-dash'
     ],
 
 ];
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
@@ -155,7 +155,7 @@
             $dbForProject->createCollection($key, $attributes, $indexes);
         }
 
-        if($dbForProject->exists($dbForProject->getDefaultDatabase(), 'video_profiles')) {
+        if ($dbForProject->exists($dbForProject->getDefaultDatabase(), 'video_profiles')) {
             foreach (Config::getParam('video-profiles', []) as $profile) {
                 Authorization::skip(function () use ($project, $profile, $dbForProject) {
                     return $dbForProject->createDocument('video_profiles', new Document([
@@ -164,7 +164,7 @@
                         'audioBitrate' => $profile['audioBitrate'],
                         'width'  => $profile['width'],
                         'height' => $profile['height'],
-                        'stream' => 'hls'
+                        'stream' => $profile['stream']
                     ]));
                 });
             }

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
@@ -122,7 +122,6 @@
             $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
             $dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
-
         } catch (Duplicate $th) {
             throw new Exception('Bucket already exists', 409, Exception::STORAGE_BUCKET_ALREADY_EXISTS);
         }
@@ -474,9 +473,6 @@
             });
         } else {
             $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
-            var_dump('&&&&&&&');
-            var_dump($fileId);
-            var_dump($file);
         }
 
         $metadata = ['content_type' => $deviceLocal->getFileMimeType($fileTmpName)];
@@ -577,7 +573,6 @@
                         $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
                     }
                 } else {
-
                     $file = $file
                         ->setAttribute('$read', $read)
                         ->setAttribute('$write', $write)
@@ -614,7 +609,6 @@
                 ->setParam('bucketId', $bucketId)
             ;
         } else {
-
             try {
                 if ($file->isEmpty()) {
                     $doc = new Document([