load captions seperately

lib/Models/Videos.php

@@ -590,7 +590,6 @@ public static function parseEvent($eventType, $episode, $video)
  $presenter_download = [];
  $presentation_download = [];
  $audio_download = [];
- $caption_download = [];
  $annotation_tool = false;
  $duration = 0;
 
@@ -665,20 +664,6 @@ public static function parseEvent($eventType, $episode, $video)
  }
  }
 
- // Get caption files
- $api_event_client = ApiEventsClient::getInstance($video->config_id);
- $media_tracks = $api_event_client->getMedia($episode->identifier);
-
- foreach($media_tracks as $track) {
- if (substr($track->flavor, 0, 9) === 'captions/' &&
- $track->mimetype === 'text/vtt') 
- {
- $caption_download[$track->flavor] = [
- 'url' => $track->uri
- ];
- }
- }
-
  foreach ($episode->publications as $publication) {
  if ($publication->channel == 'engage-player') {
  $track_link = $publication->url;
@@ -704,8 +689,7 @@ public static function parseEvent($eventType, $episode, $video)
  'downloads' => [
  'presenter' => $presenter_download,
  'presentation' => $presentation_download,
- 'audio' => $audio_download,
- 'caption' => $caption_download
+ 'audio' => $audio_download
  ],
  'annotation_tool' => $annotation_tool,
  'track_link' => $track_link
@@ -822,4 +806,33 @@ public static function addToCoursePlaylist($eventType, $episode, $video)
  }
  }
  }
+
+ /**
+ * Fetch caption data for a given token
+ * 
+ * @param string $token
+ * 
+ * @return Array which contains urls for the caption files
+ */
+ public static function getCaptionByToken($token)
+ {
+ $caption_download = [];
+ $video = self::findByToken($token);
+
+ // Get caption files
+ $api_event_client = ApiEventsClient::getInstance($video->config_id);
+ $media_tracks = $api_event_client->getMedia($video->episode);
+
+ foreach($media_tracks as $track) {
+ if (substr($track->flavor, 0, 9) === 'captions/' &&
+ $track->mimetype === 'text/vtt') 
+ {
+ $caption_download[$track->flavor] = [
+ 'url' => $track->uri
+ ];
+ }
+ }
+
+ return $caption_download;
+ }
 }

lib/RouteMap.php

@@ -49,6 +49,7 @@ public function authenticatedRoutes()
  $this->app->post('/videos/{token}/report', Routes\Video\VideoReport::class);
  $this->app->post('/videos/{token}/playlists', Routes\Video\VideoAddToPlaylist::class);
 
+ $this->app->get('/videos/{token}/captions', Routes\Video\VideoCaptions::class);
  $this->app->get('/videos/{token}/shares', Routes\Video\VideoSharesList::class);
  $this->app->put('/videos/{token}/shares', Routes\Video\VideoSharesUpdate::class);
  $this->app->post('/videos/{course_id}/copy', Routes\Video\VideoCopyToCourse::class);

lib/Routes/Video/VideoCaptions.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Opencast\Routes\Video;
+
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
+use Opencast\Errors\AuthorizationFailedException;
+use Opencast\Errors\Error;
+use Opencast\OpencastTrait;
+use Opencast\OpencastController;
+use Opencast\Models\Filter;
+use Opencast\Models\Videos;
+
+class VideoCaptions extends OpencastController
+{
+ use OpencastTrait;
+
+ public function __invoke(Request $request, Response $response, $args)
+ {
+ $token = $args['token'];
+ $captions = Videos::getCaptionByToken($token);
+
+ return $this->createResponse([
+ 'caption' => $captions
+ ], $response);
+ }
+}

vueapp/components/Videos/Actions/CaptionUpload.vue

@@ -108,7 +108,8 @@ export default {
  computed: {
  ...mapGetters({
  'config' : 'simple_config_list',
- 'course_config': 'course_config'
+ 'course_config': 'course_config',
+ 'videoCaptions': 'videoCaptions'
  }),
 
  uploadButtonClasses() {
@@ -208,6 +209,7 @@ export default {
  this.$store.dispatch('simpleConfigListRead').then(() => {
  this.selectedServer = this.config['server'][this.config.settings['OPENCAST_DEFAULT_SERVER']];
  });
+ this.$store.dispatch('loadCaption', this.event.token);
 
  // Add support for StudIP languages
  for (let key in window.OpencastPlugin.STUDIP_LANGUAGES) {
@@ -216,21 +218,25 @@ export default {
  flavor: 'captions/source+' + key.split('_')[0]
  });
  }
+ },
 
- if (this.event?.publication?.downloads?.caption) {
- for (var flavor in this.event.publication.downloads.caption) {
+ watch: {
+ videoCaptions(newCaptions) {
+ if (Object.keys(newCaptions).length > 0) {
+ for (var flavor in newCaptions) {
  let language = this.languages.find(language => language.flavor === flavor);
 
  if (language) {
  this.files[flavor] = [];
  this.files[flavor].push({
- 'url': this.event.publication.downloads.caption[flavor].url,
- 'name': this.event.publication.downloads.caption[flavor].url.split('/').pop()
+ 'url': newCaptions[flavor].url,
+ 'name': newCaptions[flavor].url.split('/').pop()
  });
  this.files[flavor]['language'] = language.lang;
  }
  }
  }
+ }
  }
 }
 </script>

vueapp/store/videos.module.js

@@ -17,6 +17,7 @@ const state = {
  items: 0
  },
  availableVideoTags: [],
+ videoCaptions: {},
  playlistForVideos: null,
  videoShares: {},
  courseVideosToCopy: [],
@@ -52,6 +53,10 @@ const getters = {
  return state.availableVideoTags
  },
 
+ videoCaptions(state) {
+ return state.videoCaptions
+ },
+
  playlistForVideos(state) {
  return state.playlistForVideos
  },
@@ -191,6 +196,14 @@ const actions = {
  return ApiService.put('videos/' + data.token + '/shares', data.shares);
  },
 
+ async loadCaption({commit}, token) {
+ return ApiService.get('videos/' + token + '/captions')
+ .then(({ data }) => {
+ data.token = token
+ commit('setCaptionForToken', data)
+ });
+ },
+
  setPage({commit}, page) {
  commit('setPage', page);
  },
@@ -264,6 +277,16 @@ const mutations = {
 
  setAvailableVideoTags(state, data) {
  state.availableVideoTags = data;
+ },
+
+ setCaptionForToken(state, data) {
+ let key = Object.keys(state.videos).find(key => state.videos[key].token === data.token)
+ if (key) {
+ state.videoCaptions = data.caption;
+ }
+ else {
+ state.videoCaptions = {};
+ }
  }
 }