diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/oauth/oauth-token-interface.ts | 2 | ||||
-rw-r--r-- | server/models/request/request-interface.ts | 2 | ||||
-rw-r--r-- | server/models/request/request-video-event-interface.ts | 4 | ||||
-rw-r--r-- | server/models/request/request-video-qadu-interface.ts | 4 | ||||
-rw-r--r-- | server/models/video/author-interface.ts | 2 | ||||
-rw-r--r-- | server/models/video/video-abuse-interface.ts | 2 | ||||
-rw-r--r-- | server/models/video/video.ts | 2 |
7 files changed, 10 insertions, 8 deletions
diff --git a/server/models/oauth/oauth-token-interface.ts b/server/models/oauth/oauth-token-interface.ts index 97af3c815..0c947bde8 100644 --- a/server/models/oauth/oauth-token-interface.ts +++ b/server/models/oauth/oauth-token-interface.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { UserModel } from '../user' | 4 | import { UserModel } from '../user/user-interface' |
5 | 5 | ||
6 | export type OAuthTokenInfo = { | 6 | export type OAuthTokenInfo = { |
7 | refreshToken: string | 7 | refreshToken: string |
diff --git a/server/models/request/request-interface.ts b/server/models/request/request-interface.ts index 7b0ee4df9..dae35651b 100644 --- a/server/models/request/request-interface.ts +++ b/server/models/request/request-interface.ts | |||
@@ -2,7 +2,7 @@ import * as Sequelize from 'sequelize' | |||
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { AbstractRequestClass } from './abstract-request-interface' | 4 | import { AbstractRequestClass } from './abstract-request-interface' |
5 | import { PodInstance, PodAttributes } from '../pod' | 5 | import { PodInstance, PodAttributes } from '../pod/pod-interface' |
6 | import { RequestEndpoint } from '../../../shared/models/request-scheduler.model' | 6 | import { RequestEndpoint } from '../../../shared/models/request-scheduler.model' |
7 | 7 | ||
8 | export type RequestsGrouped = { | 8 | export type RequestsGrouped = { |
diff --git a/server/models/request/request-video-event-interface.ts b/server/models/request/request-video-event-interface.ts index a5032e1b1..26cabe3ba 100644 --- a/server/models/request/request-video-event-interface.ts +++ b/server/models/request/request-video-event-interface.ts | |||
@@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' | |||
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { AbstractRequestClass, AbstractRequestToPodClass } from './abstract-request-interface' | 4 | import { AbstractRequestClass, AbstractRequestToPodClass } from './abstract-request-interface' |
5 | import { VideoInstance } from '../video' | 5 | import { VideoInstance } from '../video/video-interface' |
6 | import { PodInstance } from '../pod' | 6 | import { PodInstance } from '../pod/pod-interface' |
7 | 7 | ||
8 | import { RequestVideoEventType } from '../../../shared/models/request-scheduler.model' | 8 | import { RequestVideoEventType } from '../../../shared/models/request-scheduler.model' |
9 | 9 | ||
diff --git a/server/models/request/request-video-qadu-interface.ts b/server/models/request/request-video-qadu-interface.ts index 9a172a4d4..b7b7b1ecc 100644 --- a/server/models/request/request-video-qadu-interface.ts +++ b/server/models/request/request-video-qadu-interface.ts | |||
@@ -2,8 +2,8 @@ import * as Sequelize from 'sequelize' | |||
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { AbstractRequestClass, AbstractRequestToPodClass } from './abstract-request-interface' | 4 | import { AbstractRequestClass, AbstractRequestToPodClass } from './abstract-request-interface' |
5 | import { VideoInstance } from '../video' | 5 | import { VideoInstance } from '../video/video-interface' |
6 | import { PodInstance } from '../pod' | 6 | import { PodInstance } from '../pod/pod-interface' |
7 | 7 | ||
8 | import { RequestVideoQaduType } from '../../../shared/models/request-scheduler.model' | 8 | import { RequestVideoQaduType } from '../../../shared/models/request-scheduler.model' |
9 | 9 | ||
diff --git a/server/models/video/author-interface.ts b/server/models/video/author-interface.ts index dbcb85b17..52a00a1d3 100644 --- a/server/models/video/author-interface.ts +++ b/server/models/video/author-interface.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { PodInstance } from '../pod' | 4 | import { PodInstance } from '../pod/pod-interface' |
5 | 5 | ||
6 | export namespace AuthorMethods { | 6 | export namespace AuthorMethods { |
7 | export type FindOrCreateAuthor = ( | 7 | export type FindOrCreateAuthor = ( |
diff --git a/server/models/video/video-abuse-interface.ts b/server/models/video/video-abuse-interface.ts index abc82f7ac..978268926 100644 --- a/server/models/video/video-abuse-interface.ts +++ b/server/models/video/video-abuse-interface.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import * as Sequelize from 'sequelize' | 1 | import * as Sequelize from 'sequelize' |
2 | import * as Promise from 'bluebird' | 2 | import * as Promise from 'bluebird' |
3 | 3 | ||
4 | import { PodInstance } from '../pod' | 4 | import { PodInstance } from '../pod/pod-interface' |
5 | import { ResultList } from '../../../shared' | 5 | import { ResultList } from '../../../shared' |
6 | 6 | ||
7 | // Don't use barrel, import just what we need | 7 | // Don't use barrel, import just what we need |
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 8c69fe189..1134525f0 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -378,6 +378,8 @@ createTorrentAndSetInfoHash = function (this: VideoInstance, videoFile: VideoFil | |||
378 | return createTorrentPromise(this.getVideoFilePath(videoFile), options) | 378 | return createTorrentPromise(this.getVideoFilePath(videoFile), options) |
379 | .then(torrent => { | 379 | .then(torrent => { |
380 | const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) | 380 | const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, this.getTorrentFileName(videoFile)) |
381 | logger.info('Creating torrent %s.', filePath) | ||
382 | |||
381 | return writeFilePromise(filePath, torrent).then(() => torrent) | 383 | return writeFilePromise(filePath, torrent).then(() => torrent) |
382 | }) | 384 | }) |
383 | .then(torrent => { | 385 | .then(torrent => { |