Use separate queries for video files

[github/Chocobozzz/PeerTube.git] / server / models / video / sql / videos-model-list-query-builder.ts

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 38b9c91d09f0d9a571bd537a6ec68e329c4246c2..acb76d80a9ef60081e02d640d87303d2dad7f3f0 100644 (file)
--- 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 @@
 import { Sequelize } from 'sequelize'
 import { AbstractVideosModelQueryBuilder } from './shared/abstract-videos-model-query-builder'
+import { VideoModelBuilder } from './shared/video-model-builder'
 import { BuildVideosListQueryOptions, VideosIdListQueryBuilder } from './videos-id-list-query-builder'
 
+/**
+ *
+ * Build videos list SQL query and create video models
+ *
+ */
+
 export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder {
   protected attributes: { [key: string]: string }
   protected joins: string[] = []
@@ -9,8 +16,12 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder
   private innerQuery: string
   private innerSort: string
 
+  private readonly videoModelBuilder: VideoModelBuilder
+
   constructor (protected readonly sequelize: Sequelize) {
     super('list')
+
+    this.videoModelBuilder = new VideoModelBuilder(this.mode, this.videoAttributes)
   }
 
   queryVideos (options: BuildVideosListQueryOptions) {
@@ -41,7 +52,8 @@ export class VideosModelListQueryBuilder extends AbstractVideosModelQueryBuilder
     this.includeThumbnails()
 
     if (options.withFiles) {
-      this.includeFiles()
+      this.includeWebtorrentFiles(false)
+      this.includeStreamingPlaylistFiles(false)
     }
 
     if (options.user) {