ZIP Imports: Finished off core import logic

[bookstack] / app / Exports / Controllers / ImportController.php

diff --git a/app/Exports/Controllers/ImportController.php b/app/Exports/Controllers/ImportController.php
index a2389c725f3107785ed59848037391638125d705..4d2c83090a3af1cdad41fff01cf532c6a8338f1d 100644 (file)
--- a/app/Exports/Controllers/ImportController.php
+++ b/app/Exports/Controllers/ImportController.php
@@ -69,6 +69,7 @@ class ImportController extends Controller
 
         return view('exports.import-show', [
             'import' => $import,
+            'data' => $import->decodeMetadata(),
         ]);
     }
 
@@ -78,18 +79,21 @@ class ImportController extends Controller
         $import = $this->imports->findVisible($id);
         $parent = null;
 
-        if ($import->getType() === 'page' || $import->getType() === 'chapter') {
+        if ($import->type === 'page' || $import->type === 'chapter') {
             $data = $this->validate($request, [
                 'parent' => ['required', 'string']
             ]);
             $parent = $data['parent'];
         }
 
-        // TODO  - Run import
-           // TODO - Validate again before
-           // TODO - Check permissions before (create for main item, create for children, create for related items [image, attachments])
+        $entity = $this->imports->runImport($import, $parent);
+        if ($entity) {
+            $this->logActivity(ActivityType::IMPORT_RUN, $import);
+            return redirect($entity->getUrl());
+        }
         // TODO - Redirect to result
-        // TOOD - Or redirect back with errors
+        // TODO - Or redirect back with errors
+        return 'failed';
     }
 
     /**