Flummi/Unraid-SlackPack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup, refactoring and bug fixes:

Browse Source 
- Fixed first time running warnings about missing packages.json / desc files
- Fixed bug preventing Select All from being able to be clicked
- Fixed bug in select all and dependent checkboxes / race condition
- Eliminated vertical space gap between page header and table
This commit is contained in:
Eric Schultz
2016-01-24 11:25:23 -06:00
parent 534c5775b8
commit 7576dc3f31
7 changed files with 254 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php
View File

@ -1,5 +1,39 @@
<?php
function format_size($value, $decimals, $unit='?') {
$plg_path = '/boot/config/plugins/NerdPack/'; // plugin path
$pkg_path = $plg_path.'packages/'; // package path
$pkg_desc = 'https://raw.githubusercontent.com/dmacias72/unRAID-plugins/master/plugins/packages-desc';
$pkg_repo = 'https://api.github.com/repos/eschultz/unraid6-nerdpack/contents/packages';
$desc_file = $pkg_path.'packages-desc';
$repo_file = $pkg_path.'packages.json';
$config_file = $plg_path.'NerdPack.cfg';
// get package configs
$pkg_cfg = (is_file($config_file)) ? parse_ini_file($config_file) : [];
// get array of downloaded packages
$pkgs_downloaded = file_exists($pkg_path) ? array_diff(scandir($pkg_path, 1), ['.', '..']) : [];
// get array of all installed packages
$pkgs_installed = array_diff(scandir("/var/log/packages", 1), ['.', '..']);
$pkgs_desc_file = (is_file($desc_file)) ? file_get_contents($desc_file) : '[]';
$pkgs_desc_array = json_decode($pkgs_desc_file, true);
$pkgs_github_file = (is_file($repo_file)) ? file_get_contents($repo_file) : '[]';
$pkgs_github_array = json_decode($pkgs_github_file, true);
function logger($output, $quiet = false) {
exec('echo '.escapeshellarg($output).' 2>&1 | logger -tnerdpack');
if (!$quiet) {
echo "\n".$output." \n";
usleep(100000);
}
}
function format_size($value, $decimals, $unit = '?') {
if ($value == '')
return 'unknown';
@ -26,7 +60,7 @@ function format_size($value, $decimals, $unit='?') {
case 'T': return number_format($value / (float)1099511627776, $decimals).' TB';
case 'G': return number_format($value / (float)(1 << 30), $decimals).' GB';
case 'M': return number_format($value / (float)(1 << 20), $decimals).' MB';
case 'K': return number_format($value / (float)(1 << 10), $decimals).' kB';
case 'K': return number_format($value / (float)(1 << 10), $decimals).' KB';
case 'B': return $value.' B';
}