6 files changed, 236 insertions, 12 deletions

diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index 62791ff1b..82b661a03 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -108,7 +108,7 @@ async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate)
       await Promise.all(videoFileDestroyTasks)
 
       const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoObject)
-      const tasks = videoFileAttributes.map(f => VideoFileModel.create(f))
+      const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, sequelizeOptions))
       await Promise.all(tasks)
 
       // Update Tags
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts
index b3fbf88d0..e2f46bd02 100644
--- a/server/lib/activitypub/videos.ts
+++ b/server/lib/activitypub/videos.ts
@@ -162,7 +162,8 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje
       infoHash: parsed.infoHash,
       resolution: fileUrl.width,
       size: fileUrl.size,
-      videoId: videoCreated.id
+      videoId: videoCreated.id,
+      fps: fileUrl.fps
     } as VideoFileModel
     attributes.push(attribute)
   }
diff --git a/server/lib/job-queue/handlers/video-import.ts b/server/lib/job-queue/handlers/video-import.ts
new file mode 100644
index 000000000..cdfe412cc
--- /dev/null
+++ b/server/lib/job-queue/handlers/video-import.ts
@@ -0,0 +1,145 @@
+import * as Bull from 'bull'
+import { logger } from '../../../helpers/logger'
+import { downloadYoutubeDLVideo } from '../../../helpers/youtube-dl'
+import { VideoImportModel } from '../../../models/video/video-import'
+import { VideoImportState } from '../../../../shared/models/videos'
+import { getDurationFromVideoFile, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
+import { extname, join } from 'path'
+import { VideoFileModel } from '../../../models/video/video-file'
+import { renamePromise, statPromise, unlinkPromise } from '../../../helpers/core-utils'
+import { CONFIG, sequelizeTypescript } from '../../../initializers'
+import { doRequestAndSaveToFile } from '../../../helpers/requests'
+import { VideoState } from '../../../../shared'
+import { JobQueue } from '../index'
+import { federateVideoIfNeeded } from '../../activitypub'
+import { VideoModel } from '../../../models/video/video'
+
+export type VideoImportPayload = {
+  type: 'youtube-dl'
+  videoImportId: number
+  thumbnailUrl: string
+  downloadThumbnail: boolean
+  downloadPreview: boolean
+}
+
+async function processVideoImport (job: Bull.Job) {
+  const payload = job.data as VideoImportPayload
+  logger.info('Processing video import in job %d.', job.id)
+
+  const videoImport = await VideoImportModel.loadAndPopulateVideo(payload.videoImportId)
+  if (!videoImport || !videoImport.Video) {
+    throw new Error('Cannot import video %s: the video import or video linked to this import does not exist anymore.')
+  }
+
+  let tempVideoPath: string
+  let videoDestFile: string
+  let videoFile: VideoFileModel
+  try {
+    // Download video from youtubeDL
+    tempVideoPath = await downloadYoutubeDLVideo(videoImport.targetUrl)
+
+    // Get information about this video
+    const { videoFileResolution } = await getVideoFileResolution(tempVideoPath)
+    const fps = await getVideoFileFPS(tempVideoPath)
+    const stats = await statPromise(tempVideoPath)
+    const duration = await getDurationFromVideoFile(tempVideoPath)
+
+    // Create video file object in database
+    const videoFileData = {
+      extname: extname(tempVideoPath),
+      resolution: videoFileResolution,
+      size: stats.size,
+      fps,
+      videoId: videoImport.videoId
+    }
+    videoFile = new VideoFileModel(videoFileData)
+    // Import if the import fails, to clean files
+    videoImport.Video.VideoFiles = [ videoFile ]
+
+    // Move file
+    videoDestFile = join(CONFIG.STORAGE.VIDEOS_DIR, videoImport.Video.getVideoFilename(videoFile))
+    await renamePromise(tempVideoPath, videoDestFile)
+    tempVideoPath = null // This path is not used anymore
+
+    // Process thumbnail
+    if (payload.downloadThumbnail) {
+      if (payload.thumbnailUrl) {
+        const destThumbnailPath = join(CONFIG.STORAGE.THUMBNAILS_DIR, videoImport.Video.getThumbnailName())
+        await doRequestAndSaveToFile({ method: 'GET', uri: payload.thumbnailUrl }, destThumbnailPath)
+      } else {
+        await videoImport.Video.createThumbnail(videoFile)
+      }
+    }
+
+    // Process preview
+    if (payload.downloadPreview) {
+      if (payload.thumbnailUrl) {
+        const destPreviewPath = join(CONFIG.STORAGE.PREVIEWS_DIR, videoImport.Video.getPreviewName())
+        await doRequestAndSaveToFile({ method: 'GET', uri: payload.thumbnailUrl }, destPreviewPath)
+      } else {
+        await videoImport.Video.createPreview(videoFile)
+      }
+    }
+
+    // Create torrent
+    await videoImport.Video.createTorrentAndSetInfoHash(videoFile)
+
+    const videoImportUpdated: VideoImportModel = await sequelizeTypescript.transaction(async t => {
+      // Refresh video
+      const video = await VideoModel.load(videoImport.videoId, t)
+      if (!video) throw new Error('Video linked to import ' + videoImport.videoId + ' does not exist anymore.')
+      videoImport.Video = video
+
+      const videoFileCreated = await videoFile.save({ transaction: t })
+      video.VideoFiles = [ videoFileCreated ]
+
+      // Update video DB object
+      video.duration = duration
+      video.state = CONFIG.TRANSCODING.ENABLED ? VideoState.TO_TRANSCODE : VideoState.PUBLISHED
+      const videoUpdated = await video.save({ transaction: t })
+
+      // Now we can federate the video (reload from database, we need more attributes)
+      const videoForFederation = await VideoModel.loadByUUIDAndPopulateAccountAndServerAndTags(video.uuid, t)
+      await federateVideoIfNeeded(videoForFederation, true, t)
+
+      // Update video import object
+      videoImport.state = VideoImportState.SUCCESS
+      const videoImportUpdated = await videoImport.save({ transaction: t })
+
+      logger.info('Video %s imported.', videoImport.targetUrl)
+
+      videoImportUpdated.Video = videoUpdated
+      return videoImportUpdated
+    })
+
+    // Create transcoding jobs?
+    if (videoImportUpdated.Video.state === VideoState.TO_TRANSCODE) {
+      // Put uuid because we don't have id auto incremented for now
+      const dataInput = {
+        videoUUID: videoImportUpdated.Video.uuid,
+        isNewVideo: true
+      }
+
+      await JobQueue.Instance.createJob({ type: 'video-file', payload: dataInput })
+    }
+
+  } catch (err) {
+    try {
+      if (tempVideoPath) await unlinkPromise(tempVideoPath)
+    } catch (errUnlink) {
+      logger.warn('Cannot cleanup files after a video import error.', { err: errUnlink })
+    }
+
+    videoImport.error = err.message
+    videoImport.state = VideoImportState.FAILED
+    await videoImport.save()
+
+    throw err
+  }
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  processVideoImport
+}
diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts
index 8ff0c169e..8a24604e1 100644
--- a/server/lib/job-queue/job-queue.ts
+++ b/server/lib/job-queue/job-queue.ts
@@ -2,13 +2,14 @@ import * as Bull from 'bull'
 import { JobState, JobType } from '../../../shared/models'
 import { logger } from '../../helpers/logger'
 import { Redis } from '../redis'
-import { CONFIG, JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_REQUEST_TTL } from '../../initializers'
+import { CONFIG, JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL } from '../../initializers'
 import { ActivitypubHttpBroadcastPayload, processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast'
 import { ActivitypubHttpFetcherPayload, processActivityPubHttpFetcher } from './handlers/activitypub-http-fetcher'
 import { ActivitypubHttpUnicastPayload, processActivityPubHttpUnicast } from './handlers/activitypub-http-unicast'
 import { EmailPayload, processEmail } from './handlers/email'
 import { processVideoFile, processVideoFileImport, VideoFileImportPayload, VideoFilePayload } from './handlers/video-file'
 import { ActivitypubFollowPayload, processActivityPubFollow } from './handlers/activitypub-follow'
+import { processVideoImport, VideoImportPayload } from './handlers/video-import'
 
 type CreateJobArgument =
   { type: 'activitypub-http-broadcast', payload: ActivitypubHttpBroadcastPayload } |
@@ -17,7 +18,8 @@ type CreateJobArgument =
   { type: 'activitypub-follow', payload: ActivitypubFollowPayload } |
   { type: 'video-file-import', payload: VideoFileImportPayload } |
   { type: 'video-file', payload: VideoFilePayload } |
-  { type: 'email', payload: EmailPayload }
+  { type: 'email', payload: EmailPayload } |
+  { type: 'video-import', payload: VideoImportPayload }
 
 const handlers: { [ id in JobType ]: (job: Bull.Job) => Promise<any>} = {
   'activitypub-http-broadcast': processActivityPubHttpBroadcast,
@@ -26,7 +28,8 @@ const handlers: { [ id in JobType ]: (job: Bull.Job) => Promise<any>} = {
   'activitypub-follow': processActivityPubFollow,
   'video-file-import': processVideoFileImport,
   'video-file': processVideoFile,
-  'email': processEmail
+  'email': processEmail,
+  'video-import': processVideoImport
 }
 
 const jobsWithRequestTimeout: { [ id in JobType ]?: boolean } = {
@@ -43,7 +46,8 @@ const jobTypes: JobType[] = [
   'activitypub-http-unicast',
   'email',
   'video-file',
-  'video-file-import'
+  'video-file-import',
+  'video-import'
 ]
 
 class JobQueue {
@@ -75,7 +79,11 @@ class JobQueue {
       const handler = handlers[handlerName]
 
       queue.process(JOB_CONCURRENCY[handlerName], handler)
-        .catch(err => logger.error('Cannot execute job queue %s.', handlerName, { err }))
+           .catch(err => logger.error('Error in job queue processor %s.', handlerName, { err }))
+
+      queue.on('failed', (job, err) => {
+        logger.error('Cannot execute job %d in queue %s.', job.id, handlerName, { payload: job.data, err })
+      })
 
       queue.on('error', err => {
         logger.error('Error in job queue %s.', handlerName, { err })
@@ -102,11 +110,8 @@ class JobQueue {
 
     const jobArgs: Bull.JobOptions = {
       backoff: { delay: 60 * 1000, type: 'exponential' },
-      attempts: JOB_ATTEMPTS[obj.type]
-    }
-
-    if (jobsWithRequestTimeout[obj.type] === true) {
-      jobArgs.timeout = JOB_REQUEST_TTL
+      attempts: JOB_ATTEMPTS[obj.type],
+      timeout: JOB_TTL[obj.type]
     }
 
     return queue.add(obj.payload, jobArgs)
diff --git a/server/lib/schedulers/youtube-dl-update-scheduler.ts b/server/lib/schedulers/youtube-dl-update-scheduler.ts
new file mode 100644
index 000000000..a2d919603
--- /dev/null
+++ b/server/lib/schedulers/youtube-dl-update-scheduler.ts
@@ -0,0 +1,72 @@
+// Thanks: https://github.com/przemyslawpluta/node-youtube-dl/blob/master/lib/downloader.js
+// We rewrote it to avoid sync calls
+
+import { AbstractScheduler } from './abstract-scheduler'
+import { SCHEDULER_INTERVALS_MS } from '../../initializers'
+import { logger } from '../../helpers/logger'
+import * as request from 'request'
+import { createWriteStream, writeFile } from 'fs'
+import { join } from 'path'
+import { root } from '../../helpers/core-utils'
+
+export class YoutubeDlUpdateScheduler extends AbstractScheduler {
+
+  private static instance: AbstractScheduler
+
+  protected schedulerIntervalMs = SCHEDULER_INTERVALS_MS.youtubeDLUpdate
+
+  private constructor () {
+    super()
+  }
+
+  async execute () {
+    const binDirectory = join(root(), 'node_modules', 'youtube-dl', 'bin')
+    const bin = join(binDirectory, 'youtube-dl')
+    const detailsPath = join(binDirectory, 'details')
+    const url = 'https://yt-dl.org/downloads/latest/youtube-dl'
+
+    request.get(url, { followRedirect: false }, (err, res) => {
+      if (err) {
+        logger.error('Cannot update youtube-dl.', { err })
+        return
+      }
+
+      if (res.statusCode !== 302) {
+        logger.error('youtube-dl update error: did not get redirect for the latest version link. Status %d', res.statusCode)
+        return
+      }
+
+      const url = res.headers.location
+      const downloadFile = request.get(url)
+      const newVersion = /yt-dl\.org\/downloads\/(\d{4}\.\d\d\.\d\d(\.\d)?)\/youtube-dl/.exec(url)[1]
+
+      downloadFile.on('response', res => {
+        if (res.statusCode !== 200) {
+          logger.error('Cannot update youtube-dl: new version response is not 200, it\'s %d.', res.statusCode)
+          return
+        }
+
+        downloadFile.pipe(createWriteStream(bin, { mode: 493 }))
+      })
+
+      downloadFile.on('error', err => logger.error('youtube-dl update error.', { err }))
+
+      downloadFile.on('end', () => {
+        const details = JSON.stringify({ version: newVersion, path: bin, exec: 'youtube-dl' })
+        writeFile(detailsPath, details, { encoding: 'utf8' }, err => {
+          if (err) {
+            logger.error('youtube-dl update error: cannot write details.', { err })
+            return
+          }
+
+          logger.info('youtube-dl updated to version %s.', newVersion)
+        })
+      })
+
+    })
+  }
+
+  static get Instance () {
+    return this.instance || (this.instance = new this())
+  }
+}
diff --git a/server/lib/user.ts b/server/lib/user.ts
index ac5f55260..e7a45f5aa 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -17,6 +17,7 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse
 
     const userCreated = await userToCreate.save(userOptions)
     const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
+    userCreated.Account = accountCreated
 
     const videoChannelDisplayName = `Default ${userCreated.username} channel`
     const videoChannelInfo = {