interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wait transcoding by default when importing a video

This commit is contained in:
Chocobozzz 2022-09-16 13:31:59 +02:00
parent 6235c0b8dc
commit 3c4754a3a1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/lib/video-import.ts
View File

@ -115,7 +115,7 @@ async function buildVideoFromImport ({ channelId, importData, importDataOverride
language: importDataOverride?.language || importData.language, language: importDataOverride?.language || importData.language,
commentsEnabled: importDataOverride?.commentsEnabled ?? CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED, commentsEnabled: importDataOverride?.commentsEnabled ?? CONFIG.DEFAULTS.PUBLISH.COMMENTS_ENABLED,
downloadEnabled: importDataOverride?.downloadEnabled ?? CONFIG.DEFAULTS.PUBLISH.DOWNLOAD_ENABLED, downloadEnabled: importDataOverride?.downloadEnabled ?? CONFIG.DEFAULTS.PUBLISH.DOWNLOAD_ENABLED,
waitTranscoding: importDataOverride?.waitTranscoding || false, waitTranscoding: importDataOverride?.waitTranscoding ?? true,
state: VideoState.TO_IMPORT, state: VideoState.TO_IMPORT,
nsfw: importDataOverride?.nsfw || importData.nsfw || false, nsfw: importDataOverride?.nsfw || importData.nsfw || false,
description: importDataOverride?.description || importData.description, description: importDataOverride?.description || importData.description,

4
server/tests/api/videos/video-channel-syncs.ts
View File

@ -1,3 +1,5 @@
/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
import { expect } from 'chai' import { expect } from 'chai'
import { FIXTURE_URLS } from '@server/tests/shared' import { FIXTURE_URLS } from '@server/tests/shared'
import { areHttpImportTestsDisabled } from '@shared/core-utils' import { areHttpImportTestsDisabled } from '@shared/core-utils'
@ -76,6 +78,7 @@ describe('Test channel synchronizations', function () {
}) })
expect(video.name).to.equal('small video - youtube') expect(video.name).to.equal('small video - youtube')
expect(video.waitTranscoding).to.be.true
const { total } = await servers[0].videos.listByChannel({ handle: 'root_channel', include: VideoInclude.NOT_PUBLISHED_STATE }) const { total } = await servers[0].videos.listByChannel({ handle: 'root_channel', include: VideoInclude.NOT_PUBLISHED_STATE })
expect(total).to.equal(1) expect(total).to.equal(1)
@ -109,6 +112,7 @@ describe('Test channel synchronizations', function () {
}) })
expect(total).to.equal(2) expect(total).to.equal(2)
expect(data[0].name).to.equal('test') expect(data[0].name).to.equal('test')
expect(data[0].waitTranscoding).to.be.true
} }
}) })

2
server/tests/api/videos/video-description.ts
View File

@ -30,7 +30,7 @@ describe('Test video description', function () {
}) })
it('Should upload video with long description', async function () { it('Should upload video with long description', async function () {
this.timeout(10000) this.timeout(30000)
const attributes = { const attributes = {
description: longDescription description: longDescription