kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Massive rewrite for import routine, part 1.

Browse Source
This commit is contained in:
James Cole
2017-12-16 08:03:35 +01:00
parent 985cc100e2
commit 84b6708260
34 changed files with 671 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Repositories/ImportJob/ImportJobRepository.php
View File

@@ -42,20 +42,16 @@ class ImportJobRepository implements ImportJobRepositoryInterface
private $user;
/**
* @param string $fileType
* @param string $type
*
* @return ImportJob
*
* @throws FireflyException
*/
public function create(string $fileType): ImportJob
public function create(string $type): ImportJob
{
$count = 0;
$fileType = strtolower($fileType);
$keys = array_keys(config('firefly.import_formats'));
if (!in_array($fileType, $keys)) {
throw new FireflyException(sprintf('Cannot use type "%s" for import job.', $fileType));
}
$count = 0;
$type = strtolower($type);
while ($count < 30) {
$key = Str::random(12);
@@ -63,10 +59,10 @@ class ImportJobRepository implements ImportJobRepositoryInterface
if (null === $existing->id) {
$importJob = new ImportJob;
$importJob->user()->associate($this->user);
$importJob->file_type = $fileType;
$importJob->file_type = $type;
$importJob->key = Str::random(12);
$importJob->status = 'new';
$importJob->configuration = [];
$importJob->configuration = config(sprintf('import.default_config.%s', $type)) ?? [];
$importJob->extended_status = [
'steps' => 0,
'done' => 0,
@@ -80,8 +76,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface
}
++$count;
}
return new ImportJob;
throw new FireflyException('Could not create an import job with a unique key after 30 tries.');
}
/**

4
app/Repositories/ImportJob/ImportJobRepositoryInterface.php
View File

@@ -32,11 +32,11 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
interface ImportJobRepositoryInterface
{
/**
* @param string $fileType
* @param string $type
*
* @return ImportJob
*/
public function create(string $fileType): ImportJob;
public function create(string $type): ImportJob;
/**
* @param string $key