Time interval to time with abbreviations e.g. 1m 1.234s

ikhvorost · Apr 14, 2022 · 9e2fa62 · 9e2fa62
1 parent bcb0435
commit 9e2fa62
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Sources/DLog/Text.swift b/Sources/DLog/Text.swift
@@ -169,12 +169,25 @@ public class Text : LogOutput {
 	private static let dateComponentsFormatter: DateComponentsFormatter = {
 		let formatter = DateComponentsFormatter()
 		formatter.allowedUnits = [.minute, .second]
+        formatter.unitsStyle = .abbreviated
 		return formatter
 	}()
 
 	static func stringFromTime(interval: TimeInterval) -> String {
-		let ms = Int(interval.truncatingRemainder(dividingBy: 1) * 1000)
-		return dateComponentsFormatter.string(from: interval)! + ".\(ms)"
+        let time = dateComponentsFormatter.string(from: interval)!
+
+        let fractation = String(format: "%.3f", interval).split(separator: ".")[1]
+        if fractation != "000" {
+            let ms = ".\(fractation)s"
+            if let index = time.firstIndex(of: "s") {
+                let range = index..<time.index(after: index)
+                return time.replacingCharacters(in: range, with: ms)
+            }
+            else {
+                return "\(time) 0\(ms)"
+            }
+        }
+        return time
 	}
 
 	private func logPrefix(items: [(LogOptions, () -> String)], options: LogOptions) -> String {

diff --git a/Tests/DLogTests/DLogTests.swift b/Tests/DLogTests/DLogTests.swift
@@ -133,7 +133,7 @@ let FaultTag = #"\[FAULT\]"#
 let IntervalTag = #"\[INTERVAL\]"#
 
 let Location = "<DLogTests.swift:[0-9]+>"
-let SECS = #"[0-9]+\.[0-9]{3}"#
+let SECS = #"[0-9]+\.[0-9]{3}s"#
 let Interval = #"\{ duration: \#(SECS), average: \#(SECS) \}"#
 
 fileprivate func testAll(_ logger: LogProtocol, categoryTag: String = CategoryTag) {
@@ -158,7 +158,7 @@ fileprivate func testAll(_ logger: LogProtocol, categoryTag: String = CategoryTa
 
 	XCTAssert(logger.fault("fault")?.match(#"\#(categoryTag)\#(padding)\#(FaultTag) \#(Location) fault"#) == true)
 
-	XCTAssert(read_stdout { logger.scope("scope") { _ in delay() } }?.match(#"\#(categoryTag)\#(padding)└ \[scope\] \(0\.[0-9]{3}\)"#) == true)
+	XCTAssert(read_stdout { logger.scope("scope") { _ in delay() } }?.match(#"\#(categoryTag)\#(padding)└ \[scope\] \(\#(SECS)\)"#) == true)
 	XCTAssert(read_stdout { logger.interval("signpost") { delay() } }?.match(#"\#(categoryTag)\#(padding)\[INTERVAL\] \#(Location) signpost: \#(Interval)"#) == true)
 }
 

diff --git a/Tests/DLogTestsObjC/DLogTestsObjC.m b/Tests/DLogTestsObjC/DLogTestsObjC.m
@@ -184,7 +184,7 @@ - (void)test_Scope {
         testAll(scope, nil);
         [scope leave];
     });
-    XCTAssertTrue([text match:@"└ \\[Scope 2\\] \\(\\d\\.\\d\\)"]);
+    XCTAssertTrue([text match:@"└ \\[Scope 2\\] \\(0\\.\\d+s\\)"]);
 }
 
 - (void)test_Interval {