From 98802234a7377ecebec05e68b80059571a2f3147 Mon Sep 17 00:00:00 2001
From: Erick Kad-Bay <erickadbay@gmail.com>
Date: Tue, 29 Nov 2016 15:51:56 -0500
Subject: [PATCH] Fixed recording duration

---
 app/assets/javascripts/recordings.coffee | 10 ++++++++--
 app/lib/bbb_api.rb                       |  2 +-
 app/views/bbb/recordings.jbuilder        |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index a88ff483..5631972f 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -140,8 +140,14 @@ class @Recordings
       if !@owner
         table_api.column(-1).visible(false)
       for recording in data.recordings
-        totalMinutes = Math.round((new Date(recording.end_time) - new Date(recording.start_time)) / 1000 / 60)
-        recording.duration = totalMinutes
+        hours = Math.floor(recording.length/60)
+        minutes = recording.length % 60
+        recording.duration =  if minutes>=60
+                                hours+"hours and "+minutes+" minutes"
+                              else if minutes>1
+                                minutes+" minutes"
+                              else
+                                "< 1 minute"
       data.recordings.sort (a,b) ->
         return new Date(b.start_time) - new Date(a.start_time)
       table_api.clear()
diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb
index 8fc9a4ca..e7f57c3f 100644
--- a/app/lib/bbb_api.rb
+++ b/app/lib/bbb_api.rb
@@ -113,7 +113,7 @@ module BbbApi
 
     res[:recordings].each do |recording|
       pref_preview = {}
-
+      recording[:length] = recording[:playback][:format].is_a?(Hash) ? recording[:playback][:format][:length] : recording[:playback][:format].first[:length]
       # create a playbacks attribute on recording for playback formats
       recording[:playbacks] = if !recording[:playback] || !recording[:playback][:format]
         []
diff --git a/app/views/bbb/recordings.jbuilder b/app/views/bbb/recordings.jbuilder
index cb6d2423..e1174e8b 100644
--- a/app/views/bbb/recordings.jbuilder
+++ b/app/views/bbb/recordings.jbuilder
@@ -23,6 +23,7 @@ json.recordings do
     json.start_time recording[:startTime]
     json.end_time recording[:endTime]
     json.published recording[:published]
+    json.length recording[:length]
     json.previews do
       json.array!(recording[:previews]) do |preview|
         json.partial! 'preview', preview: preview