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

Some better feedback in the import process.

Browse Source
This commit is contained in:
James Cole
2016-08-13 14:22:40 +02:00
parent c4d6aaeef3
commit ef876a165a
8 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Import/ImportStorage.php
View File

@@ -53,15 +53,20 @@ class ImportStorage
}
/**
*
* @return Collection
*/
public function store()
public function store(): Collection
{
$collection = new Collection;
Log::notice(sprintf('Started storing %d entry(ies).', $this->entries->count()));
foreach ($this->entries as $index => $entry) {
Log::debug(sprintf('--- import store start for row %d ---', $index));
$this->storeSingle($index, $entry);
$result = $this->storeSingle($index, $entry);
$collection->put($index, $result);
}
Log::notice(sprintf('Finished storing %d entry(ies).', $collection->count()));
return $collection;
}
/**
@@ -200,10 +205,10 @@ class ImportStorage
private function storeSingle(int $index, ImportEntry $entry): ImportResult
{
if ($entry->valid === false) {
Log::error(sprintf('Cannot import row %d, because valid=false', $index));
Log::warning(sprintf('Cannot import row %d, because valid=false', $index));
$result = new ImportResult();
$result->failed();
$result->appendError(sprintf('Cannot import row %d, because valid=false', $index));
$result->appendError(sprintf('Cannot import row %d, because the current line is not valid.', $index));
return $result;
}
@@ -242,6 +247,13 @@ class ImportStorage
$this->storeCategory($journal, $entry);
$this->storeBill($journal, $entry);
$result = new ImportResult();
$result->success();
$result->appendMessage(sprintf('Journal titled "%s" imported.', $journal->description));
$result->setJournal($journal);
return $result;
}
}