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

79
source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/PackageQuery.php
View File

@@ -1,71 +1,40 @@
<?php
require_once("/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php");
require_once '/usr/local/emhttp/plugins/NerdPack/include/NerdPackHelpers.php';
$plg_path ="/boot/config/plugins/NerdPack";// plugin path
$pkg_path = "$plg_path/packages/"; // package path
$config_file = "$plg_path/NerdPack.cfg";// config file
$pkgs_array = [];
$pkg_cfg = (is_file($config_file)) ? parse_ini_file($config_file) : array(); // get package configs
$pkgs_downloaded = array_diff( scandir($pkg_path, 1), array(".", "..") ); // get array of downloaded packages
$pkgs_installed = array_diff( scandir("/var/log/packages", 1), array(".", "..") ); // get array of all installed packages
$pkgs_desc_file = file_get_contents($pkg_path."packages-desc");// get package descriptions
$pkgs_desc_array = json_decode($pkgs_desc_file, true);
$pkgs_github_file = file_get_contents($pkg_path."packages.json");// get packages
$pkgs_github_array = json_decode($pkgs_github_file, true);
$pkgs_array = array();
for ($i = 0; $i < sizeof($pkgs_github_array); $i++) {
$pkg_nameArray = explode("-", $pkgs_github_array[$i]["name"]); // split package name into array
foreach ($pkgs_github_array as $pkg_github) {
$pkg_nameArray = explode('-', $pkg_github['name']); // split package name into array
$pkg_name = $pkg_nameArray[0];
if (sizeof($pkg_nameArray) > 4){ //if package name has a subset get it
if (sizeof($pkg_nameArray) > 4) { //if package name has a subset get it
for ($ii = 1; $ii < sizeof($pkg_nameArray)-3; $ii++) {
$pkg_name = $pkg_name."-".$pkg_nameArray[$ii];
}
$pkg_name .= '-'.$pkg_nameArray[$ii];
}
}
$pkg_version = $pkg_nameArray[sizeof($pkg_nameArray)-3]; // get package version
$pkg_version = $pkg_nameArray[sizeof($pkg_nameArray) - 3]; // get package version
$pkg_nver = $pkg_name."-".str_replace(".", "_", $pkg_version); // add underscored version to package name
$pkg_pattern = "/^".$pkg_name.".*/"; // search patter for packages
$pkg_nver = $pkg_name.'-'.str_replace('.', '_', $pkg_version); // add underscored version to package name
$pkg = array();
$pkg_pattern = '/^'.$pkg_name.'.*/'; // search patter for packages
$pkg["name"] = $pkgs_github_array[$i]["name"]; // add full package name
$pkg["pkgname"] = $pkg_name; // add package name only
$pkg["pkgnver"] = $pkg_nver; // add package name with underscored version
$pkg["pkgversion"] = $pkg_version; // add package name with underscored version
$pkg["size"] = format_size($pkgs_github_array[$i]["size"], 1, '?'); // add package size
// checks if package name is installed
$pkg["installed"] = preg_grep($pkg_pattern , $pkgs_installed) ? "yes" : "no";
// checks if package is installed equals github exactly
$pkg["installeq"] = in_array( pathinfo($pkgs_github_array[$i]["name"], PATHINFO_FILENAME), $pkgs_installed ) ? "yes" : "no";
// checks if package name is downloaded
$pkg["downloaded"] = preg_grep($pkg_pattern , $pkgs_downloaded) ? "yes" : "no";
// checks if package is downloaded equals github exactly
$pkg["downloadeq"] = in_array( $pkgs_github_array[$i]["name"], $pkgs_downloaded ) ? "yes" : "no";
$pkg["config"] = isset($pkg_cfg["$pkg_nver"]) ? $pkg_cfg["$pkg_nver"] : "no"; // checks config for install preference
$pkg["desc"] = $pkgs_desc_array["$pkg_name"];
$pkg = [
'name' => $pkg_github['name'], // add full package name
'pkgname' => $pkg_name, // add package name only
'pkgnver' => $pkg_nver, // add package name with underscored version
'pkgversion' => $pkg_version, // add package name with raw version
'size' => format_size($pkg_github['size'], 1, '?'), // add package size
'installed' => preg_grep($pkg_pattern, $pkgs_installed) ? 'yes' : 'no', // checks if package name is installed
'installeq' => in_array(pathinfo($pkg_github['name'], PATHINFO_FILENAME), $pkgs_installed) ? 'yes' : 'no', // checks if package is installed equals github exactly
'downloaded' => preg_grep($pkg_pattern, $pkgs_downloaded) ? 'yes' : 'no', // checks if package name is downloaded
'downloadeq' => in_array($pkg_github['name'], $pkgs_downloaded) ? 'yes' : 'no', // checks if package is downloaded equals github exactly
'config' => isset($pkg_cfg[$pkg_nver]) ? $pkg_cfg[$pkg_nver] : 'no', // checks config for install preference
'desc' => $pkgs_desc_array[$pkg_name]
];
$pkgs_array[] = $pkg;
}
echo json_encode($pkgs_array);
?>
?>