From f29b092a76c6dbf961ec3a7a5722729b9b1f882d Mon Sep 17 00:00:00 2001 From: Joel S Date: Fri, 22 Feb 2019 19:59:03 +0530 Subject: [PATCH 1/2] Fix-13911-occ-files-scan-elapsed-time Signed-off-by: Joel S --- apps/files/lib/Command/Scan.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index 4d83d76492..3c2ab716ce 100644 --- a/apps/files/lib/Command/Scan.php +++ b/apps/files/lib/Command/Scan.php @@ -289,10 +289,9 @@ class Scan extends Base { * @return string */ protected function formatExecTime() { - list($secs, ) = explode('.', sprintf("%.1f", $this->execTime)); - - # if you want to have microseconds add this: . '.' . $tens; - return date('H:i:s', $secs); + $secs = round($this->execTime); + # convert seconds into HH:MM:SS form + return sprintf('%02d:%02d:%02d', ($secs/3600),($secs/60%60), $secs%60); } /** From 27aafa77db2e133621c4e3755b4312cc7a96e063 Mon Sep 17 00:00:00 2001 From: Joel S Date: Fri, 22 Feb 2019 20:55:24 +0530 Subject: [PATCH 2/2] Fix occ files:scan-app-data elapsed time Signed-off-by: Joel S --- apps/files/lib/Command/Scan.php | 2 +- apps/files/lib/Command/ScanAppData.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index 3c2ab716ce..6950afd1f0 100644 --- a/apps/files/lib/Command/Scan.php +++ b/apps/files/lib/Command/Scan.php @@ -291,7 +291,7 @@ class Scan extends Base { protected function formatExecTime() { $secs = round($this->execTime); # convert seconds into HH:MM:SS form - return sprintf('%02d:%02d:%02d', ($secs/3600),($secs/60%60), $secs%60); + return sprintf('%02d:%02d:%02d', ($secs/3600), ($secs/60%60), $secs%60); } /** diff --git a/apps/files/lib/Command/ScanAppData.php b/apps/files/lib/Command/ScanAppData.php index 04c347afe6..244293ae70 100644 --- a/apps/files/lib/Command/ScanAppData.php +++ b/apps/files/lib/Command/ScanAppData.php @@ -216,10 +216,9 @@ class ScanAppData extends Base { * @return string */ protected function formatExecTime() { - list($secs, ) = explode('.', sprintf("%.1f", $this->execTime)); - - # if you want to have microseconds add this: . '.' . $tens; - return date('H:i:s', $secs); + $secs = round($this->execTime); + # convert seconds into HH:MM:SS form + return sprintf('%02d:%02d:%02d', ($secs/3600), ($secs/60%60), $secs%60); } /**