diff --git a/.gitignore b/.gitignore index e082c27..d0d81eb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ upgrade-packages develop/rsync.txt +*.bak \ No newline at end of file diff --git a/archive/NerdTools-2023.05.04-x86_64-1.txz b/archive/NerdTools-2023.05.04-x86_64-1.txz new file mode 100644 index 0000000..0be518c Binary files /dev/null and b/archive/NerdTools-2023.05.04-x86_64-1.txz differ diff --git a/packages/6.11/python-packaging-21.3-x86_64-1.txz b/packages/6.11/python-packaging-21.3-x86_64-1.txz new file mode 100644 index 0000000..170b979 Binary files /dev/null and b/packages/6.11/python-packaging-21.3-x86_64-1.txz differ diff --git a/packages/6.11/sg3_utils-1.47-x86_64-1.txz b/packages/6.11/sg3_utils-1.47-x86_64-1.txz deleted file mode 100644 index f529209..0000000 Binary files a/packages/6.11/sg3_utils-1.47-x86_64-1.txz and /dev/null differ diff --git a/packages/6.12/python-packaging-21.3-x86_64-1.txz b/packages/6.12/python-packaging-21.3-x86_64-1.txz new file mode 100644 index 0000000..170b979 Binary files /dev/null and b/packages/6.12/python-packaging-21.3-x86_64-1.txz differ diff --git a/packages/6.12/sg3_utils-1.47-x86_64-1.txz b/packages/6.12/sg3_utils-1.47-x86_64-1.txz deleted file mode 100644 index f529209..0000000 Binary files a/packages/6.12/sg3_utils-1.47-x86_64-1.txz and /dev/null differ diff --git a/packages/packages-depends b/packages/packages-depends index b507893..0a2e19b 100644 --- a/packages/packages-depends +++ b/packages/packages-depends @@ -1,5 +1,5 @@ { - "borgbackup": "python3,python-setuptools,llfuse,msgpack-python", + "borgbackup": "python3,python-setuptools,llfuse,msgpack-python,python-packaging", "expect": "tcl", "iotop": "python2,libffi", "irssi": "utf8proc", diff --git a/packages/packages-desc b/packages/packages-desc index 2cedd5d..0e329d2 100644 --- a/packages/packages-desc +++ b/packages/packages-desc @@ -102,6 +102,7 @@ "psutil":"psutil is a module providing an interface for retrieving information on all running processes and system utilization (CPU, memory, disks, network, users) in a portable way by using Python, implementing many functionalities offered by command line tools such as: ps, top, df, kill, free, lsof, netstat, ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, and pmap.", "python2":"An interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. Its basic power can be extended with your own modules written in C or C++. It is also adaptable as an extension language for existing applications.", "python3":"Python is an interpreted, interactive, object-oriented programming language that combines remarkable power with very clear syntax. This is a new version of the language that is incompatible with the 2.x line of releases. The language is mostly the same, but many details, especially how built-in objects like dictionaries and strings work, have changed considerably, and a lot of deprecated features have finally been removed. Also, the standard library has been reorganized in a few prominent places.", + "python-packaging":"Core utilities for Python packages https://pypi.org/project/packaging/", "python-pip":"pip is a tool for installing and managing Python packages.", "python-setuptools":"A collection of enhancements to Python distutils.", "ranger":"A multi-column display allows viewing in a tree-like manner. You can preview the content of the selected file or directory, copy or move files around with the VIM-like commands dd and yy, execute predefined applications when opening a file, etc.", diff --git a/plugin/NerdTools.plg b/plugin/NerdTools.plg index c051052..29639fb 100644 --- a/plugin/NerdTools.plg +++ b/plugin/NerdTools.plg @@ -3,8 +3,8 @@ - - + + @@ -17,11 +17,13 @@ ##&name; +###2023.05.04 +- Enhanced: improvements in the treatment of dependencies +- Added: python-packaging-21.3 as dependency of borgbackup ###2023.05.02 - Update: borgbackup-1.2.4 - Update: python3-3.9.16-3 - Added: msgpack-python-1.0.5 as dependency of borgbackup -- Added: sg3_utils-1.47 (PR #41) ###2023.04.24 - Enhanced: improvements in package installation ###2023.03.30 diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php index 3f7a19f..b50c507 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php @@ -28,7 +28,7 @@ function get_content_from_github($repo, $file) { curl_setopt($ch, CURLOPT_URL, $repo); $content = curl_exec($ch); curl_close($ch); - if (!empty($content) && (!is_file($file) || $content != file_get_contents($file))) + if (!empty($content)) file_put_contents($file, $content); } diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php index c5ade45..c02d4f4 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/NerdToolsHelpers.php @@ -13,10 +13,12 @@ if (!is_dir($pkg_extra_path)) $pkg_desc = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-desc'; $pkg_repo = "https://api.github.com/repos/UnRAIDES/unRAID-NerdTools/contents/packages/$os_version"; +$pkg_depends = 'https://raw.githubusercontent.com/UnRAIDES/unRAID-NerdTools/main/packages/packages-depends'; -$desc_file = $pkg_path.'packages-desc'; -$repo_file = $pkg_path.'packages.json'; -$config_file = $plg_path.'NerdTools.cfg'; +$desc_file = $pkg_path.'packages-desc'; +$repo_file = $pkg_path.'packages.json'; +$config_file = $plg_path.'NerdTools.cfg'; +$depends_file = $plg_path.'packages-depends'; // get package configs $pkg_cfg = file_exists($config_file) ? parse_ini_file($config_file) : []; @@ -31,6 +33,8 @@ $pkgs_desc_array = file_exists($desc_file) ? json_decode(file_get_contents($de $pkgs_github_array = file_exists($repo_file) ? json_decode(file_get_contents($repo_file), true) : []; +$depends_file_array = file_exists($depends_file) ? json_decode(file_get_contents($depends_file), true) : []; + function logger($output, $quiet = false) { exec('echo '.escapeshellarg($output).' 2>&1 | logger -tnerdpack'); if (!$quiet) { diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php index 06b1c14..9d08d89 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/include/PackageQuery.php @@ -6,8 +6,10 @@ require_once '/usr/local/emhttp/plugins/NerdTools/include/DownloadHelpers.php'; if (!file_exists($repo_file) || !empty($_GET['force']) || (filemtime($repo_file) < (time() - 3600))) { get_content_from_github($pkg_repo, $repo_file); get_content_from_github($pkg_desc, $desc_file); + get_content_from_github($pkg_depends, $depends_file); $pkgs_desc_array = file_exists($desc_file) ? json_decode(file_get_contents($desc_file), true) : []; $pkgs_github_array = file_exists($repo_file) ? json_decode(file_get_contents($repo_file), true) : []; + $depends_file_array = file_exists($depends_file) ? json_decode(file_get_contents($depends_file), true) : []; } $pkgs_array = []; @@ -64,21 +66,22 @@ foreach ($pkgs_github_array as $pkg_github) { if (!array_key_exists($pkg_name, $pkgs_desc_array)) $pkgs_desc_array[$pkg_name] = ""; $pkg = [ - 'name' => str_replace("_nerdtools.txz",".txz",$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 - 'updatePkg' => $updatePkg, // add package name with raw version - 'updatePkgs' => "$pkg_version => $downloadedpkgv", // add package name with raw version - 'size' => format_size($pkg_github['size'], 1, '?'), // add package size - 'installed' => !empty(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 installed equals github exactly - 'downloaded' => !empty(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 downloaded equals github exactly - 'actualpkgv' => $downloadedpkgv ? $downloadedpkgv:" - ", // checks if package name is downloaded - 'config' => $pkg_set, // install preference - 'plugins' => $pkg_plgs, // plugins dependency on package - 'desc' => $pkgs_desc_array[$pkg_name] + 'name' => str_replace("_nerdtools.txz",".txz",$pkg_github['name']) , // add full package name + 'dependencies' => $depends_file_array[$pkg_name] ? str_replace(array(" ",","), array("",", "), $depends_file_array[$pkg_name]) : '', // add package name only + '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 + 'updatePkg' => $updatePkg, // add package name with raw version + 'updatePkgs' => "$pkg_version => $downloadedpkgv", // add package name with raw version + 'size' => format_size($pkg_github['size'], 1, '?'), // add package size + 'installed' => !empty(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 installed equals github exactly + 'downloaded' => !empty(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 downloaded equals github exactly + 'actualpkgv' => $downloadedpkgv ? $downloadedpkgv:" - ", // checks if package name is downloaded + 'config' => $pkg_set, // install preference + 'plugins' => $pkg_plgs, // plugins dependency on package + 'desc' => $pkgs_desc_array[$pkg_name] ]; $pkgs_array[] = $pkg; diff --git a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js index 272f9ba..d5044a4 100644 --- a/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js +++ b/source/NerdTools/usr/local/emhttp/plugins/NerdTools/js/jquery.NerdTools.js @@ -140,10 +140,10 @@ function checkDepends() { console.log(data) $.each(data,function(index, value){ if ($('#'+index)[0]){ - value.split(",").forEach(function (item) { + value.split(",").forEach(function (item) { if (item && $('#'+index)[0].checked) { - $('#' + item).switchButton({ checked: true }); - $('#' + item, '.pkgvalue').val('yes'); + $('#' + item.trim()).switchButton({ checked: true }); + $('#' + item.trim(), '.pkgvalue').val('yes'); } }); }