Better time output

alexdima · alexdima · commit 35ffdf5fa547 · 2019-02-12T20:45:54.000+01:00
diff --git a/build/lib/task.js b/build/lib/task.js
@@ -13,16 +13,7 @@ function _isPromise(p) {
     return false;
 }
 function _renderTime(time) {
-    if (time < 1000) {
-        return `${time.toFixed(2)} ms`;
-    }
-    let seconds = time / 1000;
-    if (seconds < 60) {
-        return `${seconds.toFixed(1)} s`;
-    }
-    let minutes = Math.floor(seconds / 60);
-    seconds -= minutes * 60;
-    return `${minutes} m and ${seconds} s`;
+    return `${Math.round(time)} ms`;
 }
 async function _execute(task) {
     const name = task.taskName || task.displayName || `<anonymous>`;
@@ -34,7 +25,7 @@ async function _execute(task) {
     const elapsedArr = process.hrtime(startTime);
     const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
     if (!task._tasks) {
-        fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.green(_renderTime(elapsedNanoseconds / 1e6)));
+        fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.magenta(_renderTime(elapsedNanoseconds / 1e6)));
     }
 }
 async function _doExecute(task) {
diff --git a/build/lib/task.ts b/build/lib/task.ts
@@ -33,16 +33,7 @@ function _isPromise(p: Promise<void> | NodeJS.ReadWriteStream): p is Promise<voi
 }
 
 function _renderTime(time: number): string {
-	if (time < 1000) {
-		return `${time.toFixed(2)} ms`;
-	}
-	let seconds = time / 1000;
-	if (seconds < 60) {
-		return `${seconds.toFixed(1)} s`;
-	}
-	let minutes = Math.floor(seconds / 60);
-	seconds -= minutes * 60;
-	return `${minutes} m and ${seconds} s`;
+	return `${Math.round(time)} ms`;
 }
 
 async function _execute(task: Task): Promise<void> {
@@ -55,7 +46,7 @@ async function _execute(task: Task): Promise<void> {
 	const elapsedArr = process.hrtime(startTime);
 	const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
 	if (!task._tasks) {
-		fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.green(_renderTime(elapsedNanoseconds / 1e6)));
+		fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.magenta(_renderTime(elapsedNanoseconds / 1e6)));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,7 @@ function _isPromise(p: Promise<void> \| NodeJS.ReadWriteStream): p is Promise<voi`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`function _renderTime(time: number): string {`
`36`		`- if (time < 1000) {`
`37`		- return `${time.toFixed(2)} ms`;
`38`		`- }`
`39`		`- let seconds = time / 1000;`
`40`		`- if (seconds < 60) {`
`41`		- return `${seconds.toFixed(1)} s`;
`42`		`- }`
`43`		`- let minutes = Math.floor(seconds / 60);`
`44`		`- seconds -= minutes * 60;`
`45`		- return `${minutes} m and ${seconds} s`;
	`36`	+ return `${Math.round(time)} ms`;
`46`	`37`	`}`
`47`	`38`
`48`	`39`	`async function _execute(task: Task): Promise<void> {`
`@@ -55,7 +46,7 @@ async function _execute(task: Task): Promise<void> {`
`55`	`46`	`const elapsedArr = process.hrtime(startTime);`
`56`	`47`	`const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);`
`57`	`48`	`if (!task._tasks) {`
`58`		- fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.green(_renderTime(elapsedNanoseconds / 1e6)));
	`49`	+ fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.magenta(_renderTime(elapsedNanoseconds / 1e6)));
`59`	`50`	`}`
`60`	`51`	`}`
`61`	`52`