Client: handle multiple file resolutions

1 files changed, 20 insertions, 13 deletions

diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index b4a2b0c95..c376d769e 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -477,19 +477,26 @@ toFormattedJSON = function (this: VideoInstance) {
     files: []
   }
 
-  this.VideoFiles.forEach(videoFile => {
-    let resolutionLabel = VIDEO_FILE_RESOLUTIONS[videoFile.resolution]
-    if (!resolutionLabel) resolutionLabel = 'Unknown'
-
-    const videoFileJson = {
-      resolution: videoFile.resolution,
-      resolutionLabel,
-      magnetUri: this.generateMagnetUri(videoFile),
-      size: videoFile.size
-    }
-
-    json.files.push(videoFileJson)
-  })
+  // Format and sort video files
+  json.files = this.VideoFiles
+                   .map(videoFile => {
+                     let resolutionLabel = VIDEO_FILE_RESOLUTIONS[videoFile.resolution]
+                     if (!resolutionLabel) resolutionLabel = 'Unknown'
+
+                     const videoFileJson = {
+                       resolution: videoFile.resolution,
+                       resolutionLabel,
+                       magnetUri: this.generateMagnetUri(videoFile),
+                       size: videoFile.size
+                     }
+
+                     return videoFileJson
+                   })
+                   .sort((a, b) => {
+                     if (a.resolution < b.resolution) return 1
+                     if (a.resolution === b.resolution) return 0
+                     return -1
+                   })
 
   return json
 }