Fixed: duration parsing

kevinpapst · Mar 15, 2023 · 6043440 · 6043440
1 parent 8d682cf
commit 6043440
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.5
+
+Compatibility: requires minimum Kimai 2.0.9
+
+- Fixed: duration parsing
+
 ## 2.1.4
 
 Compatibility: requires minimum Kimai 2.0.9

diff --git a/Importer/AbstractTimesheetImporter.php b/Importer/AbstractTimesheetImporter.php
@@ -99,9 +99,6 @@ public function importRow(Duration $durationParser, ImportData $data, ImportRow
         try {
             $record = $row->getData();
 
-            if (!\array_key_exists('Duration', $record)) {
-                $record['Duration'] = 0;
-            }
             if (!\array_key_exists('Tags', $record)) {
                 $record['Tags'] = '';
             }
@@ -156,13 +153,11 @@ public function importRow(Duration $durationParser, ImportData $data, ImportRow
             $begin = null;
             $end = null;
             $duration = 0;
+            $foundDuration = null;
 
-            if (!empty($record['Duration'])) {
-                if (\is_int($record['Duration'])) {
-                    $duration = $record['Duration'];
-                } else {
-                    $duration = $durationParser->parseDurationString($record['Duration']);
-                }
+            if (!empty($record['Duration']) && \is_string($record['Duration'])) {
+                $duration = $this->parseDuration($durationParser, $record['Duration']);
+                $foundDuration = $duration;
             }
 
             $timezone = new \DateTimeZone($user->getTimezone());
@@ -246,6 +241,12 @@ public function importRow(Duration $durationParser, ImportData $data, ImportRow
             $timesheet->setDescription($record['Description']);
             $timesheet->setExported($this->convertBoolean($record['Exported']));
 
+            if ($foundDuration !== null) {
+                $timesheet->setDuration($foundDuration);
+            } else {
+                $timesheet->setDuration($timesheet->getDuration());
+            }
+
             if (!empty($record['Tags'])) {
                 foreach (explode(',', $record['Tags']) as $tagName) {
                     if (empty($tagName)) {
@@ -282,6 +283,16 @@ public function importRow(Duration $durationParser, ImportData $data, ImportRow
         $data->addRow($row);
     }
 
+    protected function parseDuration(Duration $durationParser, string $duration): int
+    {
+        // we expect plain seconds
+        if (is_numeric($duration) && !str_contains($duration, '.') && !str_contains($duration, ',')) {
+            return (int) $duration;
+        }
+
+        return $durationParser->parseDurationString($duration);
+    }
+
     abstract protected function createImportData(ImportRow $row): ImportData;
 
     /**

diff --git a/Importer/ClockifyTimesheetImporter.php b/Importer/ClockifyTimesheetImporter.php
@@ -120,4 +120,9 @@ public function importRow(Duration $durationParser, ImportData $data, ImportRow
 
         parent::importRow($durationParser, $data, new ImportRow($values), $dryRun);
     }
+
+    protected function parseDuration(Duration $durationParser, string $duration): int
+    {
+        return $durationParser->parseDurationString($duration);
+    }
 }
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "A Kimai plugin to import data from CSV files via Web UI",
     "homepage": "https://www.kimai.org/store/keleo-importer-bundle.html",
     "type": "kimai-plugin",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "keywords": [
         "kimai",
         "kimai-plugin"