← All changes | includes/Core/Importer/Import.php +36 -45 3.1.10 → 3.2.4 View file →

		@@ -2,24 +2,24 @@
2	2
3	3	namespace Templately\Core\Importer;
4	4
5	5	use Exception;
	6	+use Templately\Core\Importer\Runners\Attachments;
6	7	use Templately\Core\Importer\Runners\BaseRunner;
7	8	use Templately\Core\Importer\Runners\Customizer;
	9	+use Templately\Core\Importer\Runners\Dependencies;
8	10	use Templately\Core\Importer\Runners\ElementorContent;
9	11	use Templately\Core\Importer\Runners\ExtraContent;
10	12	use Templately\Core\Importer\Runners\Finalizer;
11	13	use Templately\Core\Importer\Runners\GutenbergContent;
	14	+use Templately\Core\Importer\Runners\Loop;
12	15	use Templately\Core\Importer\Runners\Templates;
13	16	use Templately\Core\Importer\Runners\WPContent;
14	17
15	18	class Import {
16	19	use LogHelper;
	20	+ use Loop;
17	21
18		- /**
19		- * @var FullSiteImport
20		- */
21		- public $full_site_import;
22	22
23	23	/**
24	24	* @var array
25	25	*/
		@@ -25,8 +25,10 @@
25	25	*/
26	26	private $manifest;
27	27
28	28	private $runners;
	29	+ private $request_params;
	30	+ private $session_id;
29	31
30	32	private $imported_data = [];
31	33
32	34	/**
		@@ -31,13 +33,13 @@
31	33
32	34	/**
33	35	* @throws Exception
34	36	*/
35		- public function __construct( $full_site_import ) {
36		- $this->full_site_import = $full_site_import;
	37	+ public function __construct( $args ) {
	38	+ $this->request_params = $args;
	39	+ $this->manifest = $args['manifest'];
	40	+ $this->session_id = $args['session_id'];
37	41
38		- $this->manifest = $full_site_import->manifest;
39		-
40	42	$this->register_runners();
41	43	}
42	44
43	45	/**
		@@ -45,38 +47,42 @@
45	47	*/
46	48	private function register_runners() {
47	49	$this->runners = [
48	50	// TODO: Site Settings Import Runner
49		- new Customizer( $this->full_site_import ),
50		- new ExtraContent( $this->full_site_import ),
51		- new Templates( $this->full_site_import ),
52		- new GutenbergContent( $this->full_site_import ),
53		- new ElementorContent( $this->full_site_import ),
54		- new WPContent( $this->full_site_import ),
55		- new Finalizer( $this->full_site_import )
	51	+ new Dependencies( $this->request_params ),
	52	+ new Attachments( $this->request_params ),
	53	+ new Customizer( $this->request_params ),
	54	+ new ExtraContent( $this->request_params ),
	55	+ new Templates( $this->request_params ),
	56	+ new GutenbergContent( $this->request_params ),
	57	+ new ElementorContent( $this->request_params ),
	58	+ new WPContent( $this->request_params ),
	59	+ new Finalizer( $this->request_params )
56	60	];
57	61	}
58	62
59	63	public function run( $callable = null ): array {
60		- $data = $this->full_site_import->get_request_params();
61		- $progress = $this->full_site_import->get_progress();
	64	+ $data = $this->request_params;
62	65
63	66	// Get the cached imported_data
64		- $this->imported_data = $data['imported_data'] ?? [];
	67	+ // $this->imported_data = $data['imported_data'] ?? [];
65	68
66	69	/**
67	70	* @var BaseRunner $runner
68	71	*/
69		- foreach ( $this->runners as $id => $runner ) {
70		- $import = null;
71		- // If the template has been processed, skip it
72		- if (in_array($id, $progress)) {
73		- continue;
74		- }
	72	+ $imported_data = $this->loop( $this->runners, function($id, $runner, $imported_data ) use($data) {
	73	+ $import = [];
	74	+
75	75	try{
76		- if ( $runner->should_run( $data, $this->imported_data ) ) {
77		- $import = $runner->import( $data, $this->imported_data );
78		- $this->imported_data = array_merge_recursive( $this->imported_data, $import );
	76	+ if ( $runner->should_run( $data, $imported_data ) ) {
	77	+ $progress = $this->get_progress();
	78	+ if(!in_array($runner->get_name(), $progress)){
	79	+ $runner->log( 0 );
	80	+ $progress[] = $runner->get_name();
	81	+ $this->update_progress( $progress);
	82	+ }
	83	+ $import = $runner->import( $data, $imported_data );
	84	+ $imported_data = array_merge_recursive( $imported_data, $import );
79	85
80	86	if( $runner->get_name() != 'finalize' ) {
81	87	$runner->log( 100 );
82	88	} else {
		@@ -86,27 +92,12 @@
86	92	}catch (Exception $e){
87	93	error_log($e->getMessage());
88	94	}
89	95
90		- // Update the progress
91		- $progress[] = $id;
92		- $this->full_site_import->update_progress($progress, $import);
	96	+ return $imported_data;
	97	+ }, null, true);
93	98
94		- if(end($this->runners) !== $runner) {
95		- // $_runner = $this->runners[$id + 1];
96		- // if($_runner){
97		- // $_runner->log();
98		- // }
99		- $this->sse_message( [
100		- 'type' => 'continue',
101		- 'action' => 'continue',
102		- 'results' => $runner->get_label(),
103		- ] );
104		- exit;
105		- }
106		- }
107		-
108		- return $this->imported_data;
	99	+ return $imported_data;
109	100	}
110	101
111	102	public function get_runners() {
112	103	return $this->runners;