Client: handle multiple file resolutions

2 files changed, 25 insertions, 18 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
 }
diff --git a/server/tests/api/multiple-pods.ts b/server/tests/api/multiple-pods.ts
index c43793b30..08fa73aa2 100644
--- a/server/tests/api/multiple-pods.ts
+++ b/server/tests/api/multiple-pods.ts
@@ -195,27 +195,27 @@ describe('Test multiple pods', function () {
         const originalFile = video.files.find(f => f.resolution === 0)
         expect(originalFile).not.to.be.undefined
         expect(originalFile.resolutionLabel).to.equal('original')
-        expect(originalFile.size).to.equal(711327)
+        expect(originalFile.size).to.be.above(700000).and.below(720000)
 
         const file240p = video.files.find(f => f.resolution === 240)
         expect(file240p).not.to.be.undefined
         expect(file240p.resolutionLabel).to.equal('240p')
-        expect(file240p.size).to.equal(139953)
+        expect(file240p.size).to.be.above(130000).and.below(150000)
 
         const file360p = video.files.find(f => f.resolution === 360)
         expect(file360p).not.to.be.undefined
         expect(file360p.resolutionLabel).to.equal('360p')
-        expect(file360p.size).to.equal(169926)
+        expect(file360p.size).to.be.above(160000).and.below(180000)
 
         const file480p = video.files.find(f => f.resolution === 480)
         expect(file480p).not.to.be.undefined
         expect(file480p.resolutionLabel).to.equal('480p')
-        expect(file480p.size).to.equal(206758)
+        expect(file480p.size).to.be.above(200000).and.below(220000)
 
         const file720p = video.files.find(f => f.resolution === 720)
         expect(file720p).not.to.be.undefined
         expect(file720p.resolutionLabel).to.equal('720p')
-        expect(file720p.size).to.equal(314913)
+        expect(file720p.size).to.be.above(310000).and.below(320000)
 
         const test = await testVideoImage(server.url, 'video_short2.webm', video.thumbnailPath)
         expect(test).to.equal(true)