diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-10 16:57:13 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-11 09:31:59 +0200 |
commit | 1d43c3a613c72d69f7360fee9e5bfe6f662d62f7 (patch) | |
tree | d4ba891ffdb1182e39620c06feff1503365d66b5 /server/models/video/sql/videos-model-list-query-builder.ts | |
parent | d9bf974f5df787bbeaab5b04949ca91a2b3ca2a3 (diff) | |
download | PeerTube-1d43c3a613c72d69f7360fee9e5bfe6f662d62f7.tar.gz PeerTube-1d43c3a613c72d69f7360fee9e5bfe6f662d62f7.tar.zst PeerTube-1d43c3a613c72d69f7360fee9e5bfe6f662d62f7.zip |
Use separate queries for video files
Diffstat (limited to 'server/models/video/sql/videos-model-list-query-builder.ts')
-rw-r--r-- | server/models/video/sql/videos-model-list-query-builder.ts | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/server/models/video/sql/videos-model-list-query-builder.ts b/server/models/video/sql/videos-model-list-query-builder.ts index 38b9c91d0..acb76d80a 100644 --- a/server/models/video/sql/videos-model-list-query-builder.ts +++ b/server/models/video/sql/videos-model-list-query-builder.ts | |||
@@ -1,7 +1,14 @@ | |||
1 | import { Sequelize } from 'sequelize' | 1 | import { Sequelize } from 'sequelize' |
2 | import { AbstractVideosModelQueryBuilder } from './shared/abstract-videos-model-query-builder' | 2 | import { AbstractVideosModelQueryBuilder } from './shared/abstract-videos-model-query-builder' |
3 | import { VideoModelBuilder } from './shared/video-model-builder' | ||
3 | import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-id-list-query-builder' | 4 | import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-id-list-query-builder' |
4 | 5 | ||
6 | /** | ||
7 | * | ||
8 | * Build videos list SQL query and create video models | ||
9 | * | ||
10 | */ | ||
11 | |||
5 | export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder { | 12 | export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder { |
6 | protected attributes: { [key: string]: string } | 13 | protected attributes: { [key: string]: string } |
7 | protected joins: string[] = [] | 14 | protected joins: string[] = [] |
@@ -9,8 +16,12 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder | |||
9 | private innerQuery: string | 16 | private innerQuery: string |
10 | private innerSort: string | 17 | private innerSort: string |
11 | 18 | ||
19 | private readonly videoModelBuilder: VideoModelBuilder | ||
20 | |||
12 | constructor (protected readonly sequelize: Sequelize) { | 21 | constructor (protected readonly sequelize: Sequelize) { |
13 | super('list') | 22 | super('list') |
23 | |||
24 | this.videoModelBuilder = new VideoModelBuilder(this.mode, this.videoAttributes) | ||
14 | } | 25 | } |
15 | 26 | ||
16 | queryVideos (options: BuildVideosListQueryOptions) { | 27 | queryVideos (options: BuildVideosListQueryOptions) { |
@@ -41,7 +52,8 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder | |||
41 | this.includeThumbnails() | 52 | this.includeThumbnails() |
42 | 53 | ||
43 | if (options.withFiles) { | 54 | if (options.withFiles) { |
44 | this.includeFiles() | 55 | this.includeWebtorrentFiles(false) |
56 | this.includeStreamingPlaylistFiles(false) | ||
45 | } | 57 | } |
46 | 58 | ||
47 | if (options.user) { | 59 | if (options.user) { |