Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for video captions #915

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make VideoController an OCS controller so it's a real API
Signed-off-by: Frederic Ruget <fred@atlant.is>
douzebis authored and CarlSchwan committed Sep 1, 2022
commit e1ddead41459a4aa2737aab6e2fe30605ce04d1a
6 changes: 3 additions & 3 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@
*/

return [
'routes' => [
'ocs' => [
[
'name' => 'video#getTracks',
'url' => '/video/tracks',
'verb' => 'GET'
'url' => '/video/v1.0/tracks',
'verb' => 'GET',
]
]
];
4 changes: 2 additions & 2 deletions lib/Controller/VideoController.php
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
use OCP\IRequest;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\Controller;
use OCP\AppFramework\OCSController;
use OCP\L10N\IFactory;

use OCP\Files\File;
@@ -37,7 +37,7 @@

use OCA\Viewer\AppInfo\Application;

class VideoController extends Controller {
class VideoController extends OCSController {

/** @var IRootFolder */
private $rootFolder;
6 changes: 3 additions & 3 deletions src/components/Videos.vue
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ import logger from '../services/logger.js'
import { extractFilePaths } from '../utils/fileUtils'
import getFileList from '../services/FileList'
import { dirname } from '@nextcloud/paths'
import { generateUrl } from '@nextcloud/router'
import { generateOcsUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'

const liveExt = ['jpg', 'jpeg', 'png']
@@ -154,11 +154,11 @@ export default {
async fetchTracks() {
try {
const response = await axios.get(
generateUrl('/apps/viewer/video/tracks'),
generateOcsUrl('/apps/viewer/video/v1.0/tracks'),
{ params: { videoPath: this.filename } }
)
const davDir = dirname(this.davPath)
this.tracks = Object.values(response.data).map(track => ({
this.tracks = Object.values(response.data.ocs.data).map(track => ({
davPath: davDir + '/' + track.basename,
language: track.language,
locale: track.locale,