uup-dump/api
8
0
Fork 2
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

rework detection for product info

Browse Source
This commit is contained in:
abbodi1406
2026-04-21 00:23:36 +03:00
parent 2ddfdfc9f4
commit 1e07081a0e
1 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
fetchupd.php
View File

@@ -301,32 +301,40 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
return array('error' => 'EMPTY_FILELIST'); return array('error' => 'EMPTY_FILELIST');
} }
preg_match('/ProductReleaseInstalled Name\="(.*?)\..*\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info); preg_match('/ProductReleaseInstalled Name\="(.*?)" Version\="(.*?)"/', $updateInfo, $info);
$foundType = @strtolower($info[1]); if(!isset($info[0]) || empty($info[0])) {
$foundArch = @strtolower($info[2]); $infoExt = preg_grep('/<ExtendedProperties .*?>/', $updateMeta);
$foundBuild = @$info[3]; preg_match('/ProductName\="(.*?)" ReleaseVersion\="(.*?)"/', $infoExt[0], $info);
}
$matchName = @strtolower($info[1]);
$matchVersion = @$info[2];
if(!isset($foundArch) || empty($foundArch)) { if($matchVersion == '1.0.0.0' || $matchVersion == '10.0.0.0') {
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="10\.0\.(.*?)"/', $updateInfo, $info); preg_match('/"BuildFlightVersion":"(.*?)"/', $updateInfo, $infoVer);
$foundType = @strtolower($info[1]); $matchVersion = @$infoVer[1];
$foundArch = @strtolower($info[2]);
$foundBuild = @$info[3];
} }
if(!isset($foundArch) || empty($foundArch)) { $arrayName = explode('.', $matchName);
preg_match('/ProductReleaseInstalled Name\="(.*?)\.(.*?)" Version\="(.*?)"/', $updateInfo, $info); $arrayVersion = explode('.', $matchVersion);
$foundType = @strtolower($info[1]);
$foundArch = @strtolower($info[2]); $foundArch = $arrayName[count($arrayName)-1];
$foundBuild = @$info[3]; $foundType = $arrayName[0];
} if($foundType == 'windows' || $foundType == 'microsoft')
$foundType = $arrayName[1];
$isNet = 0; $isNet = 0;
if(strpos($foundArch, 'netfx') !== false) { if(strpos($matchVersion, '10.0.') !== false) {
$foundBuild = $arrayVersion[2].'.'.$arrayVersion[3];
} elseif($foundType == 'netfx') {
$foundBuild = $arrayVersion[1].'.'.$arrayVersion[2];
$isNet = 1; $isNet = 1;
preg_match('/ProductReleaseInstalled Name\=".*\.(.*?)\.(.*?)" Version\=".*\.\d{5}\.(.*?)"/', $updateInfo, $info); } else {
$foundType = @strtolower($info[1]); $foundBuild = $matchVersion;
$foundArch = @strtolower($info[2]); }
$foundBuild = @$info[3];
$addKB = 0;
if($isNet || $foundType == 'oobe') {
$addKB = 1;
} }
$updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta); $updateTitle = preg_grep('/<Title>.*<\/Title>/', $updateMeta);
@@ -345,6 +353,8 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
if($foundType == 'hololens' || $foundType == 'wcosdevice0') if($foundType == 'hololens' || $foundType == 'wcosdevice0')
$updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle); $updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
preg_match('/\((KB.*?)\)/', $updateTitle, $updateKB);
$isCumulativeUpdate = 0; $isCumulativeUpdate = 0;
if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) { if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
$isCumulativeUpdate = 1; $isCumulativeUpdate = 1;
@@ -368,6 +378,10 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
$updateTitle = str_replace('Update', "Update for $osName", $updateTitle); $updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
} }
if($foundType == 'oobe' && !preg_match("/OOBE|Out of Box/i", $updateTitle)) {
$updateTitle = str_replace('Update', 'Update for Windows OOBE', $updateTitle);
}
if($sku == 406) if($sku == 406)
$updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle); $updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
@@ -377,6 +391,9 @@ 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($addKB && isset($updateKB[0]))
$updateTitle = $updateTitle.' - '.$updateKB[1];
if(!str_contains($updateTitle, $foundBuild)) if(!str_contains($updateTitle, $foundBuild))
$updateTitle = $updateTitle.' ('.$foundBuild.')'; $updateTitle = $updateTitle.' ('.$foundBuild.')';