Вывод времени миграции

Author: garr1nch4

admin/main.php

@@ -7,7 +7,7 @@
 
 $request = \Bitrix\Main\Application::getInstance()->getContext()->getRequest();
 $apply = false;
-
+$timeFormatter = new \WS\ReduceMigrations\TimeFormatter($localization->getDataByPath('timeLang'));
 if ($request->get('rollback')) {
     $module->rollbackLastBatch();
     $apply = true;
@@ -37,7 +37,19 @@
 
     foreach ($lastSetupLog->getAppliedLogs() as $appliedLog) {
         $appliedLog->isFailed() && $errorFixes[] = $appliedLog;
-        !$appliedLog->isFailed() && $appliedFixes[$appliedLog->getName()]++;
+        if (!$appliedLog->isFailed()) {
+            if (isset($appliedFixes[$appliedLog->getName()])) {
+                $appliedFixes[$appliedLog->getName()] = array(
+                    'time' => $appliedFixes[$appliedLog->getName()]['time'] + $appliedLog->getTime(),
+                    'count' =>  $appliedFixes[$appliedLog->getName()]['count'] + 1
+                );
+            } else {
+                $appliedFixes[$appliedLog->getName()] = array(
+                    'time' => $appliedLog->getTime(),
+                    'count' =>  1
+                );
+            }
+        }
     }
 }
 //--------------------------------------------------------------------------
@@ -103,9 +115,7 @@
     if (isset($scenarios[\WS\ReduceMigrations\Scenario\ScriptScenario::PRIORITY_OPTIONAL])) {
         $form->AddCheckBoxField('skipOptional', $localization->message('skipOptional'), false, 'Y', false);
     }
-    $form->AddViewField('time', $localization->message('approximatelyTime'), $localization->message('time', array(
-        '#time#' => $notAppliedScenarios->getApproximateTime()
-    )));
+    $form->AddViewField('time', $localization->message('approximatelyTime'), $timeFormatter->format($notAppliedScenarios->getApproximateTime()));
 }
 //--------------------
 if ($lastSetupLog) {
@@ -120,9 +130,11 @@
         <td width="30%" valign="top"><b><?= $localization->getDataByPath('appliedList') ?>:</b></td>
         <td width="70%">
             <ol style="list-style-type: none; padding-left: 0px; margin-top: 0px;">
-                <? foreach ($appliedFixes as $fixName => $fixCount):
+                <? foreach ($appliedFixes as $fixName => $item):
+                    $fixCount = $item['count'];
+                    $time = $item['time'];
                 ?>
-                    <li><?= $fixName ?> <?= $fixCount > 1 ? '['.$fixCount.']' : '' ?></li>
+                    <li><?= $fixName ?> <?= $fixCount > 1 ? '['.$fixCount.']' : '' ?> (<?=$timeFormatter->format($time)?>)</li>
                 <?endforeach; ?>
             </ol>
         </tr>

lang/en/admin.php

@@ -15,7 +15,10 @@
         'errorList' => 'Unsuccessful applied migrations',
         'appliedList' => 'Successful applied migrations',
         'approximatelyTime' => 'Approximately time of migrations',
-        'time' => '#time# sec',
+        'timeLang' => [
+            'minutes' => 'min',
+            'seconds' => 'sec'
+        ],
         'btnRollback' => 'Undo last change',
         'btnApply' => 'Apply',
         'lastSetup' => array(

lang/ru/admin.php

@@ -15,7 +15,10 @@
         'errorList' => 'Ошибки',
         'appliedList' => 'Список обновлений',
         'approximatelyTime' => 'Примерное время применения миграций:',
-        'time' => '#time# сек.',
+        'timeLang' => [
+            'minutes' => 'мин.',
+            'seconds' => 'сек.'
+        ],
         'btnRollback' => 'Отменить последнее обновление',
         'btnApply' => 'Обновить',
         'lastSetup' => array(

lang/ru/menu.php

@@ -4,6 +4,6 @@
     'title' => 'Reduce Migrations',
     'apply' => 'Обновление',
     'log' => 'Журнал обновлений',
-    'createScenario' => 'Сценарий обновления',
+    'createScenario' => 'Новый сценарий обновления',
     'diagnostic' => 'Диагностика'
 );

lib/console/console.php

@@ -10,7 +10,7 @@
 use WS\ReduceMigrations\Console\Command\ListCommand;
 use WS\ReduceMigrations\Console\Command\RollbackCommand;
 use WS\ReduceMigrations\Console\Formatter\Output;
-use WS\ReduceMigrations\Console\Formatter\Time;
+use WS\ReduceMigrations\TimeFormatter;
 
 class Console {
     const OUTPUT_ERROR = 'error';
@@ -29,7 +29,7 @@ class Console {
     private $progressOutput;
     /** @var  Output */
     private $defaultOutput;
-    /** @var Time  */
+    /** @var TimeFormatter  */
     private $timeFormatter;
 
     public function __construct($args) {
@@ -53,7 +53,10 @@ public function __construct($args) {
         $this->errorOutput = new Output('red');
         $this->progressOutput = new Output('yellow');
         $this->defaultOutput = new Output();
-        $this->timeFormatter = new Time();
+        $this->timeFormatter = new TimeFormatter(array(
+            'minutes' => 'min',
+            'seconds' => 'sec'
+        ));
     }
 
     /**

lib/console/formatter/time.php renamed to lib/timeformatter.php

@@ -1,21 +1,32 @@
 <?php
 
-namespace WS\ReduceMigrations\Console\Formatter;
+namespace WS\ReduceMigrations;
 
 
-class Time {
+class TimeFormatter {
     const SECONDS_PRECISION = 3;
     const MINUTES_PRECISION = 2;
     const SECONDS_THRESHOLD_VALUE = 100;
     const SECONDS_IN_MINUTE = 60;
 
+    private $lang;
+
+    /**
+     * Time constructor.
+     *
+     * @param array $lang - ['minutes'=> 'min', 'seconds' => 'sec']
+     */
+    public function __construct($lang) {
+        $this->lang = $lang;
+    }
+
     public function format($initialTime) {
         $time = round($initialTime, self::SECONDS_PRECISION);
         if ($time >= self::SECONDS_THRESHOLD_VALUE) {
             $time = round($time / self::SECONDS_IN_MINUTE, self::MINUTES_PRECISION);
-            $time = sprintf('%s min', $time);
+            $time = sprintf('%s %s', $time, $this->lang['minutes']);
         } else {
-            $time = sprintf('%s sec', $time);
+            $time = sprintf('%s %s', $time, $this->lang['seconds']);
         }
         return $time;
     }