Homepage|BuildRepository: Refactor AbstractPackage hierarchy moving i…

…BuilderProduct upward The iBuilderProduct inteface defines the functionality of an object which represents a package (or some other resource) produced by the autobuilder. Previously this interface was implemented by AbstractUnstablePackage rather than AbstractPackage (meaning on the former objects could be instantiated using the build log parser).
skyjake · Mar 16, 2012 · 66f2c4b · 66f2c4b
1 parent 74dd179
commit 66f2c4b
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 68 deletions.
diff --git a/web/plugins/buildrepository/buildlogparser.class.php b/web/plugins/buildrepository/buildlogparser.class.php
@@ -104,11 +104,7 @@ private static function parseBuildLogDOM(&$log, &$builds)
                         try
                         {
                             $pack = PackageFactory::newFromSimpleXMLElement($child, $build->releaseTypeId());
-
-                            if($build->releaseTypeId() !== RT_STABLE)
-                            {
-                                $pack->setBuildUniqueId($build->uniqueId());
-                            }
+                            $pack->setBuildUniqueId($build->uniqueId());
 
                             $build->addPackage($pack);
                         }

diff --git a/web/plugins/buildrepository/packages/abstractpackage.class.php b/web/plugins/buildrepository/packages/abstractpackage.class.php
@@ -27,29 +27,57 @@
 
 require_once('basepackage.class.php');
 require_once(dirname(__FILE__) . '/../downloadable.interface.php');
+require_once(dirname(__FILE__) . '/../builderproduct.interface.php');
 
-abstract class AbstractPackage extends BasePackage implements iDownloadable
+abstract class AbstractPackage extends BasePackage implements iDownloadable, iBuilderProduct
 {
     static protected $emptyString = '';
 
     protected $directDownloadUri = NULL;
 
-    public function __construct($platformId=PID_ANY, $title=NULL, $version=NULL, $directDownloadUri=NULL)
+    protected $buildId = 0; /// Unique.
+
+    protected $compileLogUri;
+    protected $compileWarnCount;
+    protected $compileErrorCount;
+
+    public function __construct($platformId=PID_ANY, $title=NULL, $version=NULL, $directDownloadUri=NULL,
+        $compileLogUri=NULL, $compileWarnCount=0, $compileErrorCount=0)
     {
         parent::__construct($platformId, $title, $version);
 
         if(!is_null($directDownloadUri) && strlen($directDownloadUri) > 0)
             $this->directDownloadUri = "$directDownloadUri";
+
+        if(!is_null($compileLogUri))
+            $this->compileLogUri = "$compileLogUri";
+
+        $this->compileWarnCount  = intval($compileWarnCount);
+        $this->compileErrorCount = intval($compileErrorCount);
     }
 
     // Extends implementation in AbstractPackage.
     public function populateGraphTemplate(&$tpl)
     {
+        global $FrontController;
+
         if(!is_array($tpl))
             throw new Exception('Invalid template argument, array expected');
 
         parent::populateGraphTemplate($tpl);
+
         $tpl['direct_download_uri'] = $this->directDownloadUri();
+
+        $build = $FrontController->findPlugin('BuildRepository')->buildByUniqueId($this->buildId);
+        if($build instanceof BuildEvent)
+        {
+            $tpl['build_startdate'] = date(DATE_ATOM, $build->startDate());
+            $tpl['build_uniqueid'] = $this->buildId;
+        }
+
+        $tpl['compile_loguri'] = $this->compileLogUri;
+        $tpl['compile_errorcount'] = $this->compileErrorCount;
+        $tpl['compile_warncount'] = $this->compileWarnCount;
     }
 
     // Implements iDownloadable
@@ -84,4 +112,34 @@ public function genDownloadBadge()
         }
         return $html;
     }
+
+    // Implements iBuilderProduct.
+    public function setBuildUniqueId($id)
+    {
+        $this->buildId = intval($id);
+    }
+
+    // Implements iBuilderProduct.
+    public function buildUniqueId()
+    {
+        return $this->buildId;
+    }
+
+    // Implements iBuilderProduct.
+    public function &compileLogUri()
+    {
+        return $this->compileLogUri;
+    }
+
+    // Implements iBuilderProduct.
+    public function compileWarnCount()
+    {
+        return $this->compileWarnCount;
+    }
+
+    // Implements iBuilderProduct.
+    public function compileErrorCount()
+    {
+        return $this->compileErrorCount;
+    }
 }
diff --git a/web/plugins/buildrepository/packages/abstractunstablepackage.class.php b/web/plugins/buildrepository/packages/abstractunstablepackage.class.php
@@ -26,28 +26,9 @@
 includeGuard('AbstractUnstablePackage');
 
 require_once('abstractpackage.class.php');
-require_once(dirname(__FILE__) . '/../builderproduct.interface.php');
 
-abstract class AbstractUnstablePackage extends AbstractPackage implements iBuilderProduct
+abstract class AbstractUnstablePackage extends AbstractPackage
 {
-    protected $buildId = 0; /// Unique.
-
-    protected $compileLogUri;
-    protected $compileWarnCount;
-    protected $compileErrorCount;
-
-    public function __construct($platformId=PID_ANY, $title=NULL, $version=NULL,
-        $downloadUri=NULL, $compileLogUri=NULL, $compileWarnCount=0, $compileErrorCount=0)
-    {
-        parent::__construct($platformId, $title, $version, $downloadUri);
-
-        if(!is_null($compileLogUri))
-            $this->compileLogUri = "$compileLogUri";
-
-        $this->compileWarnCount  = intval($compileWarnCount);
-        $this->compileErrorCount = intval($compileErrorCount);
-    }
-
     // Override implementation in AbstractPackage.
     public function composeFullTitle($includeVersion=true, $includePlatformName=true, $includeBuildId=true)
     {
@@ -77,46 +58,5 @@ public function populateGraphTemplate(&$tpl)
 
         parent::populateGraphTemplate($tpl);
         $tpl['is_unstable'] = true;
-
-        $build = $FrontController->findPlugin('BuildRepository')->buildByUniqueId($this->buildId);
-        if($build instanceof BuildEvent)
-        {
-            $tpl['build_startdate'] = date(DATE_ATOM, $build->startDate());
-            $tpl['build_uniqueid'] = $this->buildId;
-        }
-
-        $tpl['compile_loguri'] = $this->compileLogUri;
-        $tpl['compile_errorcount'] = $this->compileErrorCount;
-        $tpl['compile_warncount'] = $this->compileWarnCount;
-    }
-
-    // Implements iBuilderProduct.
-    public function setBuildUniqueId($id)
-    {
-        $this->buildId = intval($id);
-    }
-
-    // Implements iBuilderProduct.
-    public function buildUniqueId()
-    {
-        return $this->buildId;
-    }
-
-    // Implements iBuilderProduct.
-    public function &compileLogUri()
-    {
-        return $this->compileLogUri;
-    }
-
-    // Implements iBuilderProduct.
-    public function compileWarnCount()
-    {
-        return $this->compileWarnCount;
-    }
-
-    // Implements iBuilderProduct.
-    public function compileErrorCount()
-    {
-        return $this->compileErrorCount;
     }
 }