Merge pull request #51 from yoheimuta/fix-duration-notation

Fix duration notation
yoheimuta · Dec 28, 2021 · 81f66d3 · 81f66d3
2 parents 9f6848c + 0c1fa75
commit 81f66d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/RxMusicPlayer/CMTime+String.swift b/RxMusicPlayer/CMTime+String.swift
@@ -10,11 +10,17 @@ import AVFoundation
 
 extension CMTime {
     public var displayTime: String? {
-        guard let sec = seconds?.rounded().toInt() else { return nil }
+        guard let sec = seconds?.rounded() else { return nil }
+
+        let formatter = DateComponentsFormatter()
+        formatter.unitsStyle = .positional
+        formatter.zeroFormattingBehavior = .pad
         if sec < 60 * 60 {
-            return String(format: "%02d:%02d", sec / 60, sec % 60)
+            formatter.allowedUnits = [.minute, .second]
+        } else {
+            formatter.allowedUnits = [.hour, .minute, .second]
         }
-        return String(format: "%02d:%02d:%02d", sec / (60 * 60), sec % 60 * 60, sec % 60)
+        return formatter.string(from: sec) ?? nil
     }
 
     public var seconds: Double? {

diff --git a/RxMusicPlayerTests/RxMusicPlayerTests.swift b/RxMusicPlayerTests/RxMusicPlayerTests.swift
@@ -27,6 +27,7 @@ class RxMusicPlayerTests: XCTestCase {
         XCTAssertEqual(CMTimeMake(value: 60, timescale: 1).displayTime, "01:00", "convert a minute")
         XCTAssertEqual(CMTimeMake(value: 601, timescale: 1).displayTime, "10:01", "convert ten minutes")
         XCTAssertEqual(CMTimeMake(value: 3600, timescale: 1).displayTime, "01:00:00", "convert an hour")
+        XCTAssertEqual(CMTimeMake(value: 5430, timescale: 1).displayTime, "01:30:30", "convert an hour")
         XCTAssertEqual(CMTimeMake(value: 86400, timescale: 1).displayTime, "24:00:00", "convert a day")
     }