From 50ad0a1c1699fb1799c9ba2a99bf888894f88df4 Mon Sep 17 00:00:00 2001 From: kimsible Date: Sat, 11 Apr 2020 04:24:42 +0200 Subject: Add getSubs to YoutubeDL video import --- .../video-import-url.component.ts | 64 +++++++++++++--------- server/controllers/api/videos/import.ts | 29 +++++++++- server/helpers/youtube-dl.ts | 36 ++++++++++++ 3 files changed, 103 insertions(+), 26 deletions(-) diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index a5578bebd..a17d73683 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts @@ -12,6 +12,7 @@ import { FormValidatorService } from '@app/shared' import { VideoCaptionService } from '@app/shared/video-caption' import { VideoImportService } from '@app/shared/video-import' import { scrollToTop } from '@app/shared/misc/utils' +import { switchMap, map } from 'rxjs/operators' @Component({ selector: 'my-video-import-url', @@ -76,31 +77,44 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom this.loadingBar.start() - this.videoImportService.importVideoUrl(this.targetUrl, videoUpdate).subscribe( - res => { - this.loadingBar.complete() - this.firstStepDone.emit(res.video.name) - this.isImportingVideo = false - this.hasImportedVideo = true - - this.video = new VideoEdit(Object.assign(res.video, { - commentsEnabled: videoUpdate.commentsEnabled, - downloadEnabled: videoUpdate.downloadEnabled, - support: null, - thumbnailUrl: null, - previewUrl: null - })) - - this.hydrateFormFromVideo() - }, - - err => { - this.loadingBar.complete() - this.isImportingVideo = false - this.firstStepError.emit() - this.notifier.error(err.message) - } - ) + this.videoImportService + .importVideoUrl(this.targetUrl, videoUpdate) + .pipe( + switchMap(res => { + return this.videoCaptionService + .listCaptions(res.video.id) + .pipe( + map(result => ({ video: res.video, videoCaptions: result.data })) + ) + }) + ) + .subscribe( + ({ video, videoCaptions }) => { + this.loadingBar.complete() + this.firstStepDone.emit(video.name) + this.isImportingVideo = false + this.hasImportedVideo = true + + this.video = new VideoEdit(Object.assign(video, { + commentsEnabled: videoUpdate.commentsEnabled, + downloadEnabled: videoUpdate.downloadEnabled, + support: null, + thumbnailUrl: null, + previewUrl: null + })) + + this.videoCaptions = videoCaptions + + this.hydrateFormFromVideo() + }, + + err => { + this.loadingBar.complete() + this.isImportingVideo = false + this.firstStepError.emit() + this.notifier.error(err.message) + } + ) } updateSecondStep () { diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index da0832258..e9b9d68d7 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -3,11 +3,13 @@ import * as magnetUtil from 'magnet-uri' import { auditLoggerFactory, getAuditIdFromRes, VideoImportAuditView } from '../../../helpers/audit-logger' import { asyncMiddleware, asyncRetryTransactionMiddleware, authenticate, videoImportAddValidator } from '../../../middlewares' import { MIMETYPES } from '../../../initializers/constants' -import { getYoutubeDLInfo, YoutubeDLInfo } from '../../../helpers/youtube-dl' +import { getYoutubeDLInfo, YoutubeDLInfo, getYoutubeDLSubs } from '../../../helpers/youtube-dl' import { createReqFiles } from '../../../helpers/express-utils' import { logger } from '../../../helpers/logger' import { VideoImportCreate, VideoImportState, VideoPrivacy, VideoState } from '../../../../shared' import { VideoModel } from '../../../models/video/video' +import { VideoCaptionModel } from '../../../models/video/video-caption' +import { moveAndProcessCaptionFile } from '../../../helpers/captions-utils' import { getVideoActivityPubUrl } from '../../../lib/activitypub' import { TagModel } from '../../../models/video/tag' import { VideoImportModel } from '../../../models/video/video-import' @@ -28,6 +30,7 @@ import { MThumbnail, MUser, MVideoAccountDefault, + MVideoCaptionVideo, MVideoTag, MVideoThumbnailAccountDefault, MVideoWithBlacklistLight @@ -136,6 +139,7 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) const targetUrl = body.targetUrl const user = res.locals.oauth.token.User + // Get video infos let youtubeDLInfo: YoutubeDLInfo try { youtubeDLInfo = await getYoutubeDLInfo(targetUrl) @@ -168,6 +172,29 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) user }) + + // Get video subtitles + try { + const subtitles = await getYoutubeDLSubs(targetUrl) + + for (const subtitle of subtitles) { + const videoCaption = new VideoCaptionModel({ + videoId: video.id, + language: subtitle.language + }) as MVideoCaptionVideo + videoCaption.Video = video + + // Move physical file + await moveAndProcessCaptionFile(subtitle, videoCaption) + + await sequelizeTypescript.transaction(async t => { + await VideoCaptionModel.insertOrReplaceLanguage(video.id, subtitle.language, null, t) + }) + } + } catch (err) { + logger.warn('Cannot get video subtitles.', { err }) + } + // Create job to import the video const payload = { type: 'youtube-dl' as 'youtube-dl', diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 07c85797a..277422645 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts @@ -20,6 +20,12 @@ export type YoutubeDLInfo = { originallyPublishedAt?: Date } +export type YoutubeDLSubs = { + language: string, + filename: string, + path: string +}[] + const processOptions = { maxBuffer: 1024 * 1024 * 10 // 10MB } @@ -45,6 +51,35 @@ function getYoutubeDLInfo (url: string, opts?: string[]): Promise }) } +function getYoutubeDLSubs (url: string, opts?: object): Promise { + return new Promise((res, rej) => { + const cwd = CONFIG.STORAGE.TMP_DIR + const options = opts || { all: true, format: 'vtt', cwd } + + safeGetYoutubeDL() + .then(youtubeDL => { + youtubeDL.getSubs(url, options, (err, files) => { + if (err) return rej(err) + + const subtitles = files.reduce((acc, filename) => { + const matched = filename.match(/\.([a-z]{2})\.(vtt|ttml)/i) + + if (matched[1]) { + return [...acc, { + language: matched[1], + path: join(cwd, filename), + filename + }] + } + }, []) + + return res(subtitles) + }) + }) + .catch(err => rej(err)) + }) +} + function downloadYoutubeDLVideo (url: string, extension: string, timeout: number) { const path = generateVideoImportTmpPath(url, extension) let timer @@ -185,6 +220,7 @@ function buildOriginallyPublishedAt (obj: any) { export { updateYoutubeDLBinary, downloadYoutubeDLVideo, + getYoutubeDLSubs, getYoutubeDLInfo, safeGetYoutubeDL, buildOriginallyPublishedAt -- cgit v1.2.3 From ba6e9e8f1df29a7f355636d48c2a608bc4cb54ec Mon Sep 17 00:00:00 2001 From: kimsible Date: Tue, 14 Apr 2020 17:23:01 +0200 Subject: Add unit tests for captions via URL import --- server/tests/api/videos/video-imports.ts | 44 +++++++++++++++++++++++++++++++- shared/extra-utils/index.ts | 1 + 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index a67e528c6..1e97cc6ca 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -2,7 +2,7 @@ import * as chai from 'chai' import 'mocha' -import { VideoDetails, VideoImport, VideoPrivacy } from '../../../../shared/models/videos' +import { VideoDetails, VideoImport, VideoPrivacy, VideoCaption } from '../../../../shared/models/videos' import { cleanupTests, doubleFollow, @@ -11,6 +11,8 @@ import { getMyVideos, getVideo, getVideosList, + listVideoCaptions, + testCaptionFile, immutableAssign, ServerInfo, setAccessTokensToServers @@ -110,6 +112,46 @@ describe('Test video imports', function () { const attributes = immutableAssign(baseAttributes, { targetUrl: getYoutubeVideoUrl() }) const res = await importVideo(servers[0].url, servers[0].accessToken, attributes) expect(res.body.video.name).to.equal('small video - youtube') + + const resCaptions = await listVideoCaptions(servers[0].url, res.body.video.id) + const videoCaptions: VideoCaption[] = resCaptions.body + expect(videoCaptions).to.have.lengthOf(2) + + const enCaption = videoCaptions.filter(caption => caption.language.label === 'en')[0] + expect(enCaption).to.not(undefined) + expect(enCaption.language.label).to.equal('en') + expect(enCaption.captionPath).to.equal(`/static/video-captions/${res.body.video.uuid}-en.vtt`) + await testCaptionFile(servers[0].url, enCaption.captionPath, `WEBVTT + + 1 + 00:00:01.600 --> 00:00:04.200 + English (US) + + 2 + 00:00:05.900 --> 00:00:07.999 + This is a subtitle in American English + + 3 + 00:00:10.000 --> 00:00:14.000 + Adding subtitles is very easy to do`) + + const frCaption = videoCaptions.filter(caption => caption.language.label === 'fr')[0] + expect(frCaption).to.not(undefined) + expect(frCaption.language.label).to.equal('fr') + expect(frCaption.captionPath).to.equal(`/static/video-captions/${res.body.video.uuid}-en.vtt`) + await testCaptionFile(servers[0].url, frCaption.captionPath, `WEBVTT + + 1 + 00:00:01,600 --> 00:00:04.200 + Français (FR) + + 2 + 00:00:05,900 --> 00:00:07.999 + C'est un sous-titre français + + 3 + 00:00:10,000 --> 00:00:14.000 + Ajouter un sous-titre est vraiment facile`) } { diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts index 78acf72aa..fd8fef5dc 100644 --- a/shared/extra-utils/index.ts +++ b/shared/extra-utils/index.ts @@ -18,6 +18,7 @@ export * from './users/users' export * from './users/accounts' export * from './videos/video-abuses' export * from './videos/video-blacklist' +export * from './videos/video-captions' export * from './videos/video-channels' export * from './videos/video-comments' export * from './videos/video-streaming-playlists' -- cgit v1.2.3 From 652c64165b3d8d1c5d5fc646c29e5cd1c82a3330 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Apr 2020 14:15:44 +0200 Subject: Fix import captions test --- server/controllers/api/videos/import.ts | 3 +- server/helpers/youtube-dl.ts | 19 +++++++---- server/lib/activitypub/actor.ts | 2 +- server/models/video/video-import.ts | 1 + server/tests/api/videos/video-imports.ts | 58 +++++++++++++++++--------------- 5 files changed, 47 insertions(+), 36 deletions(-) diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index e9b9d68d7..fb9d73140 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -172,11 +172,12 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) user }) - // Get video subtitles try { const subtitles = await getYoutubeDLSubs(targetUrl) + logger.info('Will create %s subtitles from youtube import %s.', subtitles.length, targetUrl) + for (const subtitle of subtitles) { const videoCaption = new VideoCaptionModel({ videoId: video.id, diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts index 277422645..6d2e6f6d1 100644 --- a/server/helpers/youtube-dl.ts +++ b/server/helpers/youtube-dl.ts @@ -21,8 +21,8 @@ export type YoutubeDLInfo = { } export type YoutubeDLSubs = { - language: string, - filename: string, + language: string + filename: string path: string }[] @@ -61,15 +61,20 @@ function getYoutubeDLSubs (url: string, opts?: object): Promise { youtubeDL.getSubs(url, options, (err, files) => { if (err) return rej(err) + logger.debug('Get subtitles from youtube dl.', { url, files }) + const subtitles = files.reduce((acc, filename) => { const matched = filename.match(/\.([a-z]{2})\.(vtt|ttml)/i) if (matched[1]) { - return [...acc, { - language: matched[1], - path: join(cwd, filename), - filename - }] + return [ + ...acc, + { + language: matched[1], + path: join(cwd, filename), + filename + } + ] } }, []) diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index c3598b75b..8132ac135 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -117,7 +117,7 @@ async function getOrCreateActorAndServerAndModel ( if (actor.VideoChannel) (actor as MActorAccountChannelIdActor).VideoChannel.Actor = actor const { actor: actorRefreshed, refreshed } = await retryTransactionWrapper(refreshActorIfNeeded, actor, fetchType) - if (!actorRefreshed) throw new Error('Actor ' + actorRefreshed.url + ' does not exist anymore.') + if (!actorRefreshed) throw new Error('Actor ' + actor.url + ' does not exist anymore.') if ((created === true || refreshed === true) && updateCollections === true) { const payload = { uri: actor.outboxUrl, type: 'activity' as 'activity' } diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts index af5314ce9..fbe0ee0a7 100644 --- a/server/models/video/video-import.ts +++ b/server/models/video/video-import.ts @@ -129,6 +129,7 @@ export class VideoImportModel extends Model { distinct: true, include: [ { + attributes: [ 'id' ], model: UserModel.unscoped(), // FIXME: Without this, sequelize try to COUNT(DISTINCT(*)) which is an invalid SQL query required: true } diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index 1e97cc6ca..8e179b825 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -62,11 +62,14 @@ describe('Test video imports', function () { expect(videoTorrent.name).to.contain('你好 世界 720p.mp4') expect(videoMagnet.name).to.contain('super peertube2 video') + + const resCaptions = await listVideoCaptions(url, idHttp) + expect(resCaptions.body.total).to.equal(2) } async function checkVideoServer2 (url: string, id: number | string) { const res = await getVideo(url, id) - const video = res.body + const video: VideoDetails = res.body expect(video.name).to.equal('my super name') expect(video.category.label).to.equal('Entertainment') @@ -77,6 +80,9 @@ describe('Test video imports', function () { expect(video.tags).to.deep.equal([ 'supertag1', 'supertag2' ]) expect(video.files).to.have.lengthOf(1) + + const resCaptions = await listVideoCaptions(url, id) + expect(resCaptions.body.total).to.equal(2) } before(async function () { @@ -114,44 +120,42 @@ describe('Test video imports', function () { expect(res.body.video.name).to.equal('small video - youtube') const resCaptions = await listVideoCaptions(servers[0].url, res.body.video.id) - const videoCaptions: VideoCaption[] = resCaptions.body + const videoCaptions: VideoCaption[] = resCaptions.body.data expect(videoCaptions).to.have.lengthOf(2) - const enCaption = videoCaptions.filter(caption => caption.language.label === 'en')[0] - expect(enCaption).to.not(undefined) - expect(enCaption.language.label).to.equal('en') + const enCaption = videoCaptions.find(caption => caption.language.id === 'en') + expect(enCaption).to.exist + expect(enCaption.language.label).to.equal('English') expect(enCaption.captionPath).to.equal(`/static/video-captions/${res.body.video.uuid}-en.vtt`) await testCaptionFile(servers[0].url, enCaption.captionPath, `WEBVTT +Kind: captions +Language: en - 1 - 00:00:01.600 --> 00:00:04.200 - English (US) +00:00:01.600 --> 00:00:04.200 +English (US) - 2 - 00:00:05.900 --> 00:00:07.999 - This is a subtitle in American English +00:00:05.900 --> 00:00:07.999 +This is a subtitle in American English - 3 - 00:00:10.000 --> 00:00:14.000 - Adding subtitles is very easy to do`) +00:00:10.000 --> 00:00:14.000 +Adding subtitles is very easy to do`) - const frCaption = videoCaptions.filter(caption => caption.language.label === 'fr')[0] - expect(frCaption).to.not(undefined) - expect(frCaption.language.label).to.equal('fr') - expect(frCaption.captionPath).to.equal(`/static/video-captions/${res.body.video.uuid}-en.vtt`) + const frCaption = videoCaptions.find(caption => caption.language.id === 'fr') + expect(frCaption).to.exist + expect(frCaption.language.label).to.equal('French') + expect(frCaption.captionPath).to.equal(`/static/video-captions/${res.body.video.uuid}-fr.vtt`) await testCaptionFile(servers[0].url, frCaption.captionPath, `WEBVTT +Kind: captions +Language: fr - 1 - 00:00:01,600 --> 00:00:04.200 - Français (FR) +00:00:01.600 --> 00:00:04.200 +Français (FR) - 2 - 00:00:05,900 --> 00:00:07.999 - C'est un sous-titre français +00:00:05.900 --> 00:00:07.999 +C'est un sous-titre français - 3 - 00:00:10,000 --> 00:00:14.000 - Ajouter un sous-titre est vraiment facile`) +00:00:10.000 --> 00:00:14.000 +Ajouter un sous-titre est vraiment facile`) } { -- cgit v1.2.3