From 8c654dd544d1f1e8d7a27f2e2041d739a575220e Mon Sep 17 00:00:00 2001 From: MarquandT Date: Mon, 27 Sep 2021 14:58:28 +0200 Subject: [PATCH] Modules errors --- src/Entity/Result.php | 7 ++++++- src/Service/Modules.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Entity/Result.php b/src/Entity/Result.php index 5c05478..74036d9 100644 --- a/src/Entity/Result.php +++ b/src/Entity/Result.php @@ -17,8 +17,13 @@ public function __construct(Webspider $webspider) { $this->config = $webspider->config; $this->crawler = $webspider->crawler; $this->modules = $webspider->crawler->modules; - unset($webspider->crawler->modules); $this->errors = $webspider->errors; + foreach ($this->modules ?? [] as $modules): + foreach ($modules ?? [] as $module): + $this->errors = array_merge($this->errors, $module['errors'] ?? []); + endforeach; + endforeach; + unset($webspider->crawler->modules); } /** diff --git a/src/Service/Modules.php b/src/Service/Modules.php index 57643bb..049f582 100644 --- a/src/Service/Modules.php +++ b/src/Service/Modules.php @@ -31,7 +31,7 @@ public function run(Scraper $scraper) { $module->header = $scraper->webpage->getHeader(); $results[$module->name][] = $module->run(); if (!empty($module->errors)): - $this->errors[$module->name][] = $module->errors; + $results[$module->name]['errors'] = array_merge($results['errors'] ?? [], $module->errors ?? []); endif; $scraper->webpage->getBody()->setContent(""); // Reset body content for memory optimization. }