Re-work independent 40 branch packages using sub dir instead of prefix

Author: iMattPro

composer/repository.php

@@ -153,8 +153,9 @@ public function set_release(array $packages, $composer_json, $download_url, $con
 	 *
 	 * @param string $name		File name
 	 * @param array $packages	Packages to be dumped
+	 * @param string $subdir	Optional subdirectory
 	 */
-	public function dump_include($name, array $packages)
+	public function dump_include($name, array $packages, $subdir = '')
 	{
 		foreach ($packages as $package_name => $versions)
 		{
@@ -164,24 +165,27 @@ public function dump_include($name, array $packages)
 			array('packages' => $packages),
 			JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
 		);
-		$file = $this->build_dir . $name;
+		$target_dir = $this->build_dir . $subdir;
+		if ($subdir && !$this->fs->exists($target_dir))
+		{
+			$this->fs->mkdir($target_dir);
+		}
+		$file = $target_dir . $name;
 		$this->fs->dumpFile($file, $packages);
 	}
 
 	/**
 	 * Get include files.
 	 *
-	 * @param string $prefix Optional prefix to filter files
 	 * @return Finder
 	 */
-	protected function get_include_files($prefix = '')
+	protected function get_include_files()
 	{
 		$finder = new Finder;
-		$pattern = $prefix ? '/^packages\-' . preg_quote($prefix, '/') . '[a-z]+\-\d+\.json$/' : '/^packages\-[a-z]+\-\d+\.json$/';
 		$finder
 			->files()
 			->depth('== 0')
-			->name($pattern)
+			->name('/^packages\-[a-z]+\-\d+\.json$/')
 			->in($this->build_dir)
 		;
 
@@ -197,23 +201,29 @@ protected function build_parents()
 		$branches = ext::get_filtered_repository_branches();
 		foreach ($branches as $branch)
 		{
-			$this->build_parent_structure($branch . '-');
+			$this->build_parent_structure($branch . '/');
 		}
 	}
 
 	/**
-	 * Build parent structure for given prefix
+	 * Build parent structure for given subdirectory
 	 *
-	 * @param string $prefix Optional prefix for files
+	 * @param string $subdir Optional subdirectory
 	 */
-	protected function build_parent_structure($prefix = '')
+	protected function build_parent_structure($subdir = '')
 	{
-		$includes = $this->get_include_files($prefix);
+		$includes = $this->get_include_files();
 		$parent = $types = array();
+		$target_dir = $this->build_dir . $subdir;
+		
+		if ($subdir && !$this->fs->exists($target_dir))
+		{
+			$this->fs->mkdir($target_dir);
+		}
 
 		foreach ($includes as $file)
 		{
-			$type = $this->get_include_type($file->getFilename(), $prefix);
+			$type = $this->get_include_type($file->getFilename());
 
 			if ($type)
 			{
@@ -229,8 +239,8 @@ protected function build_parent_structure($prefix = '')
 
 		foreach ($types as $type => $includes)
 		{
-			$type_filename = $prefix ? 'packages-' . $prefix . $type . '.json' : 'packages-' . $type . '.json';
-			$type_filepath = $this->build_dir . $type_filename;
+			$type_filename = 'packages-' . $type . '.json';
+			$type_filepath = $target_dir . $type_filename;
 			$contents = json_encode(array('includes' => $includes));
 			$this->fs->dumpFile($type_filepath, $contents);
 
@@ -240,26 +250,23 @@ protected function build_parent_structure($prefix = '')
 		}
 		if (!empty($parent))
 		{
-			$main_filename = $prefix ? 'packages-' . rtrim($prefix, '-') . '.json' : 'packages.json';
 			$contents = json_encode(array('includes' => $parent));
-			$this->fs->dumpFile($this->build_dir . $main_filename, $contents);
+			$this->fs->dumpFile($target_dir . 'packages.json', $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, $prefix = '')
+	protected function get_include_type($filename)
 	{
 		$filename = utf8_basename($filename);
 		$match = array();
-		$pattern = $prefix ? '/^packages\-' . preg_quote($prefix, '/') . '([a-z]+)\-\d+\.json$/' : '/^packages\-([a-z]+)\-\d+\.json$/';
 
-		if (preg_match($pattern, $filename, $match))
+		if (preg_match('/^packages\-([a-z]+)\-\d+\.json$/', $filename, $match))
 		{
 			return $match[1];
 		}

config/routes/general.yml

@@ -66,11 +66,11 @@ phpbb.titania.contribution.id:
 
 phpbb.titania.composer.40.files:
     path: /composer/40/{filename}.json
-    defaults: { _controller: phpbb.titania.controller.composer:serve_file }
+    defaults: { _controller: phpbb.titania.controller.composer:serve_file, subdirectory: '40/' }
 
 phpbb.titania.composer.40:
     path: /composer/40/
-    defaults: { _controller: phpbb.titania.controller.composer:serve_file, filename: packages-40 }
+    defaults: { _controller: phpbb.titania.controller.composer:serve_file, filename: packages, subdirectory: '40/' }
 
 phpbb.titania.composer:
     path: /composer/{filename}.json

controller/composer.php

@@ -44,20 +44,21 @@ public function __construct(\phpbb\user $user, \phpbb\titania\controller\helper
 	* Serve composer's files.
 	*
 	* @param string $filename	Filename to serve (without extension)
+	* @param string $subdirectory	Optional subdirectory
 	* @return \Symfony\Component\HttpFoundation\Response
 	*/
-	public function serve_file($filename)
+	public function serve_file($filename, $subdirectory = '')
 	{
-		if (strpos($filename, '..') !== false)
+		if (strpos($filename, '..') !== false || strpos($subdirectory, '..') !== false)
 		{
 			throw new http_exception(404, 'NO_PAGE_FOUND');
 		}
 
-		$filename = $this->titania_root_path . 'composer_packages/prod/' . $filename . '.json';
+		$filepath = $this->titania_root_path . 'composer_packages/prod/' . $subdirectory . $filename . '.json';
 
 		try
 		{
-			return new BinaryFileResponse($filename, 200);
+			return new BinaryFileResponse($filepath, 200);
 		}
 		catch (\Exception $e)
 		{

manage/tool/composer/rebuild_repo.php

@@ -322,13 +322,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
+	 * @param int $branch		Optional branch number for subdirectory
 	 */
-	protected function dump_include($type, $group, array $packages, $prefix = '')
+	protected function dump_include($type, $group, array $packages, $branch = null)
 	{
 		$type_name = $this->types->get($type)->name;
-		$filename = $prefix ? "packages-$prefix-$type_name-$group.json" : "packages-$type_name-$group.json";
-		$this->repo->dump_include($filename, $packages);
+		$subdir = $branch ? $branch . '/' : '';
+		$this->repo->dump_include("packages-$type_name-$group.json", $packages, $subdir);
 	}
 
 	/**