forked from uup-dump/api
API 1.6.0
- build number for fetching can be provided using build.minor format - added size prediction for files that are not in database
This commit is contained in:
parent
b36195e224
commit
352398a309
@ -27,6 +27,10 @@ function uupFetchUpd($arch = 'amd64', $ring = 'WIF', $flight = 'Active', $build
|
|||||||
$flight = ucwords(strtolower($flight));
|
$flight = ucwords(strtolower($flight));
|
||||||
if($flight == 'Current') $flight = 'Active';
|
if($flight == 'Current') $flight = 'Active';
|
||||||
|
|
||||||
|
$build = explode('.', $build);
|
||||||
|
if(isset($build[1])) $minor = intval($build[1]);
|
||||||
|
$build = intval($build[0]);
|
||||||
|
|
||||||
if(!($arch == 'amd64' || $arch == 'x86' || $arch == 'arm64')) {
|
if(!($arch == 'amd64' || $arch == 'x86' || $arch == 'arm64')) {
|
||||||
return array('error' => 'UNKNOWN_ARCH');
|
return array('error' => 'UNKNOWN_ARCH');
|
||||||
}
|
}
|
||||||
|
32
get.php
32
get.php
@ -70,8 +70,8 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
|
|||||||
if(empty($info)) {
|
if(empty($info)) {
|
||||||
$info = array(
|
$info = array(
|
||||||
'ring' => 'WIF',
|
'ring' => 'WIF',
|
||||||
'flight' => 'Skip',
|
'flight' => 'Active',
|
||||||
'checkBuild' => '10.0.16232.0',
|
'checkBuild' => '10.0.16251.0',
|
||||||
'files' => array(),
|
'files' => array(),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -90,6 +90,7 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
|
|||||||
$updateId = preg_replace('/_rev\..*/', '', $updateId);
|
$updateId = preg_replace('/_rev\..*/', '', $updateId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$fetchTime = time();
|
||||||
consoleLogger('Fetching information from the server...');
|
consoleLogger('Fetching information from the server...');
|
||||||
$postData = composeFileGetRequest($updateId, uupDevice(), $info, $rev);
|
$postData = composeFileGetRequest($updateId, uupDevice(), $info, $rev);
|
||||||
$out = sendWuPostRequest('https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx/secured', $postData);
|
$out = sendWuPostRequest('https://fe3.delivery.mp.microsoft.com/ClientWebService/client.asmx/secured', $postData);
|
||||||
@ -109,9 +110,9 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
|
|||||||
|
|
||||||
$files = array();
|
$files = array();
|
||||||
foreach($out as $val) {
|
foreach($out as $val) {
|
||||||
preg_match('/<FileDigest>.*<\/FileDigest>/', $val, $sha1);
|
$sha1 = explode('<FileDigest>', $val, 2);
|
||||||
$sha1 = preg_replace('/<FileDigest>|<\/FileDigest>/', '', $sha1[0]);
|
$sha1 = explode('</FileDigest>', $sha1[1], 2);
|
||||||
$sha1 = bin2hex(base64_decode($sha1));
|
$sha1 = bin2hex(base64_decode($sha1[0]));
|
||||||
|
|
||||||
preg_match('/files\/.{8}-.{4}-.{4}-.{4}-.{12}/', $val, $guid);
|
preg_match('/files\/.{8}-.{4}-.{4}-.{4}-.{12}/', $val, $guid);
|
||||||
$guid = preg_replace('/files\/|\?$/', '', $guid[0]);
|
$guid = preg_replace('/files\/|\?$/', '', $guid[0]);
|
||||||
@ -123,23 +124,32 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(empty($info[$sha1]['name'])) {
|
if(empty($info[$sha1]['name'])) {
|
||||||
$size = 0;
|
$size = -1;
|
||||||
} else {
|
} else {
|
||||||
$size = $info[$sha1]['size'];
|
$size = $info[$sha1]['size'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isset($fileSizes[$name])) $fileSizes[$name] = 0;
|
if(!isset($fileSizes[$name])) $fileSizes[$name] = -2;
|
||||||
|
|
||||||
if($size > $fileSizes[$name]) {
|
if($size > $fileSizes[$name]) {
|
||||||
preg_match('/<Url>.*<\/Url>/', $val, $url);
|
$url = explode('<Url>', $val, 2);
|
||||||
$url = preg_replace('/<Url>|<\/Url>/', '', $url[0]);
|
$url = explode('</Url>', $url[1], 2);
|
||||||
$url = html_entity_decode($url);
|
$url = html_entity_decode($url[0]);
|
||||||
|
|
||||||
preg_match('/P1=.*?&/', $url, $expire);
|
preg_match('/P1=.*?&/', $url, $expire);
|
||||||
if(isset($expire[0])) {
|
if(isset($expire[0])) {
|
||||||
$expire = preg_replace('/P1=|&$/', '', $expire[0]);
|
$expire = preg_replace('/P1=|&$/', '', $expire[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$expire = intval($expire);
|
||||||
|
|
||||||
|
if($size < 0) {
|
||||||
|
$temp = ($expire - $fetchTime) / 600;
|
||||||
|
$size = ($temp - 1) * 31457280;
|
||||||
|
if($size < 0) $size = 0;
|
||||||
|
unset($temp);
|
||||||
|
}
|
||||||
|
|
||||||
$fileSizes[$name] = $size;
|
$fileSizes[$name] = $size;
|
||||||
|
|
||||||
$temp = array();
|
$temp = array();
|
||||||
@ -147,7 +157,7 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
|
|||||||
$temp['size'] = $size;
|
$temp['size'] = $size;
|
||||||
$temp['url'] = $url;
|
$temp['url'] = $url;
|
||||||
$temp['uuid'] = $guid;
|
$temp['uuid'] = $guid;
|
||||||
$temp['expire'] = intval($expire);
|
$temp['expire'] = $expire;
|
||||||
|
|
||||||
$newName = preg_replace('/~31bf3856ad364e35/', '', $name);
|
$newName = preg_replace('/~31bf3856ad364e35/', '', $name);
|
||||||
$newName = preg_replace('/~~\.|~\./', '.', $newName);
|
$newName = preg_replace('/~~\.|~\./', '.', $newName);
|
||||||
|
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
function uupApiVersion() {
|
function uupApiVersion() {
|
||||||
return '1.5.1';
|
return '1.6.0';
|
||||||
}
|
}
|
||||||
|
|
||||||
function uupApiPrintBrand() {
|
function uupApiPrintBrand() {
|
||||||
|
Loading…
Reference in New Issue
Block a user