Merge pull request #5 from uup-dump/revert-4-master

Temporarily revert "Add support for channels, keep compatibility with rings"

fetchupd.php

@@ -56,11 +56,11 @@ function uupFetchUpd(
         return array('error' => 'UNKNOWN_ARCH');
     }
 
-    if(!($ring == 'DEV' || $ring == 'BETA' || $ring == 'RELEASEPREVIEW' || $ring == 'WIF' || $ring == 'WIS' || $ring == 'RP' || $ring == 'RETAIL' || $ring == 'MSIT')) {
+    if(!($ring == 'WIF' || $ring == 'WIS' || $ring == 'RP' || $ring == 'RETAIL' || $ring == 'MSIT')) {
         return array('error' => 'UNKNOWN_RING');
     }
 
-    if(!($flight == 'Mainline' || $flight == 'Active' || $flight == 'Skip')) {
+    if(!($flight == 'Skip' || $flight == 'Active')) {
         return array('error' => 'UNKNOWN_FLIGHT');
     }
 
@@ -305,8 +305,8 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
 
         $temp = array();
         $temp['title'] = $updateTitle;
-        $temp['channel'] = $ring;
-        $temp['content'] = $flight;
+        $temp['ring'] = $ring;
+        $temp['flight'] = $flight;
         $temp['arch'] = $foundArch;
         $temp['build'] = $foundBuild;
         $temp['checkBuild'] = $build;

readme.md

@@ -7,15 +7,13 @@ Fetches latest update information from Windows Update servers.
 
 Parameters:
  - `arch` - Architecture of build to find
-   - **Supported values:** `amd64`, `x86`, `arm64`, `all`
+   - **Supported values:** `amd64`, `arm64`, `x86`
 
- - `ring` - Channel to use when fetching information (Previously called Ring)
-   - **Supported values:** `Dev`, `Beta`, `ReleasePreview`, `Retail`
-   - **Old Ring values :** `WIF`, `WIS`, `RP`
+ - `ring` - Ring to use when fetching information
+   - **Supported values:** `WIF`, `WIS`, `RP`, `RETAIL`
 
- - `flight` - Content type to use when fetching information (Previously called Flight)
-   - **Supported values:** `Mainline`
-   - **Old Flight values:** `Active`, `Skip`, `Current`
+ - `flight` - Flight to use when fetching information
+   - **Supported values:** `Active`, `Skip`, `Current`
    - **NOTE:** `Skip` is for `WIF` ring only. `Current` is for `RP` ring only.
 
  - `build` - Build number to use when fetching information

shared/main.php

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

shared/requests.php

@@ -26,41 +26,18 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
         $arch = $arch[0];
     }
 
-    if($sku == 125 || $sku == 126 || $sku == 7 || $sku == 8 || $sku == 120 || $sku == 145 || $sku == 146 || $sku == 168)
-        $blockUpgrades = 1;
-
-    $fltContent = 'Mainline';
-    $fltRing = 'External';
-
     if($ring == 'RETAIL') {
-        $fltBranch = '';
-        $fltContent = '';
-        $fltRing = 'Retail';
         $flightEnabled = 0;
         $isRetail = 1;
     }
 
-    if($ring == 'WIF' || $ring == 'DEV') {
-        $fltBranch = 'Dev';
-    }
-
-    if($ring == 'WIS' || $ring == 'BETA') {
-        $fltBranch = 'Beta';
-    }
-
-    if($ring == 'RP' || $ring == 'RELEASEPREVIEW') {
-        $fltBranch = 'ReleasePreview';
-    }
-
-    if($ring == 'MSIT') {
-        $fltBranch = 'MSIT';
-        $fltRing = 'Internal';
-    }
+    if($sku == 125 || $sku == 126)
+        $blockUpgrades = 1;
 
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=99',
+        'AttrDataVer=96',
         'BlockFeatureUpdates='.$blockUpgrades,
         'BranchReadinessLevel=CB',
         'CurrentBranch='.$branch,
@@ -71,9 +48,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
         'DeviceFamily=Windows.Desktop',
         'EKB19H2InstallCount=1',
         'EKB19H2InstallTimeEpoch=1255000000',
-        'FlightingBranchName='.$fltBranch,
-        'FlightContent='.$fltContent,
-        'FlightRing='.$fltRing,
+        'FlightContent='.$flight,
+        'FlightRing='.$ring,
+        'FlightingBranchName=external',
         'Free=32to64',
         'GStatus_20H1=2',
         'GStatus_20H1Setup=2',
@@ -147,10 +124,6 @@ function branchFromBuild($build) {
             $branch = 'vb_release';
             break;
 
-        case 19042: //19042 is a fake build based on 19041
-            $branch = 'vb_release';
-            break;
-
         default:
             $branch = 'rs_prerelease';
             break;
@@ -233,7 +206,7 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
 
     $branch = branchFromBuild($build);
 
-    if($sku == 7 || $sku == 8 || $sku == 120 || $sku == 145 || $sku == 146 || $sku == 168) {
+    if($sku == 7 || $sku == 8) {
         $mainProduct = 'Server.OS';
     } else {
         $mainProduct = 'Client.OS.rs2';