Fix update names, update attributes

This commit is contained in:
mkuba50 2019-03-12 18:26:33 +01:00
parent aa53951c2f
commit 40eb74fa09
3 changed files with 7 additions and 8 deletions

View File

@ -206,15 +206,12 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
$isCumulativeUpdate = 0; $isCumulativeUpdate = 0;
if(preg_match('/\d{4}-\d{2}.+Update/', $updateTitle)) { if(preg_match('/\d{4}-\d{2}.+Update/', $updateTitle)) {
$isCumulativeUpdate = 1; $isCumulativeUpdate = 1;
$updateTitle = preg_replace('/\d{4}-\d{2} /i', '', $updateTitle);
$updateTitle = preg_replace('/ for .{3,5}-based systems| \(KB.*?\)/i', '', $updateTitle); $updateTitle = preg_replace('/ for .{3,5}-based systems| \(KB.*?\)/i', '', $updateTitle);
if(!preg_match("/$foundBuild/", $updateTitle)) {
$updateTitle = $updateTitle.' ('.$foundBuild.')';
}
} }
if(preg_match('/Feature update/i', $updateTitle)) { $updateTitle = preg_replace("/ ?\d{4}-\d{2} ?| ?$arch ?/i", '', $updateTitle);
if(!preg_match("/$foundBuild/i", $updateTitle)) {
$updateTitle = $updateTitle.' ('.$foundBuild.')'; $updateTitle = $updateTitle.' ('.$foundBuild.')';
} }

View File

@ -16,7 +16,7 @@ limitations under the License.
*/ */
function uupApiVersion() { function uupApiVersion() {
return '1.20.3'; return '1.20.4';
} }
require_once dirname(__FILE__).'/auths.php'; require_once dirname(__FILE__).'/auths.php';

View File

@ -30,7 +30,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
$attrib = array( $attrib = array(
'App=WU_OS', 'App=WU_OS',
'AppVer='.$build, 'AppVer='.$build,
'AttrDataVer=57', 'AttrDataVer=60',
'BranchReadinessLevel=CB', 'BranchReadinessLevel=CB',
'CurrentBranch='.$branch, 'CurrentBranch='.$branch,
'DefaultUserRegion=191', 'DefaultUserRegion=191',
@ -41,6 +41,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
'FlightingBranchName=external', 'FlightingBranchName=external',
'Free=32to64', 'Free=32to64',
'GStatus_RS5=2', 'GStatus_RS5=2',
'GStatus_19H1=2',
'InstallDate=1438196400', 'InstallDate=1438196400',
'InstallLanguage=en-US', 'InstallLanguage=en-US',
'InstallationType=Client', 'InstallationType=Client',
@ -59,6 +60,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
'TelemetryLevel=3', 'TelemetryLevel=3',
'UpdateManagementGroup=2', 'UpdateManagementGroup=2',
'UpgEx_RS5=Green', 'UpgEx_RS5=Green',
'UpgEx_19H1=Green',
'Version_RS5='.PHP_INT_MAX, 'Version_RS5='.PHP_INT_MAX,
'WuClientVer='.$build, 'WuClientVer='.$build,
); );