Compare commits

..

2 Commits

Author SHA1 Message Date
22e344bdf2 Simplify latest build number retrieval function 2026-01-14 13:58:53 +01:00
0774988365 Fix Windows CPC OS names.
Doubled build number in the name is Microsoft's fault and I can't be bothered to make a hackfix that.
2026-01-14 13:51:59 +01:00

View File

@@ -34,20 +34,13 @@ function uupApiPrivateParseFlags($str) {
} }
function uupApiPrivateGetLatestBuild() { function uupApiPrivateGetLatestBuild() {
$builds = array('22000.1');
$ids = uupListIds(); $ids = uupListIds();
if(isset($ids['error'])) {
$ids['builds'] = array(); if(!isset($ids['builds']) || empty($ids['builds'])) {
return '26100.1';
} }
if(empty($ids['builds'])) { return $ids['builds'][0]['build'];
$build = $builds[0];
} else {
$build = $ids['builds'][0]['build'];
}
return $build;
} }
function uupApiPrivateGetLatestPatch($build) { function uupApiPrivateGetLatestPatch($build) {
@@ -370,7 +363,7 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
$updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle); $updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
} }
if(preg_match('/Windows 1\d|Server|Azure Stack HCI/i', $updateTitle) !== 1) { if(preg_match('/Windows 1\d|Server|Azure Stack HCI|Windows CPC OS/i', $updateTitle) !== 1) {
$osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system'; $osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system';
$updateTitle = str_replace('Update', "Update for $osName", $updateTitle); $updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
} }
@@ -384,7 +377,7 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
if($foundType == 'hololens' || $foundType == 'wcosdevice0') if($foundType == 'hololens' || $foundType == 'wcosdevice0')
$updateTitle = $updateTitle.' - '.$type; $updateTitle = $updateTitle.' - '.$type;
if(!preg_match("/$foundBuild/i", $updateTitle)) if(!str_contains($updateTitle, $foundBuild))
$updateTitle = $updateTitle.' ('.$foundBuild.')'; $updateTitle = $updateTitle.' ('.$foundBuild.')';
preg_match('/UpdateID=".*?"/', $updateInfo, $updateId); preg_match('/UpdateID=".*?"/', $updateInfo, $updateId);