Add public methods to collect NITs

phpbg · Mar 10, 2019 · 6d32ae4 · 6d32ae4
1 parent 848b108
commit 6d32ae4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Context/GlobalContext.php b/src/Context/GlobalContext.php
@@ -57,6 +57,14 @@ public function addNit(Nit $nit)
         }
     }
 
+    /**
+     * @return NitAggregator[]
+     */
+    public function getNitAggregators(): array
+    {
+        return $this->nitByNetworks;
+    }
+
     public function addEit(Eit $eit)
     {
         if ($eit->currentNextIndicator !== 1) {

diff --git a/src/Context/NitAggregator.php b/src/Context/NitAggregator.php
@@ -44,6 +44,8 @@ class NitAggregator
 
     protected $version;
 
+    protected $lastSectionNumber;
+
     /**
      * Aggregate a new EIT
      *
@@ -63,19 +65,31 @@ public function add(Nit $nit): bool
         if (!isset($this->version) || $nit->versionNumber > $this->version || ($nit->versionNumber === 0 && $this->version === 31)) {
             // Version update (or initial collection of nit)
             $this->version = $nit->versionNumber;
+            $this->lastSectionNumber = $nit->lastSectionNumber;
             $this->segments = [];
         }
         if (!isset($this->segments[$nit->sectionNumber])) {
             $this->segments[$nit->sectionNumber] = $nit;
         }
-        if (count($this->segments) >= $nit->lastSectionNumber + 1) {
+        return $this->isComplete();
+    }
+
+    /**
+     * Return true if all NIT segments have been aggregated
+     * @return bool
+     */
+    public function isComplete(): bool
+    {
+        if (!isset($this->lastSectionNumber)) {
+            return false;
+        }
+        if (count($this->segments) >= $this->lastSectionNumber + 1) {
             // NIT aggregation is complete
             return true;
         }
         return false;
     }
 
-
     public function __toString()
     {
         $str = '';