Fix HLS generation after import script

pull/3681/head
Chocobozzz 2021-02-02 14:00:46 +01:00
parent d1a2ce5ef3
commit 69eddafb17
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 15 additions and 4 deletions

View File

@ -23,10 +23,21 @@ async function processVideoFileImport (job: Bull.Job) {
return undefined
}
const data = await getVideoFileResolution(payload.filePath)
await updateVideoFile(video, payload.filePath)
const user = await UserModel.loadByChannelActorId(video.VideoChannel.actorId)
await onNewWebTorrentFileResolution(video, user)
const newResolutionPayload = {
type: 'new-resolution-to-webtorrent' as 'new-resolution-to-webtorrent',
videoUUID: video.uuid,
resolution: data.videoFileResolution,
isPortraitMode: data.isPortraitMode,
copyCodecs: false,
isNewVideo: false
}
await onNewWebTorrentFileResolution(video, user, newResolutionPayload)
return video
}

View File

@ -189,7 +189,7 @@ async function onVideoFileOptimizer (
async function onNewWebTorrentFileResolution (
video: MVideoUUID,
user: MUserId,
payload?: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
payload: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload
) {
await publishAndFederateIfNeeded(video)

View File

@ -334,9 +334,9 @@ async function generateHlsPlaylistCommon (options: {
// Move playlist file
const playlistPath = join(baseHlsDirectory, playlistFilename)
await move(playlistFileTranscodePath, playlistPath)
await move(playlistFileTranscodePath, playlistPath, { overwrite: true })
// Move video file
await move(join(videoTranscodedBasePath, videoFilename), videoFilePath)
await move(join(videoTranscodedBasePath, videoFilename), videoFilePath, { overwrite: true })
// Cleanup directory
await remove(videoTranscodedBasePath)