Support FuelLog's encoded with semicolon as delimiter

Author: mrblur

lib/fuelioimporter/providers/fuellogprovider.class.php

@@ -20,6 +20,8 @@ class FuellogProvider implements IConverter
     protected $selected_vehicle = null;
     /** @var string|null Output filename */
     protected $output_filename = null;
+    /** @var string Delimiter used in CSV parser */
+    private $delimiter = ',';
 
     public function getName()
     {
@@ -75,13 +77,13 @@ public function processFile(\SplFileObject $in, $form_data)
         // Prepare output generator
         $out = new FuelioBackupBuilder();
 
-        $line = $in->fgetcsv();
+        $line = $in->fgetcsv($this->delimiter);
         if ($line[0] !== '## vehicles') {
             throw new InvalidFileFormatException();
         }
 
         // Import vehicles
-        $this->selected_vehicle = intval($form_data['vehicle_id'], 10) - 1;
+        $this->selected_vehicle = (int)$form_data['vehicle_id'] - 1;
         if ($this->selected_vehicle < 0) {
             $this->selected_vehicle = null; // Autoselect
         }
@@ -96,6 +98,21 @@ public function processFile(\SplFileObject $in, $form_data)
         return $out;
     }
 
+    protected function detectDelimiter(\SplFileObject $in)
+    {
+        $pos  = $in->ftell();
+        $line = $in->fgetcsv($this->delimiter);
+        if ($line[0] !== 'make') {
+            $this->delimiter = ';';
+            $in->fseek($pos);
+            $line = $in->fgetcsv($this->delimiter);
+            if ($line[0] !== 'make') {
+                throw new InvalidFileFormatException();
+            }
+        }
+        $in->fseek($pos);
+    }
+
     /**
      * Reads vehicles from Fuel Log's export
      * @param \SplFileObject $in
@@ -106,12 +123,14 @@ public function processFile(\SplFileObject $in, $form_data)
     protected function processVehicles(\SplFileObject $in, FuelioBackupBuilder $out)
     {
         // "make","model","note","distance","volume","consumption"
-        $header = $in->fgetcsv();
+        $this->detectDelimiter($in);
+        $header = $in->fgetcsv($this->delimiter);
+
         if ($header[0] !== 'make' || count($header) < 6) {
             throw new InvalidFileFormatException();
         }
         do {
-            if (!($line = $in->fgetcsv()) || strpos($line[0], '#', 0) === 0) {
+            if (!($line = $in->fgetcsv($this->delimiter)) || strpos($line[0], '#', 0) === 0) {
                 break;
             }
             $key = $line[0] . '.' . $line[1];
@@ -163,15 +182,15 @@ protected function processVehicles(\SplFileObject $in, FuelioBackupBuilder $out)
     protected function processFillups(\SplFileObject $in, FuelioBackupBuilder $out)
     {
         // "make","model","date","mileage","fuel","price","partial","note"
-        $header = $in->fgetcsv();
+        $header = $in->fgetcsv($this->delimiter);
         if ($header[0] !== 'make' || count($header) !== 8) {
             throw new InvalidFileFormatException();
         }
 
         $out->writeFuelLogHeader();
 
         do {
-            $data = $in->fgetcsv();
+            $data = $in->fgetcsv($this->delimiter);
             if (!$data) {
                 continue;
             }
@@ -200,7 +219,7 @@ protected function processCosts(\SplFileObject $in, FuelioBackupBuilder $out) {
             return; // Turns out costs are optional in file, so skip if we are at its end
         }
 
-        $header = $in->fgetcsv();
+        $header = $in->fgetcsv($this->delimiter);
         if ($header[0] !== 'make' || count($header) !== 8) {
             throw new InvalidFileFormatException();
         }
@@ -213,7 +232,7 @@ protected function processCosts(\SplFileObject $in, FuelioBackupBuilder $out) {
         $out->writeCoststHeader();
 
         do {
-            $data = $in->fgetcsv();
+            $data = $in->fgetcsv($this->delimiter);
             if (!$data) {
                 continue;
             }