1 files changed, 97 insertions, 21 deletions

diff --git a/server/models/video-interface.ts b/server/models/video-interface.ts
index b8dbeea35..7005f213c 100644
--- a/server/models/video-interface.ts
+++ b/server/models/video-interface.ts
@@ -1,28 +1,101 @@
 import * as Sequelize from 'sequelize'
 
+import { AuthorInstance } from './author-interface'
+import { VideoTagInstance } from './video-tag-interface'
+
+// Don't use barrel, import just what we need
+import { Video as FormatedVideo } from '../../shared/models/video.model'
+
+export type FormatedAddRemoteVideo = {
+  name: string
+  category: number
+  licence: number
+  language: number
+  nsfw: boolean
+  description: string
+  infoHash: string
+  remoteId: string
+  author: string
+  duration: number
+  thumbnailData: string
+  tags: string[]
+  createdAt: Date
+  updatedAt: Date
+  extname: string
+  views: number
+  likes: number
+  dislikes: number
+}
+
+export type FormatedUpdateRemoteVideo = {
+  name: string
+  category: number
+  licence: number
+  language: number
+  nsfw: boolean
+  description: string
+  infoHash: string
+  remoteId: string
+  author: string
+  duration: number
+  tags: string[]
+  createdAt: Date
+  updatedAt: Date
+  extname: string
+  views: number
+  likes: number
+  dislikes: number
+}
+
 export namespace VideoMethods {
-  export type GenerateMagnetUri = () => void
-  export type GetVideoFilename = () => void
-  export type GetThumbnailName = () => void
-  export type GetPreviewName = () => void
-  export type GetTorrentName = () => void
-  export type IsOwned = () => void
-  export type ToFormatedJSON = () => void
-  export type ToAddRemoteJSON = (callback) => void
-  export type ToUpdateRemoteJSON = (callback) => void
-  export type TranscodeVideofile = (callback) => void
-
-  export type GenerateThumbnailFromData = (video, thumbnailData, callback) => void
+  export type GenerateMagnetUri = () => string
+  export type GetVideoFilename = () => string
+  export type GetThumbnailName = () => string
+  export type GetPreviewName = () => string
+  export type GetTorrentName = () => string
+  export type IsOwned = () => boolean
+  export type ToFormatedJSON = () => FormatedVideo
+
+  export type ToAddRemoteJSONCallback = (err: Error, videoFormated?: FormatedAddRemoteVideo) => void
+  export type ToAddRemoteJSON = (callback: ToAddRemoteJSONCallback) => void
+
+  export type ToUpdateRemoteJSON = () => FormatedUpdateRemoteVideo
+
+  export type TranscodeVideofileCallback = (err: Error) => void
+  export type TranscodeVideofile = (callback: TranscodeVideofileCallback) => void
+
+  export type GenerateThumbnailFromDataCallback = (err: Error, thumbnailName?: string) => void
+  export type GenerateThumbnailFromData = (video: VideoInstance, thumbnailData: string, callback: GenerateThumbnailFromDataCallback) => void
+
+  export type GetDurationFromFileCallback = (err: Error, duration?: number) => void
   export type GetDurationFromFile = (videoPath, callback) => void
-  export type List = (callback) => void
-  export type ListForApi = (start, count, sort, callback) => void
-  export type LoadByHostAndRemoteId = (fromHost, remoteId, callback) => void
-  export type ListOwnedAndPopulateAuthorAndTags = (callback) => void
-  export type ListOwnedByAuthor = (author, callback) => void
-  export type Load = (id, callback) => void
-  export type LoadAndPopulateAuthor = (id, callback) => void
-  export type LoadAndPopulateAuthorAndPodAndTags = (id, callback) => void
-  export type SearchAndPopulateAuthorAndPodAndTags = (value, field, start, count, sort, callback) => void
+
+  export type ListCallback = () => void
+  export type List = (callback: ListCallback) => void
+
+  export type ListForApiCallback = (err: Error, videoInstances?: VideoInstance[], total?: number) => void
+  export type ListForApi = (start: number, count: number, sort: string, callback: ListForApiCallback) => void
+
+  export type LoadByHostAndRemoteIdCallback = (err: Error, videoInstance: VideoInstance) => void
+  export type LoadByHostAndRemoteId = (fromHost: string, remoteId: string, callback: LoadByHostAndRemoteIdCallback) => void
+
+  export type ListOwnedAndPopulateAuthorAndTagsCallback = (err: Error, videoInstances: VideoInstance[]) => void
+  export type ListOwnedAndPopulateAuthorAndTags = (callback: ListOwnedAndPopulateAuthorAndTagsCallback) => void
+
+  export type ListOwnedByAuthorCallback = (err: Error, videoInstances: VideoInstance[]) => void
+  export type ListOwnedByAuthor = (author: string, callback: ListOwnedByAuthorCallback) => void
+
+  export type LoadCallback = (err: Error, videoInstance: VideoInstance) => void
+  export type Load = (id: string, callback: LoadCallback) => void
+
+  export type LoadAndPopulateAuthorCallback = (err: Error, videoInstance: VideoInstance) => void
+  export type LoadAndPopulateAuthor = (id: string, callback: LoadAndPopulateAuthorCallback) => void
+
+  export type LoadAndPopulateAuthorAndPodAndTagsCallback = (err: Error, videoInstance: VideoInstance) => void
+  export type LoadAndPopulateAuthorAndPodAndTags = (id: string, callback: LoadAndPopulateAuthorAndPodAndTagsCallback) => void
+
+  export type SearchAndPopulateAuthorAndPodAndTagsCallback = (err: Error, videoInstances?: VideoInstance[], total?: number) => void
+  export type SearchAndPopulateAuthorAndPodAndTags = (value: string, field: string, start: number, count: number, sort: string, callback: SearchAndPopulateAuthorAndPodAndTagsCallback) => void
 }
 
 export interface VideoClass {
@@ -64,6 +137,9 @@ export interface VideoAttributes {
   views?: number
   likes?: number
   dislikes?: number
+
+  Author?: AuthorInstance
+  Tags?: VideoTagInstance[]
 }
 
 export interface VideoInstance extends VideoClass, VideoAttributes, Sequelize.Instance<VideoAttributes> {