cleanup, add pretty-print

fdncred · fdncred · commit b611da8aaf1f · 2023-05-08T12:26:37.000-05:00
diff --git a/crates/nu-std/lib/dt.nu b/crates/nu-std/lib/dt.nu
@@ -8,7 +8,6 @@ def borrow-year [from: record, current: record] {
 }
 
 def leap-year-days [year] {
-    # ($year mod 4) == 0 and (($year mod 100 != 0) or ($year mod 400 == 0))
     if $year mod 400 == 0  {
         29
     } else if $year mod 4 == 0 and $year mod 100 != 0 {
@@ -34,7 +33,6 @@ def borrow-month [from: record, current: record] {
         }
     } else {
         # oh February
-        # let num_days_feb = if $current.from mod 400 == 0 { 29 } else if $current.from mod 4 == 0 and $current.from mod 100 != 0 { 29 } else { 28 }
         let num_days_feb = (leap-year-days $current.year)
         $current.day = $current.day + $num_days_feb
         $current.month = $current.month - 1
@@ -152,10 +150,77 @@ export def datetime-diff [from: datetime, to: datetime] {
     }
 
     $result.millisecond = ($result.nanosecond / 1_000_000 | into int) # don't want a decimal
-    $result.microsecond = (($result.nanosecond mod 1_000_000) / 1_000)
-    $result.nanosecond = ($result.nanosecond mod 1_000)
+    $result.microsecond = (($result.nanosecond mod 1_000_000) / 1_000 | into int)
+    $result.nanosecond = ($result.nanosecond mod 1_000 | into int)
 
     $result
 }
 
+export def pretty-print-duration [dur: duration] {
+    mut result = ""
+    if $dur.year > 0 {
+        if $dur.year > 1 {
+            $result = $"($dur.year)yrs "
+        } else {
+            $result = $"($dur.year)yr "
+        }
+    }
+    if $dur.month > 0 {
+        if $dur.month > 1 {
+            $result = $"($result)($dur.month)months "
+        } else {
+            $result = $"($result)($dur.month)month "
+        }
+    }
+    if $dur.day > 0 {
+        if $dur.day > 1 {
+            $result = $"($result)($dur.day)days "
+        } else {
+            $result = $"($result)($dur.day)day "
+        }
+    }
+    if $dur.hour > 0 {
+        if $dur.hour > 1 {
+            $result = $"($result)($dur.hour)hrs "
+        } else {
+            $result = $"($result)($dur.hour)hr "
+        }
+    }
+    if $dur.minute > 0 {
+        if $dur.minute > 1 {
+            $result = $"($result)($dur.minute)mins "
+        } else {
+            $result = $"($result)($dur.minute)min "
+        }
+    }
+    if $dur.second > 0 {
+        if $dur.second > 1 {
+            $result = $"($result)($dur.second)secs "
+        } else {
+            $result = $"($result)($dur.second)sec "
+        }
+    }
+    if $dur.millisecond > 0 {
+        if $dur.millisecond > 1 {
+            $result = $"($result)($dur.millisecond)ms "
+        } else {
+            $result = $"($result)($dur.millisecond)ms "
+        }
+    }
+    if $dur.microsecond > 0 {
+        if $dur.microsecond > 1 {
+            $result = $"($result)($dur.microsecond)µs "
+        } else {
+            $result = $"($result)($dur.microsecond)µs "
+        }
+    }
+    if $dur.nanosecond > 0 {
+        if $dur.nanosecond > 1 {
+            $result = $"($result)($dur.nanosecond)ns "
+        } else {
+            $result = $"($result)($dur.nanosecond)ns "
+        }
+    }
 
+    $result
+}
diff --git a/crates/nu-std/lib/mod.nu b/crates/nu-std/lib/mod.nu
@@ -9,7 +9,7 @@ export use iter *
 export use log *
 export use testing *
 export use xml *
-export use dt datetime-diff
+export use dt [datetime-diff, pretty-print-duration]
 
 # Add the given paths to the PATH.
 #
@@ -172,7 +172,7 @@ def "from ns" [] {
 # >
 # ```
 #
-# > **Note**  
+# > **Note**
 # > `std bench --pretty` will return a `string`.
 #
 # # Examples
@@ -244,7 +244,7 @@ Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nush
 Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)
 
 It's been this long since (ansi green)Nushell(ansi reset)'s first commit:
-(($dt).year)yr (($dt).month)month (($dt).day)day (($dt).hour)hr (($dt).minute)min (($dt).second)sec (($dt).millisecond)ms (($dt).microsecond)µs
+(pretty-print-duration $dt)
 
 Startup Time: ($nu.startup-time)
 "

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export use iter *`
`9`	`9`	`export use log *`
`10`	`10`	`export use testing *`
`11`	`11`	`export use xml *`
`12`		`-export use dt datetime-diff`
	`12`	`+export use dt [datetime-diff, pretty-print-duration]`
`13`	`13`
`14`	`14`	`# Add the given paths to the PATH.`
`15`	`15`	`#`
`@@ -172,7 +172,7 @@ def "from ns" [] {`
`172`	`172`	`# >`
`173`	`173`	# ```
`174`	`174`	`#`
`175`		`-# > Note`
	`175`	`+# > Note`
`176`	`176`	# > `std bench --pretty` will return a `string`.
`177`	`177`	`#`
`178`	`178`	`# # Examples`
`@@ -244,7 +244,7 @@ Our (ansi green)Documentation(ansi reset) is located at (ansi green)https://nush`
`244`	`244`	`Learn how to remove this at: (ansi green)https://nushell.sh/book/configuration.html#remove-welcome-message(ansi reset)`
`245`	`245`
`246`	`246`	`It's been this long since (ansi green)Nushell(ansi reset)'s first commit:`
`247`		`-(($dt).year)yr (($dt).month)month (($dt).day)day (($dt).hour)hr (($dt).minute)min (($dt).second)sec (($dt).millisecond)ms (($dt).microsecond)µs`
	`247`	`+(pretty-print-duration $dt)`
`248`	`248`
`249`	`249`	`Startup Time: ($nu.startup-time)`
`250`	`250`	`"`