From 842fb086b90358a13ec94567c6ec82a8bb24be20 Mon Sep 17 00:00:00 2001 From: Brian Arnold Date: Wed, 31 Mar 2021 02:35:21 -0400 Subject: [PATCH 1/5] Changed calculation for media info run time to render hours when greater than 59 minutes --- src/components/mediainfo/mediainfo.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index 0b09c3dff3..a979c9b221 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -257,11 +257,19 @@ import '../../elements/emby-button/emby-button'; if (item.Type === 'Audio') { miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks)); } else { - minutes = item.RunTimeTicks / 600000000; - - minutes = minutes || 1; - - miscInfo.push(`${Math.round(minutes)} mins`); + const ticksPerMinute = 600000000; + let totalMinutes = Math.floor(ticks/ticksPerMinute); + totalMinutes = totalMinutes || 1; + let totalHours = Math.floor(totalMinutes / 60); + let remainderMinutes = totalMinutes % 60; + result = []; + if (totalHours > 0) { + result.push(`${totalHours} hrs`); + } + if (totalMinutes > 0) { + result.push(`${remainderMinutes} mins`); + } + miscInfo.push(result.join(', ')); } } From 115684f7dd5e58d81ff92e8862c7f4ac99ae7b62 Mon Sep 17 00:00:00 2001 From: BrianCArnold Date: Mon, 12 Apr 2021 10:38:08 -0400 Subject: [PATCH 2/5] Update mediainfo.js Fix typo regarding source of Ticks --- src/components/mediainfo/mediainfo.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index a979c9b221..0a000e71f8 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -258,10 +258,9 @@ import '../../elements/emby-button/emby-button'; miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks)); } else { const ticksPerMinute = 600000000; - let totalMinutes = Math.floor(ticks/ticksPerMinute); - totalMinutes = totalMinutes || 1; - let totalHours = Math.floor(totalMinutes / 60); - let remainderMinutes = totalMinutes % 60; + const totalMinutes = Math.floor(item.RunTimeTicks/ticksPerMinute) || 1; + const totalHours = Math.floor(totalMinutes / 60); + const remainderMinutes = totalMinutes % 60; result = []; if (totalHours > 0) { result.push(`${totalHours} hrs`); From 62a791fad58f49de5d04bbac1ca9190042f1aa42 Mon Sep 17 00:00:00 2001 From: BrianCArnold Date: Mon, 12 Apr 2021 10:43:25 -0400 Subject: [PATCH 3/5] Update mediainfo.js Fix missing const keyword and spacing on operator. --- src/components/mediainfo/mediainfo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index 8926a29cbb..e08932f59b 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -258,10 +258,10 @@ import '../../elements/emby-button/emby-button'; miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks)); } else { const ticksPerMinute = 600000000; - const totalMinutes = Math.floor(item.RunTimeTicks/ticksPerMinute) || 1; + const totalMinutes = Math.floor(item.RunTimeTicks / ticksPerMinute) || 1; const totalHours = Math.floor(totalMinutes / 60); const remainderMinutes = totalMinutes % 60; - result = []; + const result = []; if (totalHours > 0) { result.push(`${totalHours} hrs`); } From b22fa1dcecf261c675752dec390241c7f7d67b1c Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Tue, 7 Sep 2021 15:37:16 -0400 Subject: [PATCH 4/5] Update duration format to Xh Xm --- src/components/mediainfo/mediainfo.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index e08932f59b..7ee1e0fb40 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -106,7 +106,6 @@ import '../../elements/emby-button/emby-button'; const miscInfo = []; let text; let date; - let minutes; let count; const showFolderRuntime = item.Type === 'MusicAlbum' || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre'; @@ -257,18 +256,17 @@ import '../../elements/emby-button/emby-button'; if (item.Type === 'Audio') { miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks)); } else { - const ticksPerMinute = 600000000; - const totalMinutes = Math.floor(item.RunTimeTicks / ticksPerMinute) || 1; + const totalMinutes = Math.round(item.RunTimeTicks / 600000000) || 1; const totalHours = Math.floor(totalMinutes / 60); const remainderMinutes = totalMinutes % 60; const result = []; if (totalHours > 0) { - result.push(`${totalHours} hrs`); + result.push(`${totalHours}h`); } if (totalMinutes > 0) { - result.push(`${remainderMinutes} mins`); + result.push(`${remainderMinutes}m`); } - miscInfo.push(result.join(', ')); + miscInfo.push(result.join(' ')); } } From 54e1577097c4eef7bdfd54ac8ecb477c7084422a Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Wed, 8 Sep 2021 13:01:09 -0400 Subject: [PATCH 5/5] Remove length check that should always be true --- src/components/mediainfo/mediainfo.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js index 7ee1e0fb40..64dd521415 100644 --- a/src/components/mediainfo/mediainfo.js +++ b/src/components/mediainfo/mediainfo.js @@ -263,9 +263,7 @@ import '../../elements/emby-button/emby-button'; if (totalHours > 0) { result.push(`${totalHours}h`); } - if (totalMinutes > 0) { - result.push(`${remainderMinutes}m`); - } + result.push(`${remainderMinutes}m`); miscInfo.push(result.join(' ')); } }