lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: translate packages size and merge with sets size

Browse Source
This commit is contained in:
Franco Fichtner 2017-10-09 06:40:20 +00:00
parent 996d2bf363
commit c01454e4f1
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
View File

@ -80,8 +80,24 @@ class FirmwareController extends ApiControllerBase
}
}
/* XXX scrape the number from $package_size and merge with sets size for total */
$download_size = $packages_size ? $packages_size : $this->format_bytes($sets_size);
if (preg_match('/\s*(\d+)\s*([a-z])/i', $packages_size, $matches)) {
$factor = 1;
switch (isset($matches[2]) ? strtolower($matches[2]) : 'b') {
case 'g':
$factor *= 1024;
case 'm':
$factor *= 1024;
case 'k':
$factor *= 1024;
default:
break;
}
$packages_size = $factor * $matches[1];
} else {
$packages_size = 0;
}
$download_size = $this->format_bytes($packages_size + $sets_size);
if (array_key_exists('connection', $response) && $response['connection'] == 'error') {
$response['status_msg'] = gettext('Connection error.');