kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Refactor and rename some import things.

Browse Source
This commit is contained in:
James Cole
2017-06-17 22:49:44 +02:00
parent 7cc24417b3
commit b9f110ac2b
10 changed files with 707 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/ImportController.php
View File

@@ -17,6 +17,8 @@ use FireflyIII\Http\Requests\ImportUploadRequest;
use FireflyIII\Import\Configurator\ConfiguratorInterface;
use FireflyIII\Import\FileProcessor\FileProcessorInterface;
use FireflyIII\Import\ImportProcedureInterface;
use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Storage\ImportStorage;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
@@ -26,6 +28,7 @@ use Illuminate\Http\Response as LaravelResponse;
use Illuminate\Support\Collection;
use Log;
use Response;
use Validator;
use View;
/**
@@ -87,7 +90,7 @@ class ImportController extends Controller
public function download(ImportJob $job)
{
Log::debug('Now in download()', ['job' => $job->key]);
$config = $job->configuration;
$config = $job->configuration;
// TODO this is CSV import specific:
$config['column-roles-complete'] = false;
@@ -95,8 +98,8 @@ class ImportController extends Controller
$config['initial-config-complete'] = false;
$config['delimiter'] = $config['delimiter'] === "\t" ? 'tab' : $config['delimiter'];
$result = json_encode($config, JSON_PRETTY_PRINT);
$name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));
$result = json_encode($config, JSON_PRETTY_PRINT);
$name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\'));
/** @var LaravelResponse $response */
$response = response($result, 200);
@@ -230,23 +233,15 @@ class ImportController extends Controller
/**
* @param ImportJob $job
*
* @return string
*/
public function start(ImportJob $job)
{
$objects = new Collection();
$type = $job->file_type;
$class = config(sprintf('firefly.import_processors.%s', $type));
/** @var FileProcessorInterface $processor */
$processor = app($class);
$processor->setJob($job);
set_time_limit(0);
if ($job->status == 'configured') {
$processor->run();
$objects = $processor->getObjects();
}
// once done, use storage thing to actually store them:
$routine = new ImportRoutine($job);
$routine->run();
return 'ok dan';
}
/**