X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Fvideo-file-import.ts;h=1c600e2a732f195ce0884a02d4f44f6de3137ae1;hb=9452d4fd3321148fb80b64a67bd9983fee6c208e;hp=5c5b7dccb77c5bac463080d492427d1b4ee5e2b3;hpb=8c559fad1e1c4c2ab7f1388c73200aa4c6256d74;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/job-queue/handlers/video-file-import.ts b/server/lib/job-queue/handlers/video-file-import.ts
index 5c5b7dccb..1c600e2a7 100644
--- a/server/lib/job-queue/handlers/video-file-import.ts
+++ b/server/lib/job-queue/handlers/video-file-import.ts
@@ -1,23 +1,24 @@
-import * as Bull from 'bull'
-import { logger } from '../../../helpers/logger'
-import { VideoModel } from '../../../models/video/video'
-import { publishNewResolutionIfNeeded } from './video-transcoding'
-import { getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
+import { Job } from 'bull'
 import { copy, stat } from 'fs-extra'
-import { VideoFileModel } from '../../../models/video/video-file'
-import { extname } from 'path'
-import { MVideoFile, MVideoWithFile } from '@server/typings/models'
-
-export type VideoFileImportPayload = {
-  videoUUID: string,
-  filePath: string
-}
+import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
+import { CONFIG } from '@server/initializers/config'
+import { federateVideoIfNeeded } from '@server/lib/activitypub/videos'
+import { generateWebTorrentVideoFilename } from '@server/lib/paths'
+import { addMoveToObjectStorageJob } from '@server/lib/video'
+import { VideoPathManager } from '@server/lib/video-path-manager'
+import { VideoModel } from '@server/models/video/video'
+import { VideoFileModel } from '@server/models/video/video-file'
+import { MVideoFullLight } from '@server/types/models'
+import { getLowercaseExtension } from '@shared/core-utils'
+import { VideoFileImportPayload, VideoStorage } from '@shared/models'
+import { getVideoStreamFPS, getVideoStreamDimensionsInfo } from '../../../helpers/ffmpeg'
+import { logger } from '../../../helpers/logger'
 
-async function processVideoFileImport (job: Bull.Job) {
+async function processVideoFileImport (job: Job) {
   const payload = job.data as VideoFileImportPayload
   logger.info('Processing video file import in job %d.', job.id)
 
-  const video = await VideoModel.loadAndPopulateAccountAndServerAndTags(payload.videoUUID)
+  const video = await VideoModel.loadFull(payload.videoUUID)
   // No video, maybe deleted?
   if (!video) {
     logger.info('Do not process job %d, video does not exist.', job.id)
@@ -26,7 +27,12 @@ async function processVideoFileImport (job: Bull.Job) {
 
   await updateVideoFile(video, payload.filePath)
 
-  await publishNewResolutionIfNeeded(video)
+  if (CONFIG.OBJECT_STORAGE.ENABLED) {
+    await addMoveToObjectStorageJob({ video, previousVideoState: video.state })
+  } else {
+    await federateVideoIfNeeded(video, false)
+  }
+
   return video
 }
 
@@ -38,42 +44,39 @@ export {
 
 // ---------------------------------------------------------------------------
 
-async function updateVideoFile (video: MVideoWithFile, inputFilePath: string) {
-  const { videoFileResolution } = await getVideoFileResolution(inputFilePath)
+async function updateVideoFile (video: MVideoFullLight, inputFilePath: string) {
+  const { resolution } = await getVideoStreamDimensionsInfo(inputFilePath)
   const { size } = await stat(inputFilePath)
-  const fps = await getVideoFileFPS(inputFilePath)
+  const fps = await getVideoStreamFPS(inputFilePath)
 
-  let updatedVideoFile = new VideoFileModel({
-    resolution: videoFileResolution,
-    extname: extname(inputFilePath),
-    size,
-    fps,
-    videoId: video.id
-  }) as MVideoFile
+  const fileExt = getLowercaseExtension(inputFilePath)
 
-  const currentVideoFile = video.VideoFiles.find(videoFile => videoFile.resolution === updatedVideoFile.resolution)
+  const currentVideoFile = video.VideoFiles.find(videoFile => videoFile.resolution === resolution)
 
   if (currentVideoFile) {
     // Remove old file and old torrent
-    await video.removeFile(currentVideoFile)
-    await video.removeTorrent(currentVideoFile)
+    await video.removeWebTorrentFileAndTorrent(currentVideoFile)
     // Remove the old video file from the array
     video.VideoFiles = video.VideoFiles.filter(f => f !== currentVideoFile)
 
-    // Update the database
-    currentVideoFile.extname = updatedVideoFile.extname
-    currentVideoFile.size = updatedVideoFile.size
-    currentVideoFile.fps = updatedVideoFile.fps
-
-    updatedVideoFile = currentVideoFile
+    await currentVideoFile.destroy()
   }
 
-  const outputPath = video.getVideoFilePath(updatedVideoFile)
-  await copy(inputFilePath, outputPath)
+  const newVideoFile = new VideoFileModel({
+    resolution,
+    extname: fileExt,
+    filename: generateWebTorrentVideoFilename(resolution, fileExt),
+    storage: VideoStorage.FILE_SYSTEM,
+    size,
+    fps,
+    videoId: video.id
+  })
 
-  await video.createTorrentAndSetInfoHash(updatedVideoFile)
+  const outputPath = VideoPathManager.Instance.getFSVideoFileOutputPath(video, newVideoFile)
+  await copy(inputFilePath, outputPath)
 
-  await updatedVideoFile.save()
+  video.VideoFiles.push(newVideoFile)
+  await createTorrentAndSetInfoHash(video, newVideoFile)
 
-  video.VideoFiles.push(updatedVideoFile)
+  await newVideoFile.save()
 }