Added events to the other sections

Yapeal · Dec 22, 2014 · 3f0e8d1 · 3f0e8d1
1 parent c43d799
commit 3f0e8d1
Show file tree

Hide file tree

Showing 17 changed files with 250 additions and 130 deletions.
diff --git a/lib/Database/AbstractCommonEveApi.php b/lib/Database/AbstractCommonEveApi.php
@@ -49,7 +49,6 @@
 use Yapeal\Event\EveApiEvent;
 use Yapeal\Event\YapealEventDispatcherInterface;
 use Yapeal\Xml\EveApiPreserverInterface;
-use Yapeal\Xml\EveApiReadInterface;
 use Yapeal\Xml\EveApiReadWriteInterface;
 use Yapeal\Xml\EveApiRetrieverInterface;
 
@@ -114,8 +113,6 @@ public function autoMagic(
         ) {
             return;
         }
-        $this->getYed()
-             ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
         if (!$this->oneShot($data, $retrievers, $preservers, $interval)) {
             return;
         }
@@ -144,6 +141,8 @@ public function oneShot(
         if (!$this->gotApiLock($data)) {
             return false;
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_RETRIEVE, $data);
         $retrievers->retrieveEveApi($data);
         if ($data->getEveApiXml() === false) {
             $mess = sprintf(
@@ -172,11 +171,8 @@ public function oneShot(
             $preservers->preserveEveApi($data);
             return false;
         }
-        $event = $this->getYed()
-                      ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
-        if ($event->isChanged()) {
-            $data = $event->getData();
-        }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
         $preservers->preserveEveApi($data);
         // No need / way to preserve XML errors to the database with normal
         // preserveTo*.
@@ -274,12 +270,12 @@ protected function getXslName($apiName, $sectionName)
         return $xslName;
     }
     /**
-     * @param EveApiReadInterface $data
+     * @param EveApiReadWriteInterface $data
      *
      * @throws LogicException
      * @return bool
      */
-    protected function gotApiLock(EveApiReadInterface &$data)
+    protected function gotApiLock(EveApiReadWriteInterface &$data)
     {
         $sql = $this->getCsq()
                     ->getApiLock($data->getHash());
@@ -356,12 +352,12 @@ protected function isEveApiXmlError(
         return true;
     }
     /**
-     * @param EveApiReadInterface $data
+     * @param EveApiReadWriteInterface $data
      *
      * @throws LogicException
      * @return bool
      */
-    protected function isInvalid(EveApiReadInterface &$data)
+    protected function isInvalid(EveApiReadWriteInterface &$data)
     {
         $this->getLogger()
              ->debug('Started XSD validating');

diff --git a/lib/Database/Char/AbstractCharSection.php b/lib/Database/Char/AbstractCharSection.php
@@ -67,11 +67,8 @@ public function autoMagic(
         $interval
     )
     {
-        $event = $this->getYed()
-                      ->dispatchEveApiEvent(EveApiEvent::START, $data);
-        if ($event->isChanged()) {
-            $data = $event->getData();
-        }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::START, $data);
         $this->getLogger()
              ->debug(
                  sprintf(
@@ -100,14 +97,6 @@ public function autoMagic(
             $data->setEveApiArguments($char)
                  ->setEveApiXml();
             $untilInterval = $interval;
-            $event = $this->getYed()
-                          ->dispatchEveApiEvent(
-                              EveApiEvent::PRE_PRESERVER,
-                              $data
-                          );
-            if ($event->isChanged()) {
-                $data = $event->getData();
-            }
             if (!$this->oneShot(
                 $data,
                 $retrievers,
@@ -117,14 +106,8 @@ public function autoMagic(
             ) {
                 continue;
             }
-            $event = $this->getYed()
-                          ->dispatchEveApiEvent(
-                              EveApiEvent::POST_PRESERVER,
-                              $data
-                          );
-            if ($event->isChanged()) {
-                $data = $event->getData();
-            }
+            $this->getYed()
+                 ->dispatchEveApiEvent(EveApiEvent::POST_PRESERVER, $data);
             $this->updateCachedUntil(
                 $data->getEveApiXml(),
                 $untilInterval,
@@ -154,6 +137,8 @@ public function oneShot(
             return false;
         }
         $charID = $data->getEveApiArgument('characterID');
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_RETRIEVE, $data);
         $retrievers->retrieveEveApi($data);
         if ($data->getEveApiXml() === false) {
             $mess = sprintf(
@@ -166,17 +151,11 @@ public function oneShot(
                  ->notice($mess);
             return false;
         }
-        $event = $this->getYed()
-                      ->dispatchEveApiEvent(EveApiEvent::PRE_TRANSFORM, $data);
-        if ($event->isChanged()) {
-            $data = $event->getData();
-        }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_TRANSFORM, $data);
         $this->xsltTransform($data);
-        $event = $this->getYed()
-                      ->dispatchEveApiEvent(EveApiEvent::PRE_VALIDATE, $data);
-        if ($event->isChanged()) {
-            $data = $event->getData();
-        }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_VALIDATE, $data);
         if ($this->isInvalid($data)) {
             $mess = sprintf(
                 'The data retrieved from Eve API %1$s/%2$s for %3$s is invalid',
@@ -190,11 +169,8 @@ public function oneShot(
             $preservers->preserveEveApi($data);
             return false;
         }
-        $event = $this->getYed()
-                      ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
-        if ($event->isChanged()) {
-            $data = $event->getData();
-        }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
         $preservers->preserveEveApi($data);
         // No need / way to preserve XML errors to the database with normal
         // preserve.

diff --git a/lib/Database/Char/IndustryJobs.php b/lib/Database/Char/IndustryJobs.php
@@ -64,12 +64,14 @@ public function autoMagic(
         /**
          * Update Industry Jobs History
          */
-        $class = new IndustryJobsHistory(
+        (
+        new IndustryJobsHistory(
             $this->getPdo(),
             $this->getLogger(),
-            $this->getCsq()
-        );
-        $class->autoMagic($data, $retrievers, $preservers, $interval);
+            $this->getCsq(),
+            $this->getYed()
+        )
+        )->autoMagic($data, $retrievers, $preservers, $interval);
         parent::autoMagic($data, $retrievers, $preservers, $interval);
     }
     /**

diff --git a/lib/Database/Char/MailBodies.php b/lib/Database/Char/MailBodies.php
@@ -40,6 +40,7 @@
 use SimpleXMLIterator;
 use Yapeal\Database\AttributesDatabasePreserverTrait;
 use Yapeal\Database\EveApiNameTrait;
+use Yapeal\Event\EveApiEvent;
 use Yapeal\Xml\EveApiPreserverInterface;
 use Yapeal\Xml\EveApiReadWriteInterface;
 use Yapeal\Xml\EveApiRetrieverInterface;
@@ -65,6 +66,8 @@ public function autoMagic(
         $interval
     )
     {
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::START, $data);
         $this->getLogger()
              ->debug(
                  sprintf(
@@ -76,12 +79,13 @@ public function autoMagic(
         /**
          * Update MailMessages List
          */
-        $class = new MailMessages(
+        (
+        new MailMessages(
             $this->getPdo(),
             $this->getLogger(),
-            $this->getCsq()
-        );
-        $class->autoMagic($data, $retrievers, $preservers, $interval);
+            $this->getCsq(), $this->getYed()
+        )
+        )->autoMagic($data, $retrievers, $preservers, $interval);
         $active = $this->getActiveCharacters();
         if (empty($active)) {
             $this->getLogger()
@@ -110,14 +114,14 @@ public function autoMagic(
             $mailIDs = array_chunk($mailIDs, 1000);
             $untilInterval = $interval;
             foreach ($mailIDs as $mailGroup) {
-                $mailIDs = [];
+                $mails = [];
                 foreach ($mailGroup as $mail) {
-                    $mailIDs[] = $mail[0];
+                    $mails[] = $mail[0];
                 }
-                $mess = 'Mail IDs = ' . implode(',', $mailIDs);
+                $mess = 'Mails = ' . implode(',', $mails);
                 $this->getLogger()
                      ->debug($mess);
-                $char['ids'] = implode(',', $mailIDs);
+                $char['ids'] = implode(',', $mails);
                 $data->setEveApiArguments($char)
                      ->setEveApiXml();
                 $untilInterval = $interval;
@@ -130,6 +134,8 @@ public function autoMagic(
                 ) {
                     continue 2;
                 }
+                $this->getYed()
+                     ->dispatchEveApiEvent(EveApiEvent::POST_PRESERVER, $data);
                 if ($untilInterval > $interval) {
                     $untilInterval = $interval;
                 }
@@ -143,6 +149,8 @@ public function autoMagic(
                 $charID
             );
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::DONE, $data);
     }
     /**
      * @param string $ownerID

diff --git a/lib/Database/Corp/AbstractCorpSection.php b/lib/Database/Corp/AbstractCorpSection.php
@@ -39,6 +39,7 @@
 use PDOException;
 use Yapeal\Database\AbstractCommonEveApi;
 use Yapeal\Database\EveSectionNameTrait;
+use Yapeal\Event\EveApiEvent;
 use Yapeal\Xml\EveApiPreserverInterface;
 use Yapeal\Xml\EveApiReadWriteInterface;
 use Yapeal\Xml\EveApiRetrieverInterface;
@@ -64,6 +65,8 @@ public function autoMagic(
         $interval
     )
     {
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::START, $data);
         $this->getLogger()
              ->debug(
                  sprintf(
@@ -101,12 +104,16 @@ public function autoMagic(
             ) {
                 continue;
             }
+            $this->getYed()
+                 ->dispatchEveApiEvent(EveApiEvent::POST_PRESERVER, $data);
             $this->updateCachedUntil(
                 $data->getEveApiXml(),
                 $untilInterval,
                 $corp['corporationID']
             );
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::DONE, $data);
     }
     /**
      * @param EveApiReadWriteInterface $data
@@ -129,9 +136,8 @@ public function oneShot(
         }
         $corp = $data->getEveApiArguments();
         $corpID = $corp['corporationID'];
-        /**
-         * @type EveApiReadWriteInterface $data
-         */
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_RETRIEVE, $data);
         $retrievers->retrieveEveApi($data);
         if ($data->getEveApiXml() === false) {
             $mess = sprintf(
@@ -144,7 +150,11 @@ public function oneShot(
                  ->notice($mess);
             return false;
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_TRANSFORM, $data);
         $this->xsltTransform($data);
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_VALIDATE, $data);
         if ($this->isInvalid($data)) {
             $mess = sprintf(
                 'The data retrieved from Eve API %1$s/%2$s for %3$s is invalid',
@@ -158,6 +168,8 @@ public function oneShot(
             $preservers->preserveEveApi($data);
             return false;
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
         $preservers->preserveEveApi($data);
         // No need / way to preserve XML errors to the database with normal
         // preserve.

diff --git a/lib/Database/Corp/CorporationSheet.php b/lib/Database/Corp/CorporationSheet.php
@@ -38,6 +38,7 @@
 use Yapeal\Database\AttributesDatabasePreserverTrait;
 use Yapeal\Database\EveApiNameTrait;
 use Yapeal\Database\ValuesDatabasePreserverTrait;
+use Yapeal\Event\EveApiEvent;
 use Yapeal\Xml\EveApiPreserverInterface;
 use Yapeal\Xml\EveApiReadWriteInterface;
 use Yapeal\Xml\EveApiRetrieverInterface;
@@ -62,7 +63,8 @@ public function oneShot(
         EveApiRetrieverInterface $retrievers,
         EveApiPreserverInterface $preservers,
         &$interval
-    ) {
+    )
+    {
         if (!$this->gotApiLock($data)) {
             return false;
         }
@@ -73,9 +75,8 @@ public function oneShot(
             unset($corp['corporationID']);
             $data->setEveApiArguments($corp);
         }
-        /**
-         * @type EveApiReadWriteInterface $data
-         */
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_RETRIEVE, $data);
         $retrievers->retrieveEveApi($data);
         if ($data->getEveApiXml() === false) {
             $mess = sprintf(
@@ -88,7 +89,11 @@ public function oneShot(
                  ->notice($mess);
             return false;
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_TRANSFORM, $data);
         $this->xsltTransform($data);
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_VALIDATE, $data);
         if ($this->isInvalid($data)) {
             $mess = sprintf(
                 'The data retrieved from Eve API %1$s/%2$s for %3$s is invalid',
@@ -102,6 +107,8 @@ public function oneShot(
             $preservers->preserveEveApi($data);
             return false;
         }
+        $this->getYed()
+             ->dispatchEveApiEvent(EveApiEvent::PRE_PRESERVER, $data);
         $preservers->preserveEveApi($data);
         // No need / way to preserve XML errors to the database with normal
         // preserve.
@@ -117,10 +124,8 @@ public function oneShot(
      * @throws LogicException
      * @return bool
      */
-    protected function preserve(
-        $xml,
-        $ownerID
-    ) {
+    protected function preserve($xml, $ownerID)
+    {
         try {
             $this->getPdo()
                  ->beginTransaction();