Build a separate phpbb4 only repository list in addition to a complete list

Author: iMattPro

composer/repository.php

@@ -15,6 +15,7 @@
 
 use phpbb\config\config;
 use phpbb\exception\runtime_exception;
+use phpbb\titania\ext;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 
@@ -170,15 +171,17 @@ public function dump_include($name, array $packages)
 	/**
 	 * Get include files.
 	 *
+	 * @param string $prefix Optional prefix to filter files
 	 * @return Finder
 	 */
-	protected function get_include_files()
+	protected function get_include_files($prefix = '')
 	{
 		$finder = new Finder;
+		$pattern = $prefix ? '/^packages\-' . preg_quote($prefix, '/') . '[a-z]+\-\d+\.json$/' : '/^packages\-[a-z]+\-\d+\.json$/';
 		$finder
 			->files()
 			->depth('== 0')
-			->name('/^packages\-[a-z]+\-\d+\.json$/')
+			->name($pattern)
 			->in($this->build_dir)
 		;
 
@@ -190,12 +193,23 @@ protected function get_include_files()
 	 */
 	protected function build_parents()
 	{
-		$includes = $this->get_include_files();
+		$this->build_parent_structure();
+		$this->build_parent_structure(ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH . '-');
+	}
+
+	/**
+	 * Build parent structure for given prefix
+	 *
+	 * @param string $prefix Optional prefix for files
+	 */
+	protected function build_parent_structure($prefix = '')
+	{
+		$includes = $this->get_include_files($prefix);
 		$parent = $types = array();
 
 		foreach ($includes as $file)
 		{
-			$type = $this->get_include_type($file->getFilename());
+			$type = $this->get_include_type($file->getFilename(), $prefix);
 
 			if ($type)
 			{
@@ -211,7 +225,7 @@ protected function build_parents()
 
 		foreach ($types as $type => $includes)
 		{
-			$type_filename = 'packages-' . $type . '.json';
+			$type_filename = $prefix ? 'packages-' . $prefix . $type . '.json' : 'packages-' . $type . '.json';
 			$type_filepath = $this->build_dir . $type_filename;
 			$contents = json_encode(array('includes' => $includes));
 			$this->fs->dumpFile($type_filepath, $contents);
@@ -222,23 +236,26 @@ protected function build_parents()
 		}
 		if (!empty($parent))
 		{
+			$main_filename = $prefix ? 'packages-' . rtrim($prefix, '-') . '.json' : 'packages.json';
 			$contents = json_encode(array('includes' => $parent));
-			$this->fs->dumpFile($this->build_dir . 'packages.json', $contents);
+			$this->fs->dumpFile($this->build_dir . $main_filename, $contents);
 		}
 	}
 
 	/**
 	 * Get contrib type name from include file name.
 	 *
 	 * @param string $filename
+	 * @param string $prefix Optional prefix to match
 	 * @return bool|string Returns contrib type name or false if not a valid filename
 	 */
-	protected function get_include_type($filename)
+	protected function get_include_type($filename, $prefix = '')
 	{
 		$filename = utf8_basename($filename);
 		$match = array();
+		$pattern = $prefix ? '/^packages\-' . preg_quote($prefix, '/') . '([a-z]+)\-\d+\.json$/' : '/^packages\-([a-z]+)\-\d+\.json$/';
 
-		if (preg_match('/^packages\-([a-z]+)\-\d+\.json$/', $filename, $match))
+		if (preg_match($pattern, $filename, $match))
 		{
 			return $match[1];
 		}

manage/tool/composer/rebuild_repo.php

@@ -108,13 +108,10 @@ public function get_total()
 
 			$sql = 'SELECT COUNT(r.revision_id) AS cnt
 				FROM ' . $this->contribs_table . ' c, ' .
-				$this->revisions_table . ' r, ' .
-				$this->revisions_phpbb_table . ' rp
+				$this->revisions_table . ' r
 				WHERE c.contrib_id = r.contrib_id
-					AND r.revision_id = rp.revision_id
 					AND c.contrib_status = ' . ext::TITANIA_CONTRIB_APPROVED . '
 					AND r.revision_status = ' . ext::TITANIA_REVISION_APPROVED . '
-					AND rp.phpbb_version_branch >= ' . ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH . '
 					AND ' . $this->db->sql_in_set('c.contrib_type', $types);
 			$this->db->sql_query($sql);
 			$this->total = (int) $this->db->sql_fetchfield('cnt');
@@ -146,7 +143,7 @@ protected function get_batch($fetch_attach_data)
 		}
 
 		$sql = 'SELECT c.contrib_id, c.contrib_name_clean, c.contrib_type, r.revision_id,
-				r.attachment_id, r.revision_composer_json' . $attach_fields . '
+				r.attachment_id, r.revision_composer_json, rp.phpbb_version_branch' . $attach_fields . '
 			FROM ' . $this->contribs_table . ' c, ' .
 			$this->revisions_table . ' r, ' .
 			$this->revisions_phpbb_table . ' rp ' .
@@ -156,7 +153,6 @@ protected function get_batch($fetch_attach_data)
 			$attach_where . '
 				AND c.contrib_status = ' . ext::TITANIA_CONTRIB_APPROVED . '
 				AND r.revision_status = ' . ext::TITANIA_REVISION_APPROVED . '
-				AND rp.phpbb_version_branch >= ' . ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH . '
 				AND ' . $this->db->sql_in_set('c.contrib_type', $types) . '
 			ORDER BY c.contrib_id ASC, r.revision_id ASC';
 		$result = $this->db->sql_query_limit($sql, $this->limit, $this->start);
@@ -201,6 +197,7 @@ public function run($from_file = false, $force = false, $progress = null)
 
 		$last_type = $last_contrib = '';
 		$packages = array();
+		$packages_phpbb4_only = array();
 
 		foreach ($batch as $contrib_id => $revisions)
 		{
@@ -255,6 +252,17 @@ public function run($from_file = false, $force = false, $progress = null)
 					$download_url,
 					$contrib_url
 				);
+
+				if ($revision['phpbb_version_branch'] >= ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH)
+				{
+					$packages_phpbb4_only = $this->repo->set_release(
+						$packages_phpbb4_only,
+						$revision['revision_composer_json'],
+						$download_url,
+						$contrib_url
+					);
+				}
+
 				unset($batch[$contrib_id][$index]);
 			}
 
@@ -266,15 +274,18 @@ public function run($from_file = false, $force = false, $progress = null)
 			if (($group_count % 50) === 0)
 			{
 				$this->dump_include($last_type, $group, $packages);
+				$this->dump_include($last_type, $group, $packages_phpbb4_only, ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH);
 				$group_count = 0;
 				$group++;
 				$packages = array();
+				$packages_phpbb4_only = array();
 			}
 			$group_count++;
 		}
 		if (!empty($packages))
 		{
 			$this->dump_include($last_type, $group, $packages);
+			$this->dump_include($last_type, $group, $packages_phpbb4_only, ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH);
 		}
 
 		$next_batch = $this->limit ? $this->start + $this->limit : $this->get_total();
@@ -297,11 +308,13 @@ public function run($from_file = false, $force = false, $progress = null)
 	 * @param string $type		Contrib type name
 	 * @param int $group		Group id
 	 * @param array $packages	Packages
+	 * @param string $suffix	Optional suffix for filename
 	 */
-	protected function dump_include($type, $group, array $packages)
+	protected function dump_include($type, $group, array $packages, $prefix = '')
 	{
 		$type_name = $this->types->get($type)->name;
-		$this->repo->dump_include("packages-$type_name-$group.json", $packages);
+		$filename = $prefix ? "packages-$prefix-$type_name-$group.json" : "packages-$type_name-$group.json";
+		$this->repo->dump_include($filename, $packages);
 	}
 
 	/**