← All changes | includes/Core/Importer/Import.php +41 -26 3.0.3 → 3.4.1 View file →

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