Rework listid.php, move low priority updates to the bottom

fetchupd.php

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

listid.php

@@ -27,19 +27,8 @@ function uupApiPrivateInvalidateFileinfoCache() {
     $cache2->delete();
 }
 
-function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
-    $dirs = uupApiGetFileinfoDirs();
-    $fileinfo = $dirs['fileinfoData'];
-    $fileinfoRoot = $dirs['fileinfo'];
-
-    $files = scandir($fileinfo);
-    $files = preg_grep('/\.json$/', $files);
-
-    consoleLogger('Parsing database info...');
-
-    $cacheFile = $fileinfoRoot.'/cache.json';
+function uupApiGetFileInfoCache($cacheFile) {
     $cacheV2Version = 1;
-
     $database = uupApiReadJson($cacheFile);
 
     if(isset($database['version'])) {
@@ -54,88 +43,98 @@ function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
         $database = array();
     }
 
-    if(empty($database)) $database = array();
+    if(empty($database))
+        $database = [];
+
+    return $database;
+}
+
+function uupApiPrivateGetCachedBuild(&$cache, $uuid) {
+    if(!isset($cache[$uuid])) {
+        $info = uupApiReadFileinfoMeta($uuid);
+        $data = [
+            'title' => isset($info['title']) ? $info['title'] : 'UNKNOWN',
+            'build' => isset($info['build']) ? $info['build'] : 'UNKNOWN',
+            'arch' => isset($info['arch']) ? $info['arch'] : 'UNKNOWN',
+            'created' => isset($info['created']) ? $info['created'] : null,
+        ];
+
+        $cache[$uuid] = $data;
+    } else {
+        $data = $cache[$uuid];
+    }
+
+    $data['uuid'] = $uuid;
+    return $data;
+}
+
+function uupApiPrivateGetSortTag($data, $sortByDate) {
+    $tmp = explode('.', $data['build']);
+
+    if($sortByDate) {
+        $tag = PHP_INT_MAX - intval($data['created']);
+    } else {
+        $tag = '';
+    }
+
+    $tag .= intval(uupApiIsUpdateLowPriority($data['title']));
+
+    if(isset($tmp[1])) {
+        $tag .= str_pad(999999999 - $tmp[0], 10, '0', STR_PAD_LEFT);
+        $tag .= str_pad(999999999 - $tmp[1], 10, '0', STR_PAD_LEFT);
+    }
+
+    $tag .= $data['arch'] . $data['title'] . $data['uuid'];
+
+    return $tag;
+}
+
+function uupApiPrivateGetFromFileinfo($sortByDate = 0) {
+    $dirs = uupApiGetFileinfoDirs();
+    $fileinfo = $dirs['fileinfoData'];
+    $fileinfoRoot = $dirs['fileinfo'];
+
+    $files = scandir($fileinfo);
+    $files = preg_grep('/\.json$/', $files);
+
+    consoleLogger('Parsing database info...');
+
+    $cacheFile = $fileinfoRoot.'/cache.json';
+    $cacheV2Version = 1;
+
+    $database = uupApiGetFileInfoCache($cacheFile);
+    $oldDb = $database;
 
-    $newDb = array();
-    $builds = array();
     foreach($files as $file) {
         if($file == '.' || $file == '..')
             continue;
 
         $uuid = preg_replace('/\.json$/', '', $file);
 
-        if(!isset($database[$uuid])) {
-            $info = uupApiReadFileinfoMeta($uuid);
+        $data = uupApiPrivateGetCachedBuild($database, $uuid);
+        $tag = uupApiPrivateGetSortTag($data, $sortByDate);
 
-            $title = isset($info['title']) ? $info['title'] : 'UNKNOWN';
-            $build = isset($info['build']) ? $info['build'] : 'UNKNOWN';
-            $arch = isset($info['arch']) ? $info['arch'] : 'UNKNOWN';
-            $created = isset($info['created']) ? $info['created'] : null;
-
-            $temp = array(
-                'title' => $title,
-                'build' => $build,
-                'arch' => $arch,
-                'created' => $created,
-            );
-
-            $newDb[$uuid] = $temp;
-        } else {
-            $title = $database[$uuid]['title'];
-            $build = $database[$uuid]['build'];
-            $arch = $database[$uuid]['arch'];
-            $created = $database[$uuid]['created'];
-
-            $newDb[$uuid] = $database[$uuid];
-        }
-
-        $temp = array(
-            'title' => $title,
-            'build' => $build,
-            'arch' => $arch,
-            'created' => $created,
-            'uuid' => $uuid,
-        );
-
-        $tmp = explode('.', $build);
-        if(isset($tmp[1])) {
-            $tmp[0] = str_pad($tmp[0], 10, '0', STR_PAD_LEFT);
-            $tmp[1] = str_pad($tmp[1], 10, '0', STR_PAD_LEFT);
-            $tmp = $tmp[0].$tmp[1];
-        } else {
-            consoleLogger($uuid.'.json appears to be broken and may be useless.');
-            $tmp = 0;
-        }
-
-        if($sortByDate) {
-            $tmp = $created.$tmp;
-        }
-
-        $buildAssoc[$tmp][] = $arch.$title.$uuid;
-        $builds[$tmp.$arch.$title.$uuid] = $temp;
+        $buildAssoc[$tag] = $uuid;
     }
 
-    if(empty($buildAssoc)) return [];
+    if(empty($buildAssoc)) 
+        return [];
 
-    krsort($buildAssoc);
-    $buildsNew = array();
+    ksort($buildAssoc);
 
-    foreach($buildAssoc as $key => $val) {
-        sort($val);
-        foreach($val as $id) {
-            $buildsNew[] = $builds[$key.$id];
-        }
+    $builds = [];
+    foreach($buildAssoc as $val) {
+        $builds[] = uupApiPrivateGetCachedBuild($database, $val);
     }
 
-    $builds = $buildsNew;
     consoleLogger('Done parsing database info.');
 
-    if($newDb != $database) {
+    if($database != $oldDb) {
         if(!file_exists('cache')) mkdir('cache');
 
         $cacheData = array(
             'version' => $cacheV2Version,
-            'database' => $newDb,
+            'database' => $database,
         );
 
         $success = @file_put_contents(

shared/requests.php

@@ -116,7 +116,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=331',
+        'AttrDataVer=352',
         'AllowInPlaceUpgrade=1',
         'AllowOptionalContent=1',
         'AllowUpgradesWithUnsupportedTPMOrCPU=1',
@@ -174,6 +174,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
         'IsDeviceRetailDemo=0',
         'IsFlightingEnabled='.$flightEnabled,
         'IsRetailOS='.$isRetail,
+        'LaunchUserOOBE=1',
         'LCUVer=0.0.0.0',
         'MediaBranch=',
         'MediaVersion='.$build,
@@ -317,10 +318,12 @@ function branchFromBuild($build) {
         case 26100:
         case 26120:
         case 26200:
+        case 26300:
             $branch = 'ge_release';
             break;
 
         case 28000:
+        case 28100:
             $branch = 'br_release';
             break;
 
@@ -474,6 +477,8 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
         $products[] = "PN=Windows.FeatureExperiencePack.$currArch&Repairable=1&V=0.0.0.0";
         $products[] = "PN=Windows.ManagementOOBE.$currArch&IsWindowsManagementOOBE=1&Repairable=1&V=$build";
         $products[] = "PN=Windows.OOBE.$currArch&IsWindowsOOBE=1&Repairable=1&V=$build";
+        $products[] = "PN=Windows.OOBE.Cumulative.$currArch&V=0.0.0.0";
+        $products[] = "PN=Windows.OOBE.Standalone.$currArch&V=0.0.0.0";
         $products[] = "PN=Windows.UpdateStackPackage.$currArch&Name=Update Stack Package&Repairable=1&V=$build";
         $products[] = "PN=Hammer.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
         $products[] = "PN=MSRT.$currArch&Source=UpdateOrchestrator&V=0.0.0.0";
@@ -590,6 +595,13 @@ function composeFetchUpdRequest($arch, $flight, $ring, $build, $sku = 48, $type
                     <int>3</int>
                     <int>30077688</int>
                     <int>30486944</int>
+                    <int>316003061</int>
+                    <int>326686062</int>
+                    <int>326686063</int>
+                    <int>327065581</int>
+                    <int>327072300</int>
+                    <int>327072305</int>
+                    <int>327100345</int>
                     <int>5143990</int>
                     <int>5169043</int>
                     <int>5169044</int>

shared/utils.php

@@ -207,3 +207,18 @@ function getAllowedFlags() {
 function uupAreAppxPresent($genPack) {
     return isset($genPack['neutral']['APP']);
 }
+
+function uupApiIsUpdateLowPriority($title) {
+    $titles = [
+        'Update Stack Package',
+        '.NET Framework',
+        'OOBE'
+    ];
+
+    foreach($titles as $val) {
+        if(str_contains($title, $val) == true)
+            return true;
+    }
+
+    return false;
+}