FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace importer with AJAX powered; better error handling #443 (#447)

Browse Source 
* Replace importer with AJAX powered; better error handling #443

* Formatting

* Fix command line importer
This commit is contained in:
Nabeel S
2019-12-02 09:57:35 -05:00
committed by GitHub
parent 50dc79bc8d
commit 68eff40753
31 changed files with 544 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/Installer/Console/Commands/ImportFromClassicCommand.php
View File

@@ -4,8 +4,6 @@ namespace Modules\Installer\Console\Commands;
use App\Contracts\Command;
use Illuminate\Support\Facades\Log;
use Modules\Installer\Exceptions\ImporterNextRecordSet;
use Modules\Installer\Exceptions\StageCompleted;
use Modules\Installer\Services\Importer\ImporterService;
class ImportFromClassicCommand extends Command
@@ -29,24 +27,13 @@ class ImportFromClassicCommand extends Command
$importerSvc = new ImporterService();
$importerSvc->saveCredentials($creds);
$manifest = $importerSvc->generateImportManifest();
$stage = 'stage1';
$start = 0;
while (true) {
foreach ($manifest as $record) {
try {
$importerSvc->run($stage, $start);
} catch (ImporterNextRecordSet $e) {
Log::info('More records, starting from '.$e->nextOffset);
$start = $e->nextOffset;
} catch (StageCompleted $e) {
$stage = $e->nextStage;
$start = 0;
Log::info('Stage '.$stage.' completed, moving to '.$e->nextStage);
if ($e->nextStage === 'complete') {
break;
}
$importerSvc->run($record['importer'], $record['start']);
} catch (\Exception $e) {
Log::error($e->getMessage());
}
}
}