kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new code for the import routine part 2

Browse Source
This commit is contained in:
James Cole
2017-12-16 17:19:10 +01:00
parent 84b6708260
commit 66ee382da0
32 changed files with 351 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,18 +125,22 @@ class ImportJobRepository implements ImportJobRepositoryInterface
}
/**
* @param ImportJob $job
* @param UploadedFile $file
* @param ImportJob $job
* @param null|UploadedFile $file
*
* @return mixed
* @return bool
* @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
*/
public function processFile(ImportJob $job, UploadedFile $file): bool
public function processFile(ImportJob $job, ?UploadedFile $file): bool
{
if (is_null($file)) {
return false;
}
/** @var UserRepositoryInterface $repository */
$repository = app(UserRepositoryInterface::class);
$newName = sprintf('%s.upload', $job->key);
$uploaded = new SplFileObject($file->getRealPath());
$content = $uploaded->fread($uploaded->getSize());
$content = trim($uploaded->fread($uploaded->getSize()));
$contentEncrypted = Crypt::encrypt($content);
$disk = Storage::disk('upload');
@@ -171,8 +175,12 @@ class ImportJobRepository implements ImportJobRepositoryInterface
*/
public function setConfiguration(ImportJob $job, array $configuration): ImportJob
{
$job->configuration = $configuration;
Log::debug(sprintf('Incoming config for job "%s" is: ', $job->key), $configuration);
$currentConfig = $job->configuration;
$newConfig = array_merge($currentConfig, $configuration);
$job->configuration = $newConfig;
$job->save();
Log::debug(sprintf('Set config of job "%s" to: ', $job->key), $newConfig);
return $job;
}

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

@@ -54,12 +54,12 @@ interface ImportJobRepositoryInterface
public function processConfiguration(ImportJob $job, UploadedFile $file): bool;
/**
* @param ImportJob $job
* @param UploadedFile $file
* @param ImportJob $job
* @param null|UploadedFile $file
*
* @return mixed
* @return bool
*/
public function processFile(ImportJob $job, UploadedFile $file): bool;
public function processFile(ImportJob $job, ?UploadedFile $file): bool;
/**
* @param ImportJob $job