Fixed some issues in import, should improve results for #701

This commit is contained in:
James Cole
2017-07-14 06:41:47 +02:00
parent 970c73c221
commit 3c4abb7b60
6 changed files with 111 additions and 5 deletions

View File

@@ -119,8 +119,6 @@ class CacheProperties
$this->md5 .= json_encode($property);
}
Log::debug(sprintf('Cache string is %s', $this->md5));
$this->md5 = md5($this->md5);
Log::debug(sprintf('Cache MD5 is %s', $this->md5));
}
}

View File

@@ -92,7 +92,9 @@ class Map implements ConfigurationInterface
}
foreach ($this->data as $index => $entry) {
$this->data[$index]['values'] = array_unique($this->data[$index]['values']);
asort($this->data[$index]['values']);
}
// save number of rows, thus number of steps, in job:
$steps = $rowIndex * 5;
$extended = $this->job->extended_status;

View File

@@ -19,6 +19,7 @@ use Crypt;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction;
use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Support\Collection;
/**
@@ -248,6 +249,21 @@ class Steam
return $value;
}
/**
* @param $value
*
* @return mixed
*/
public function tryDecrypt($value)
{
try {
$value = Crypt::decrypt($value);
} catch (DecryptException $e) {
// do not care.
}
return $value;
}
/**
* @param array $accounts