Made filtered repository branching scalable

Author: iMattPro

composer/repository.php

@@ -194,7 +194,11 @@ protected function get_include_files($prefix = '')
 	protected function build_parents()
 	{
 		$this->build_parent_structure();
-		$this->build_parent_structure(ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH . '-');
+		$branches = ext::get_filtered_repository_branches();
+		foreach ($branches as $branch)
+		{
+			$this->build_parent_structure($branch . '-');
+		}
 	}
 
 	/**

config/routes/general.yml

@@ -64,14 +64,14 @@ phpbb.titania.contribution.id:
     requirements:
         id: \d+
 
-phpbb.titania.composer:
-    path: /composer/{filename}.json
-    defaults: { _controller: phpbb.titania.controller.composer:serve_file }
-
 phpbb.titania.composer.40:
   path: /composer/40/
   defaults: { _controller: phpbb.titania.controller.composer:serve_file, filename: packages-40 }
 
+phpbb.titania.composer:
+    path: /composer/{filename}.json
+    defaults: { _controller: phpbb.titania.controller.composer:serve_file }
+
 phpbb.titania.category:
     path: /{category1}/{category2}/{category3}/{category4}
     defaults: { _controller: phpbb.titania.controller.index:display_category, category2: '', category3: '', category4: '' }

ext.php

@@ -95,5 +95,14 @@ class ext extends \phpbb\extension\base
 
 	// Misc
 	const TITANIA_CONFIG_PREFIX = 'titania_';
-	const TITANIA_REPOSITORY_MIN_PHPBB_BRANCH = 40;
+
+	/**
+	 * Get filtered repository branch versions
+	 *
+	 * @return array Array of branch numbers to create filtered repositories for
+	 */
+	public static function get_filtered_repository_branches(): array
+	{
+		return [40];
+	}
 }

manage/tool/composer/rebuild_repo.php

@@ -197,7 +197,12 @@ public function run($from_file = false, $force = false, $progress = null)
 
 		$last_type = $last_contrib = '';
 		$packages = array();
-		$packages_phpbb4_only = array();
+		$filtered_packages = array();
+		$branches = ext::get_filtered_repository_branches();
+		foreach ($branches as $branch)
+		{
+			$filtered_packages[$branch] = array();
+		}
 
 		foreach ($batch as $contrib_id => $revisions)
 		{
@@ -253,14 +258,17 @@ public function run($from_file = false, $force = false, $progress = null)
 					$contrib_url
 				);
 
-				if ($revision['phpbb_version_branch'] >= ext::TITANIA_REPOSITORY_MIN_PHPBB_BRANCH)
+				foreach ($filtered_packages as $branch => $packages_data)
 				{
-					$packages_phpbb4_only = $this->repo->set_release(
-						$packages_phpbb4_only,
-						$revision['revision_composer_json'],
-						$download_url,
-						$contrib_url
-					);
+					if ($revision['phpbb_version_branch'] >= $branch)
+					{
+						$filtered_packages[$branch] = $this->repo->set_release(
+							$filtered_packages[$branch],
+							$revision['revision_composer_json'],
+							$download_url,
+							$contrib_url
+						);
+					}
 				}
 
 				unset($batch[$contrib_id][$index]);
@@ -274,18 +282,24 @@ 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);
+				foreach ($filtered_packages as $branch => $packages_data)
+				{
+					$this->dump_include($last_type, $group, $packages_data, $branch);
+					$filtered_packages[$branch] = array();
+				}
 				$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);
+			foreach ($filtered_packages as $branch => $packages_data)
+			{
+				$this->dump_include($last_type, $group, $packages_data, $branch);
+			}
 		}
 
 		$next_batch = $this->limit ? $this->start + $this->limit : $this->get_total();