MED-100: Add Vimeo source

.github/workflows/moodle-ci.yml

@@ -28,9 +28,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '8.1'
+          - php: '8.3'
             moodle-branch: 'master'
             database: 'pgsql'
+          - php: '8.2'
+            moodle-branch: 'master'
+            database: 'mariadb'
+          - php: '8.1'
+            moodle-branch: 'MOODLE_404_STABLE'
+            database: 'mariadb'
           - php: '8.1'
             moodle-branch: 'MOODLE_403_STABLE'
             database: 'pgsql'
@@ -39,7 +45,7 @@ jobs:
             database: 'mariadb'
           - php: '8.0'
             moodle-branch: 'MOODLE_401_STABLE'
-            database: 'mariadb'
+            database: 'pgsql'
 
     steps:
       - name: Check out repository code

classes/media_manager.php

@@ -45,11 +45,14 @@
  */
 class media_manager implements renderable, templatable {
     /** @var array $media List of media resources to display */
-    protected $media;
+    protected $media = null;
 
     /** @var int $page Paging offset */
     protected int $page = 0;
 
+    /** @var $source Source manager */
+    protected $source = null;
+
     /** @var $page Search form */
     protected $search = null;
 
@@ -71,7 +74,6 @@ public function __construct(string $source, ?stdClass $record = null, int $page
         require_capability('tool/mediatime:view', context_system::instance());
         if ($record) {
             $source = $record->source;
-            $record->content = json_decode($record->content);
         }
 
         $plugins = plugininfo\mediatimesrc::get_enabled_plugins();
@@ -98,7 +100,7 @@ public function __construct(string $source, ?stdClass $record = null, int $page
             $rs = self::search((array)$this->search->get_data());
             foreach ($rs as $media) {
                 if (in_array($media->source, $plugins)) {
-                    $media->content = json_decode($media->content);
+                    $media->content = $media->content ?? '{}';
                     $this->media[] = $media;
                 }
             }
@@ -136,7 +138,8 @@ public function export_for_template(renderer_base $output): array {
                 'imageurl' => $resource->image_url($output),
                 'tags' => $resource->tags($output),
                 'url' => $url->out(),
-                'content' => $record->content,
+                'name' => $record->name,
+                'title' => $resource->get_title(),
                 'removeurl' => $removeurl->out(),
             ];
         }

classes/output/media_resource.php

@@ -121,4 +121,16 @@ public function image_url($output) {
     public function video_file_content($output) {
         return $this->resource->video_file_content($output);
     }
+
+    /**
+     * Return resource title
+     *
+     * @return string
+     */
+    public function get_title() {
+        if (method_exists($this->resource, 'get_title')) {
+            return $this->resource->get_title();
+        }
+        return json_decode($this->record->content)->title ?? '';
+    }
 }

lang/en/tool_mediatime.php

@@ -49,3 +49,5 @@
 $string['tagarea_tool_mediatime'] = 'Media resources';
 $string['title'] = 'Title';
 $string['title_help'] = 'The title may be displayed by the video player when used';
+$string['subplugintype_mediatimesrc_plural'] = 'Media Time sources'; 
+$string['filelinks'] = 'File links'; 

source/streamio/classes/form/delete_resource.php

@@ -36,7 +36,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_resource extends \tool_mediatime\form\delete_resource {
-
     /**
      * Definition
      */

source/streamio/classes/form/edit_resource.php

@@ -40,7 +40,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_resource extends \tool_mediatime\form\edit_resource {
-
     /**
      * Definition
      */
@@ -93,7 +92,7 @@ public function definition_after_data() {
         $record = $DB->get_record('tool_mediatime', ['id' => $id]);
         $context = context_system::instance();
         if ($record) {
-            $record->content = json_decode($record->content);
+            $content = json_decode($record->content);
             $resource = new media_resource($record);
 
             $videourl = $resource->video_url($OUTPUT);

source/streamio/classes/manager.php

@@ -234,13 +234,13 @@ protected function save_file($id, $video) {
             'tool_mediatime',
             'm3u8',
             $id,
-            'id DESC', false
+            'id DESC',
+            false
         );
         foreach ($files as $file) {
             $file->delete();
         }
         if ($video->transcodings) {
-
             $fileinfo = [
                 'contextid' => SYSCONTEXTID,
                 'component' => 'tool_mediatime',

source/streamio/classes/output/media_resource.php

@@ -61,7 +61,6 @@ public function __construct(stdClass $record) {
      */
     public function export_for_template(renderer_base $output) {
         global $DB, $USER;
-        $content = (array)$this->record->content;
         $context = \context_system::instance();
         $videourl = $this->video_url($output);
 
@@ -96,7 +95,7 @@ public function export_for_template(renderer_base $output) {
      * @return string url
      */
     public function image_url(renderer_base $output) {
-        return 'https://' . $this->record->content->screenshot->normal;
+        return 'https://' . json_decode($this->record->content)->screenshot->normal;
     }
 
     /**
@@ -108,7 +107,7 @@ public function image_url(renderer_base $output) {
     public function video_url($output) {
         $this->videourl = '';
 
-        $id = $this->record->content->id;
+        $id = json_decod($this->record->content)->id;
 
         return "https://streamio.com/api/v1/videos/$id/public_show.m3u8";
     }

source/streamio/classes/privacy/provider.php

@@ -31,14 +31,13 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class provider implements \core_privacy\local\metadata\null_provider {
-
     /**
      * Get the language string identifier with the component's language
      * file to explain why this plugin stores no data.
      *
      * @return  string
      */
-    public static function get_reason() : string {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }

source/streamio/lang/en/mediatimesrc_streamio.php

@@ -25,22 +25,22 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['pluginname'] = 'Streamio';
 $string['event_resource_created'] = 'Streamio resource created';
 $string['event_resource_deleted'] = 'Streamio resource deleted';
 $string['event_resource_updated'] = 'Streamio resource updated';
 $string['keepstreamiofiles'] = 'Keep Streamio files';
 $string['password'] = 'Password';
 $string['password_help'] = 'Streamio password for administrative access';
+$string['pluginname'] = 'Streamio';
+$string['privacy:metadata'] = 'The Streamio plugin for Media Time does not store personal data. It does transmit files associated with educational video content that normally does not contain user data. If it is used for personal data, a separate agreement with the provider may be required.';
 $string['removestreamiofiles'] = 'Remove Streamio files';
 $string['selectexistingfile'] = 'Select existing file';
-$string['streamiofileaction'] = 'Streamio file action';
-$string['streamiofileaction_help'] = 'Select whether the file should be deleted on Streamio when the local content is deleted. If the file is used in other local resources, it will no longer be available to users.';
 $string['streamio:upload'] = 'Upload files to Streamio';
 $string['streamio:viewall'] = 'View all files available';
+$string['streamiofileaction'] = 'Streamio file action';
+$string['streamiofileaction_help'] = 'Select whether the file should be deleted on Streamio when the local content is deleted. If the file is used in other local resources, it will no longer be available to users.';
 $string['uploadnewfile'] = 'Upload new file';
 $string['username'] = 'Username';
 $string['username_help'] = 'Streamio user name for administrative access found in Streamio settings';
 $string['videofile'] = 'Video file';
 $string['videofile_help'] = 'Choose to upload a new video, or choose to use an existing one that you select';
-$string['privacy:metadata'] = 'The Streamio plugin for Media Time does not store personal data. It does transmit files associated with educational video content that normally does not contain user data. If it is used for personal data, a separate agreement with the provider may be required.';

source/streamio/templates/file_upload.mustache

@@ -42,7 +42,7 @@
             <div class="progress bg-primary" style="width: 0%; height: 1em;"></div>
         </div>
         <div class="p-3">
-            <button name="upload" type="button" class="btn btn-primary">{{# str }} upload {{/ str }}</button>
+            <button name="upload" type="button" class="btn btn-primary" accept="video/*">{{# str }} upload {{/ str }}</button>
             <button name="cancel" value="true" class="btn btn-secondary">{{# str }} cancel {{/ str }}</button>
         </div>
     </div>

source/videotime/classes/form/delete_resource.php

@@ -36,7 +36,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_resource extends \tool_mediatime\form\delete_resource {
-
     /**
      * Definition
      */

source/videotime/classes/form/edit_resource.php

@@ -38,7 +38,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_resource extends \tool_mediatime\form\edit_resource {
-
     /**
      * Definition
      */

source/videotime/classes/manager.php

@@ -68,7 +68,7 @@ public function __construct($record = null) {
         }
 
         if ($record) {
-            $this->content = $record->content;
+            $this->content = json_decode($record->content);
         }
 
         $maxbytes = get_config('mediatimesrc_videotime', 'maxbytes');

source/videotime/classes/output/media_resource.php

@@ -41,9 +41,18 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class media_resource implements renderable, templatable {
+    /** @var $context System context */
+    protected $context = null;
+
+    /** @var $context Poster image url */
+    protected $poster = null;
+
     /** @var ?stdClass $record Media Time resource record */
     protected $record;
 
+    /** @var $context Video url */
+    protected $videourl = null;
+
     /**
      * Constructor
      *
@@ -83,7 +92,7 @@ public function export_for_template(renderer_base $output) {
             'canedit' => has_capability('moodle/tag:edit', $this->context) || $USER->id == $this->record->usermodified,
             'id' => $this->record->id,
             'libraryhome' => new moodle_url('/admin/tool/mediatime/index.php'),
-            'resource' => $this->record->content,
+            'resource' => json_decode($this->record->content),
             'video' => $output->render_from_template('mediatimesrc_videotime/video', $content),
         ];
     }

source/videotime/classes/privacy/provider.php

@@ -31,14 +31,13 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class provider implements \core_privacy\local\metadata\null_provider {
-
     /**
      * Get the language string identifier with the component's language
      * file to explain why this plugin stores no data.
      *
      * @return  string
      */
-    public static function get_reason() : string {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }

source/videotime/lang/en/mediatimesrc_videotime.php

@@ -25,14 +25,14 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['pluginname'] = 'Video Time resource';
+$string['configmaxbytes'] = 'Default maximum file size for all files uploaded';
 $string['event_resource_created'] = 'Video Time resource created';
 $string['event_resource_deleted'] = 'Video Time resource deleted';
 $string['event_resource_updated'] = 'Video Time resource updated';
 $string['maxbytes'] = 'Maximum size of file uploads';
+$string['pluginname'] = 'Video Time resource';
 $string['posterimage'] = 'Poster image';
 $string['posterimage_help'] = 'Select an image to displayed before the video is played or as a thumbnail image.';
+$string['privacy:metadata'] = 'The Video Time resource does not store or transmit any personal data.';
 $string['videofile'] = 'Video file';
 $string['videofile_help'] = 'Video file to be displayed';
-$string['configmaxbytes'] = 'Default maximum file size for all files uploaded';
-$string['privacy:metadata'] = 'The Video Time resource does not store or transmit any personal data.';

source/videotime/lib.php

@@ -38,25 +38,29 @@
  * @param array $options additional options affecting the file serving
  * @return bool false if the file was not found, just send the file otherwise and do not return anything
  */
-function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options=[]) {
+function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = []) {
     if ($context->contextlevel != CONTEXT_SYSTEM) {
         return false;
     }
 
-    require_login();
-
-    if (in_array($filearea, [
-        'posterimage',
+    if (
+        in_array($filearea, [
         'videofile',
-    ])) {
+        ])
+    ) {
         $itemid = array_shift($args);
+        $contenthash = array_shift($args);
 
         $relativepath = implode('/', $args);
 
         $fullpath = "/$context->id/mediatimesrc_videotime/$filearea/$itemid/$relativepath";
 
         $fs = get_file_storage();
-        if ((!$file = $fs->get_file_by_hash(sha1($fullpath))) || $file->is_directory()) {
+        if (
+            (!$file = $fs->get_file_by_hash(sha1($fullpath)))
+            || $file->is_directory()
+            || $file->get_contenthash() != $contenthash
+        ) {
             return false;
         }
 
@@ -72,6 +76,6 @@ function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $a
 function mediatimesrc_videotime_config_file_areas() {
     return [
         'posterimage',
-        'videotile',
+        'videofile',
     ];
 }