X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-import.ts;h=5c73fb07c8a07bc7087e2766e05afbe61afdb5cb;hb=eae0365b5c5468e51e9795b0e894815ebda86b4a;hp=89eeafd6a1603c0940b619b13c8678d10d8339e2;hpb=fbad87b0472f574409f7aa3ae7f8b54927d0cdd6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts
index 89eeafd6a..5c73fb07c 100644
--- a/server/models/video/video-import.ts
+++ b/server/models/video/video-import.ts
@@ -1,4 +1,5 @@
 import {
+  AfterUpdate,
   AllowNull,
   BelongsTo,
   Column,
@@ -12,34 +13,33 @@ import {
   Table,
   UpdatedAt
 } from 'sequelize-typescript'
-import { CONSTRAINTS_FIELDS } from '../../initializers'
-import { throwIfNotValid } from '../utils'
-import { VideoModel } from './video'
-import { isVideoImportStateValid, isVideoImportTargetUrlValid } from '../../helpers/custom-validators/video-imports'
+import { afterCommitIfTransaction } from '@server/helpers/database-utils'
+import { MVideoImportDefault, MVideoImportFormattable } from '@server/types/models/video/video-import'
+import { AttributesOnly } from '@shared/core-utils'
 import { VideoImport, VideoImportState } from '../../../shared'
-import { VideoChannelModel } from './video-channel'
-import { AccountModel } from '../account/account'
+import { isVideoImportStateValid, isVideoImportTargetUrlValid } from '../../helpers/custom-validators/video-imports'
+import { isVideoMagnetUriValid } from '../../helpers/custom-validators/videos'
+import { CONSTRAINTS_FIELDS, VIDEO_IMPORT_STATES } from '../../initializers/constants'
+import { UserModel } from '../user/user'
+import { getSort, throwIfNotValid } from '../utils'
+import { ScopeNames as VideoModelScopeNames, VideoModel } from './video'
 
-@DefaultScope({
+@DefaultScope(() => ({
   include: [
     {
-      model: () => VideoModel,
-      required: true,
-      include: [
-        {
-          model: () => VideoChannelModel,
-          required: true,
-          include: [
-            {
-              model: () => AccountModel,
-              required: true
-            }
-          ]
-        }
-      ]
+      model: UserModel.unscoped(),
+      required: true
+    },
+    {
+      model: VideoModel.scope([
+        VideoModelScopeNames.WITH_ACCOUNT_DETAILS,
+        VideoModelScopeNames.WITH_TAGS,
+        VideoModelScopeNames.WITH_THUMBNAILS
+      ]),
+      required: false
     }
   ]
-})
+}))
 
 @Table({
   tableName: 'videoImport',
@@ -47,21 +47,36 @@ import { AccountModel } from '../account/account'
     {
       fields: [ 'videoId' ],
       unique: true
+    },
+    {
+      fields: [ 'userId' ]
     }
   ]
 })
-export class VideoImportModel extends Model<VideoImportModel> {
+export class VideoImportModel extends Model<Partial<AttributesOnly<VideoImportModel>>> {
   @CreatedAt
   createdAt: Date
 
   @UpdatedAt
   updatedAt: Date
 
-  @AllowNull(false)
-  @Is('VideoImportTargetUrl', value => throwIfNotValid(value, isVideoImportTargetUrlValid, 'targetUrl'))
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoImportTargetUrl', value => throwIfNotValid(value, isVideoImportTargetUrlValid, 'targetUrl', true))
   @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_IMPORTS.URL.max))
   targetUrl: string
 
+  @AllowNull(true)
+  @Default(null)
+  @Is('VideoImportMagnetUri', value => throwIfNotValid(value, isVideoMagnetUriValid, 'magnetUri', true))
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_IMPORTS.URL.max)) // Use the same constraints than URLs
+  magnetUri: string
+
+  @AllowNull(true)
+  @Default(null)
+  @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_IMPORTS.TORRENT_NAME.max))
+  torrentName: string
+
   @AllowNull(false)
   @Default(null)
   @Is('VideoImportState', value => throwIfNotValid(value, isVideoImportStateValid, 'state'))
@@ -73,33 +88,102 @@ export class VideoImportModel extends Model<VideoImportModel> {
   @Column(DataType.TEXT)
   error: string
 
+  @ForeignKey(() => UserModel)
+  @Column
+  userId: number
+
+  @BelongsTo(() => UserModel, {
+    foreignKey: {
+      allowNull: false
+    },
+    onDelete: 'cascade'
+  })
+  User: UserModel
+
   @ForeignKey(() => VideoModel)
   @Column
   videoId: number
 
   @BelongsTo(() => VideoModel, {
     foreignKey: {
-      allowNull: false
+      allowNull: true
     },
-    onDelete: 'CASCADE'
+    onDelete: 'set null'
   })
   Video: VideoModel
 
-  static loadAndPopulateVideo (id: number) {
-    return VideoImportModel.findById(id)
+  @AfterUpdate
+  static deleteVideoIfFailed (instance: VideoImportModel, options) {
+    if (instance.state === VideoImportState.FAILED) {
+      return afterCommitIfTransaction(options.transaction, () => instance.Video.destroy())
+    }
+
+    return undefined
+  }
+
+  static loadAndPopulateVideo (id: number): Promise<MVideoImportDefault> {
+    return VideoImportModel.findByPk(id)
+  }
+
+  static listUserVideoImportsForApi (userId: number, start: number, count: number, sort: string) {
+    const query = {
+      distinct: true,
+      include: [
+        {
+          attributes: [ 'id' ],
+          model: UserModel.unscoped(), // FIXME: Without this, sequelize try to COUNT(DISTINCT(*)) which is an invalid SQL query
+          required: true
+        }
+      ],
+      offset: start,
+      limit: count,
+      order: getSort(sort),
+      where: {
+        userId
+      }
+    }
+
+    return VideoImportModel.findAndCountAll<MVideoImportDefault>(query)
+                           .then(({ rows, count }) => {
+                             return {
+                               data: rows,
+                               total: count
+                             }
+                           })
   }
 
-  toFormattedJSON (): VideoImport {
+  getTargetIdentifier () {
+    return this.targetUrl || this.magnetUri || this.torrentName
+  }
+
+  toFormattedJSON (this: MVideoImportFormattable): VideoImport {
     const videoFormatOptions = {
+      completeDescription: true,
       additionalAttributes: { state: true, waitTranscoding: true, scheduledUpdate: true }
     }
-    const video = Object.assign(this.Video.toFormattedJSON(videoFormatOptions), {
-      tags: this.Video.Tags.map(t => t.name)
-    })
+    const video = this.Video
+      ? Object.assign(this.Video.toFormattedJSON(videoFormatOptions), { tags: this.Video.Tags.map(t => t.name) })
+      : undefined
 
     return {
+      id: this.id,
+
       targetUrl: this.targetUrl,
+      magnetUri: this.magnetUri,
+      torrentName: this.torrentName,
+
+      state: {
+        id: this.state,
+        label: VideoImportModel.getStateLabel(this.state)
+      },
+      error: this.error,
+      updatedAt: this.updatedAt.toISOString(),
+      createdAt: this.createdAt.toISOString(),
       video
     }
   }
+
+  private static getStateLabel (id: number) {
+    return VIDEO_IMPORT_STATES[id] || 'Unknown'
+  }
 }