witherornot/api
1
0
Fork 0
forked from uup-dump/api
Code Pull Requests Activity

Fix list of files for build 17025

Browse Source
This commit is contained in:
mkuba50 2017-10-25 20:31:18 +02:00
parent f9997dee4b
commit 29b9672b9b
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
get.php
View File

@ -84,6 +84,17 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
} }
} }
if(isset($info['build'])) {
$build = $info['build'];
if($build == 'UNKNOWN') {
$buildNumber = 9841;
} else {
$buildNumber = explode('.', $build);
$buildNumber = $buildNumber[0];
}
}
$uupFix = 0; $uupFix = 0;
if(isset($info['needsFix'])) { if(isset($info['needsFix'])) {
if($info['needsFix'] == true) $uupFix = 1; if($info['needsFix'] == true) $uupFix = 1;
@ -142,7 +153,7 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
$size = $info[$sha1]['size']; $size = $info[$sha1]['size'];
} }
if($uupFix && !isset($fileSizes[$name])) $fileSizes[$name] = 0; if(!isset($fileSizes[$name])) $fileSizes[$name] = 0;
$temp = array( $temp = array(
'sha1' => $sha1, 'sha1' => $sha1,
@ -153,12 +164,8 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
); );
if(!preg_match('/\.psf$/', $name)) { if(!preg_match('/\.psf$/', $name)) {
if($uupFix) { if($size > $fileSizes[$name]) {
if($size > $fileSizes[$name]) { $fileSizes[$name] = $size;
$fileSizes[$name] = $size;
$files = array_merge($files, array($name => $temp));
}
} else {
$files = array_merge($files, array($name => $temp)); $files = array_merge($files, array($name => $temp));
} }
} else { } else {
@ -171,7 +178,17 @@ function uupGetFiles($updateId = 'c2a1d787-647b-486d-b264-f90f3782cdc6', $usePac
if(!$uupFix) { if(!$uupFix) {
foreach($removeFiles as $val) { foreach($removeFiles as $val) {
if(isset($files[$val.'.cab'])) unset($files[$val.'.cab']); if(preg_match('/'.$updateArch.'_.*/i', $val)) {
if(isset($files[$val.'.cab'])) unset($files[$val.'.cab']);
}
if(isset($files[$val.'.esd'])) {
if(isset($files[$val.'.cab'])) unset($files[$val.'.cab']);
}
if(isset($files[$val.'.ESD'])) {
if(isset($files[$val.'.cab'])) unset($files[$val.'.cab']);
}
} }
unset($removeFiles); unset($removeFiles);
} }

2
shared/main.php
View File

@ -16,7 +16,7 @@ limitations under the License.
*/ */
function uupApiVersion() { function uupApiVersion() {
return '1.4.0'; return '1.4.1';
} }
function uupApiPrintBrand() { function uupApiPrintBrand() {