mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-15 14:09:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Plugins page loading improvements

Browse Source
This commit is contained in:
bergware
2021-05-10 10:03:05 +02:00
parent b09c587009
commit ee0ba30cbe
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/dynamix.plugin.manager/Plugins.page
View File

@@ -71,17 +71,20 @@ function initlist() {
});
}
function loadlist(id) {
if (id) timers.plugins = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
$.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{audit:id,check:0},function(d) {
var data = d.split(/\0/);
var list = $('#plugin_list');
if (id) {
clearTimeout(timers.plugins);
$('div.spinner.fixed').hide('slow');
var cmd = id.split(':');
var tr = 'tr#'+cmd[0].replace(/[\. _]/g,'');
switch (cmd[1]) {
case 'update' :
case 'return' : updateInfo(data[0]); break;
case 'remove' : list.find(tr).remove(); break;
case 'install': if (!list.find(tr).length) list.append(data[0]); break;
case 'install': if (!list.find(tr).length) list.append(data[0]); loadlist(); break;
}
} else {
updateInfo(data[0]);

2
plugins/dynamix.plugin.manager/Update.page
View File

@@ -87,7 +87,7 @@ function loadlist(id) {
switch (cmd[1]) {
case 'update':
case 'return' : updateInfo(data); break;
case 'install': list.find(tr).remove(); list.append(data); break;
case 'install': list.find(tr).remove(); list.append(data); loadlist(); break;
}
} else {
updateInfo(data);

35
plugins/dynamix.plugin.manager/include/ShowPlugins.php
View File

@@ -49,24 +49,9 @@ foreach (glob($plugins,GLOB_NOSORT) as $plugin_link) {
$user = in_array($name,$builtin);
//switch between system and user plugins
if (($system && !$user) || (!$system && $user)) continue;
//OS update?
$os = $system && $name==$builtin[0];
if ($init || $install) {
//OS update?
$os = $system && $name==$builtin[0];
$past = false;
//toggle stable/next release?
if ($os && $branch) {
$past = plugin('version',$plugin_file);
$tmp_plg = "$name-.plg";
$tmp_file = "/var/tmp/$name.plg";
copy($plugin_file,$tmp_file);
exec("sed -ri 's|^(<!ENTITY category).*|\\1 \"{$branch}\">|' $tmp_file");
symlink($tmp_file,"/var/log/plugins/$tmp_plg");
$next = end(explode("\n",check_plugin($tmp_plg,$ncsi)));
if (version_compare($next,$past,'>')) {
copy("/tmp/plugins/$tmp_plg",$tmp_file);
$plugin_file = $tmp_file;
}
}
//icon + link
$launch = plugin('launch',$plugin_file);
if ($icon = plugin('icon',$plugin_file)) {
@@ -128,11 +113,27 @@ foreach (glob($plugins,GLOB_NOSORT) as $plugin_link) {
} else {
//forced plugin check?
$checked = (!$audit && !$check) ? check_plugin(basename($plugin_file),$ncsi) : true;
$past = false;
//toggle stable/next release?
if ($os && $branch) {
$past = plugin('version',$plugin_file);
$tmp_plg = "$name-.plg";
$tmp_file = "/var/tmp/$name.plg";
copy($plugin_file,$tmp_file);
exec("sed -ri 's|^(<!ENTITY category).*|\\1 \"{$branch}\">|' $tmp_file");
symlink($tmp_file,"/var/log/plugins/$tmp_plg");
$next = end(explode("\n",check_plugin($tmp_plg,$ncsi)));
if (version_compare($next,$past,'>')) {
copy("/tmp/plugins/$tmp_plg",$tmp_file);
$plugin_file = $tmp_file;
}
}
//version
$version = plugin('version',$plugin_file) ?: _('unknown');
$date = str_replace('.','',$version);
//status
$status = _('unknown');
//compare
$changes_file = $plugin_file;
$url = plugin('pluginURL',$plugin_file);
if ($url !== false) {