Suggestion for quick device aliases fix (26fd20b5) · Commits · e / infra / LineageOTA

src/Helpers/Build.php

+7 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,13 @@

		$ret = false;

		if ($params['device'] == $this->model \|\| $params['device'] === "2e" && $this->model === "zirconia") {
		$deviceCodenames = [$this->model];
		// TODO: load aliases from build config
		if ($this->model === "2e") {
		$deviceCodenames[] = "zirconia"; // FIXME: or vice-versa?
		}

		if (in_array($params['device'], $deviceCodenames)) {
		if (count($params['channels']) > 0) {
		foreach ($params['channels'] as $channel) {
		if (strtolower($channel) == $this->channel) {

+7 −2

Original line number	Diff line number	Diff line
		@@ -172,6 +172,11 @@
		$device = isset($params['device']) ? $params['device'] : '';
		$channels = isset($params['channels']) ? $params['channels'][0] : '';

		$deviceCodenames = [$device];
		// TODO: load aliases from build config
		if ($device === "2e") {
		$deviceCodenames[] = "zirconia"; // FIXME: or vice-versa?
		}
		// Get physical paths of where the files resides
		$path = Flight::cfg()->get('realBasePath') . '/builds/full';

		@@ -186,7 +191,7 @@
		foreach ($files as $file) {
		// Skip all files except for the ones that match the pattern
		// filename starting with e- and ending with .zip are considered as valid files
		if (!preg_match("/^e-[0-9\.]+-(.)-$device\.zip$/i", $file) && !($device === "2e" && preg_match("/^e-[0-9\.]+-(.)-zirconia\.zip$/i", $file))) {
		if (!preg_match("/^e-[0-9\.]+-(.*)-(" . join($deviceCodenames, '\|') . ")\.zip$/i", $file)) {
		continue;
		}
		$build = null;