From 26fd20b5800918e58bb1355173b9c169f671271a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Mon, 15 May 2023 10:30:23 +0000 Subject: [PATCH] Suggestion for quick device aliases fix --- src/Helpers/Build.php | 8 +++++++- src/Helpers/Builds.php | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Helpers/Build.php b/src/Helpers/Build.php index 17507e5..3c12759 100644 --- a/src/Helpers/Build.php +++ b/src/Helpers/Build.php @@ -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) { diff --git a/src/Helpers/Builds.php b/src/Helpers/Builds.php index 7749c45..470aa09 100644 --- a/src/Helpers/Builds.php +++ b/src/Helpers/Builds.php @@ -171,7 +171,12 @@ } $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; -- GitLab