1.42.0

get.php

@@ -77,7 +77,7 @@ function uupGetFiles(
     }
 
     if($usePack) {
-        $genPack = uupGetGenPacks($build, $info['arch'], $updateId);
+        $genPack = uupApiGetPacks($updateId);
         if(empty($genPack)) return array('error' => 'UNSUPPORTED_COMBINATION');
 
         if(!isset($genPack[$usePack])) {

listeditions.php

@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2022 UUP dump API authors
+Copyright 2023 UUP dump API authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,60 +17,35 @@ limitations under the License.
 
 require_once dirname(__FILE__).'/shared/main.php';
 require_once dirname(__FILE__).'/shared/packs.php';
-require_once dirname(__FILE__).'/updateinfo.php';
 
 function uupListEditions($lang = 'en-us', $updateId = 0) {
-    if($updateId) {
-        $info = uupUpdateInfo($updateId, false, true);
-    }
-
     if(!$lang) {
         return array('error' => 'UNSUPPORTED_LANG');
     }
 
-    if(isset($info['info'])) $info = $info['info'];
-
-    if(isset($info['build'])) {
-        $build = explode('.', $info['build']);
-        $build = $build[0];
-    } else {
-        $build = 15063;
-    }
-
-    if(!isset($info['arch'])) {
-        $info['arch'] = null;
-    }
-
-    $genPack = uupGetGenPacks($build, $info['arch'], $updateId);
-    $fancyTexts = uupGetInfoTexts();
-    $fancyEditionNames = $fancyTexts['fancyEditionNames'];
-
-    if($lang) {
     $lang = strtolower($lang);
+    $genPack = uupApiGetPacks($updateId);
+    $fancyEditionNames = uupGetInfoTexts()['fancyEditionNames'];
+
     if(!isset($genPack[$lang])) {
         return array('error' => 'UNSUPPORTED_LANG');
     }
-    }
 
-    $editionList = array();
+    $editionList = [];
-    $editionListFancy = array();
+    $editionListFancy = [];
+
     foreach(array_keys($genPack[$lang]) as $edition) {
-        if($edition == 'LXP') continue;
+        if(in_array($edition, ['LXP', 'FOD'])) continue;
-        if($edition == 'FOD') continue;
 
-        if(isset($fancyEditionNames[$edition])) {
+        $fancyName = isset($fancyEditionNames[$edition]) ? $fancyEditionNames[$edition] : $edition;
-            $fancyName = $fancyEditionNames[$edition];
-        } else {
-            $fancyName = $edition;
-        }
 
         $editionList[] = $edition;
         $editionListFancy[$edition] = $fancyName;
     }
 
-    return array(
+    return [
         'apiVersion' => uupApiVersion(),
         'editionList' => $editionList,
         'editionFancyNames' => $editionListFancy,
-    );
+    ];
 }

listlangs.php

@@ -1,6 +1,6 @@
 <?php
 /*
-Copyright 2022 UUP dump API authors
+Copyright 2023 UUP dump API authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -19,63 +19,45 @@ require_once dirname(__FILE__).'/shared/main.php';
 require_once dirname(__FILE__).'/shared/packs.php';
 require_once dirname(__FILE__).'/updateinfo.php';
 
-function uupListLangs($updateId = 0) {
+function uupListLangsInternal($updateId) {
-    if($updateId) {
+    $genPack = uupApiGetPacks($updateId);
-        $info = uupUpdateInfo($updateId, false, true);
+    $fancyLangNames = uupGetInfoTexts()['fancyLangNames'];
-    }
 
-    if(isset($info['info'])) {
+    $langList = [];
-        $info = $info['info'];
+    $langListFancy = [];
-        unset($info['files']);
-    }
 
-    if(isset($info['build'])) {
-        $build = explode('.', $info['build']);
-        $build = $build[0];
-    } else {
-        $build = 15063;
-    }
-
-    if(!isset($info['arch'])) {
-        $info['arch'] = null;
-    }
-
-    $genPack = uupGetGenPacks($build, $info['arch'], $updateId);
-    $fancyTexts = uupGetInfoTexts();
-    $fancyLangNames = $fancyTexts['fancyLangNames'];
-
-    $langList = array();
-    $langListFancy = array();
     foreach($genPack as $key => $val) {
-        if(!count(array_diff(array_keys($val), array('LXP')))) {
+        if(!count(array_diff(array_keys($val), ['LXP', 'FOD']))) {
-            continue;
-        }
-        if(!count(array_diff(array_keys($val), array('FOD')))) {
             continue;
         }
 
-        if(isset($fancyLangNames[$key])) {
+        $fancyName = isset($fancyLangNames[$key]) ? $fancyLangNames[$key] : $key;
-            $fancyName = $fancyLangNames[$key];
-        } else {
-            $fancyName = $key;
-        }
 
         $langList[] = $key;
         $langListFancy[$key] = $fancyName;
     }
 
-    if(isset($info)) {
+    return [
-        return array(
-            'apiVersion' => uupApiVersion(),
         'langList' => $langList,
         'langFancyNames' => $langListFancy,
-            'updateInfo' => $info
+    ];
-        );
+}
-    } else {
+
-        return array(
+function uupListLangs($updateId = 0, $returnInfo = true) {
+    if($returnInfo) {
+        $info = uupUpdateInfo($updateId, ignoreFiles: true);
+        $info = isset($info['info']) ? $info['info'] : false;
+    }
+
+    $langList = uupListLangsInternal($updateId);
+
+    $response = [
         'apiVersion' => uupApiVersion(),
-            'langList' => $langList,
+        'langList' => $langList['langList'],
-            'langFancyNames' => $langListFancy
+        'langFancyNames' => $langList['langFancyNames'],
-        );
+    ];
-    }
+
+    if($returnInfo) $response['updateInfo'] = $info;
+
+    return $response;
 }

shared/main.php

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

shared/packs.php

@@ -202,7 +202,7 @@ function uupGetInfoTexts() {
     );
 }
 
-function uupGetGenPacks($build = 15063, $arch = null, $updateId = null) {
+function uupApiGetPacks($updateId) {
     if(empty($updateId)) return [];
     if(!file_exists('packs/'.$updateId.'.json.gz')) return [];
 
@@ -212,3 +212,7 @@ function uupGetGenPacks($build = 15063, $arch = null, $updateId = null) {
     $genPack = json_decode($genPack, 1);
     return $genPack;
 }
+
+function uupGetGenPacks($build = 15063, $arch = null, $updateId = null) {
+    return uupApiGetPacks($updateId);
+}