banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check updates one plugin at a time

Browse Source
master
Andrew Dolgov 4 years ago
parent f4d0e7bb6d
commit 603cc89638
2 changed files with 86 additions and 59 deletions
Show Stats Download Patch File Download Diff File

17
classes/pref/prefs.php
Unescape Escape View File

@ -1049,7 +1049,7 @@ class Pref_Prefs extends Handler_Protected {
} }
$rv = array_values(array_filter($rv, function ($item) { $rv = array_values(array_filter($rv, function ($item) {
return !empty($item["rv"]["o"]); return $item["rv"]["need_update"];
})); }));
return $rv; return $rv;
@ -1071,10 +1071,10 @@ class Pref_Prefs extends Handler_Protected {
$proc = proc_open("git fetch -q origin -a && git log HEAD..origin/master --oneline", $descriptorspec, $pipes, $plugin_dir); $proc = proc_open("git fetch -q origin -a && git log HEAD..origin/master --oneline", $descriptorspec, $pipes, $plugin_dir);
if (is_resource($proc)) { if (is_resource($proc)) {
$rv["o"] = stream_get_contents($pipes[1]); $rv["stdout"] = stream_get_contents($pipes[1]);
$rv["e"] = stream_get_contents($pipes[2]); $rv["stderr"] = stream_get_contents($pipes[2]);
$status = proc_close($proc); $rv["git_status"] = proc_close($proc);
$rv["s"] = $status; $rv["need_update"] = !empty($rv["stdout"]);
} }
} }
@ -1098,10 +1098,9 @@ class Pref_Prefs extends Handler_Protected {
$proc = proc_open("git fetch origin -a && git log HEAD..origin/master --oneline && git pull --ff-only origin master", $descriptorspec, $pipes, $plugin_dir); $proc = proc_open("git fetch origin -a && git log HEAD..origin/master --oneline && git pull --ff-only origin master", $descriptorspec, $pipes, $plugin_dir);
if (is_resource($proc)) { if (is_resource($proc)) {
$rv["o"] = stream_get_contents($pipes[1]); $rv["stdout"] = stream_get_contents($pipes[1]);
$rv["e"] = stream_get_contents($pipes[2]); $rv["stderr"] = stream_get_contents($pipes[2]);
$status = proc_close($proc); $rv["git_status"] = proc_close($proc);
$rv["s"] = $status;
} }
} }

96
js/PrefHelpers.js
Unescape Escape View File

@ -358,7 +358,7 @@ const Helpers = {
// only user-enabled actually counts in the checkbox when saving because system plugin checkboxes are disabled (see below) // only user-enabled actually counts in the checkbox when saving because system plugin checkboxes are disabled (see below)
container.innerHTML += ` container.innerHTML += `
<li data-row-value="${App.escapeHtml(plugin.name)}" data-plugin-name="${App.escapeHtml(plugin.name)}" title="${plugin.is_system ? __("System plugins are enabled using global configuration.") : ""}"> <li data-row-value="${App.escapeHtml(plugin.name)}" data-plugin-local="${plugin.is_local}" data-plugin-name="${App.escapeHtml(plugin.name)}" title="${plugin.is_system ? __("System plugins are enabled using global configuration.") : ""}">
<label class="checkbox ${plugin.is_system ? "system text-info" : ""}"> <label class="checkbox ${plugin.is_system ? "system text-info" : ""}">
${App.FormFields.checkbox_tag("plugins[]", plugin.user_enabled || plugin.system_enabled, plugin.name, ${App.FormFields.checkbox_tag("plugins[]", plugin.user_enabled || plugin.system_enabled, plugin.name,
{disabled: plugin.is_system})}</div> {disabled: plugin.is_system})}</div>
@ -604,6 +604,7 @@ const Helpers = {
title: __("Update plugins"), title: __("Update plugins"),
need_refresh: false, need_refresh: false,
plugins_to_update: [], plugins_to_update: [],
plugins_to_check: [],
onHide: function() { onHide: function() {
if (this.need_refresh) { if (this.need_refresh) {
Helpers.Prefs.refresh(); Helpers.Prefs.refresh();
@ -634,10 +635,10 @@ const Helpers = {
` `
<li> <li>
<h3>${p.plugin}</h3> <h3>${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''} ${p.rv.stderr ? `<pre class="small text-error pre-wrap">${p.rv.stderr}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''} ${p.rv.stdout ? `<pre class="small text-success pre-wrap">${p.rv.stdout}</pre>` : ''}
<div class="small"> <div class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : ${p.rv.git_status ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.git_status) :
App.FormFields.icon("check") + " " + __("Update done.")} App.FormFields.icon("check") + " " + __("Update done.")}
</div> </div>
</li> </li>
@ -648,67 +649,94 @@ const Helpers = {
dijit.getEnclosingWidget(dialog.domNode.querySelector(".update-btn")).attr('disabled', !enable_update_btn); dijit.getEnclosingWidget(dialog.domNode.querySelector(".update-btn")).attr('disabled', !enable_update_btn);
}); });
}, },
content: ` checkNextPlugin: function() {
<ul class="panel panel-scrollable plugin-updater-list update-results"> const name = dialog.plugins_to_check.shift();
<li class='text-center'>${__("Looking for changes...")}</li>
</ul>
<footer> if (name) {
${App.FormFields.button_tag(App.FormFields.icon("update") + " " + __("Update"), "", {disabled: true, class: "update-btn alt-primary", onclick: "App.dialogOf(this).performUpdate()"})} this.checkUpdates(name);
${App.FormFields.cancel_dialog_tag(__("Close"))} } else {
</footer> const num_updated = dialog.plugins_to_update.length;
`,
});
const tmph = dojo.connect(dialog, 'onShow', function () { if (num_updated > 0)
dojo.disconnect(tmph); dialog.attr('title',
App.l10n.ngettext('Updates pending for %d plugin', 'Updates pending for %d plugins', num_updated)
.replace("%d", num_updated));
else
dialog.attr('title', __("No updates available"));
dijit.getEnclosingWidget(dialog.domNode.querySelector(".update-btn"))
.attr('disabled', num_updated == 0);
}
},
checkUpdates: function(name) {
console.log('checkUpdates', name);
xhr.json("backend.php", {op: "pref-prefs", method: "checkForPluginUpdates", name: name}, (reply) => {
const container = dialog.domNode.querySelector(".update-results"); const container = dialog.domNode.querySelector(".update-results");
let enable_update_btn = false;
dialog.attr('title', __("Checking: %s").replace("%s", name));
//container.innerHTML = `<li class='text-center'>${__("Checking: %s...").replace("%s", name)}</li>`;
xhr.json("backend.php", {op: "pref-prefs", method: "checkForPluginUpdates", name: name}, (reply) => {
if (!reply) { if (!reply) {
container.innerHTML = `<li class='text-center text-error'>${__("Operation failed: check event log.")}</li>`; container.innerHTML += `<li class='text-error'>${__("%s: Operation failed: check event log.").replace("%s", name)}</li>`;
} else { } else {
container.innerHTML = "";
dialog.plugins_to_update = [];
reply.forEach((p) => { reply.forEach((p) => {
if (p.rv.s == 0) { if (p.rv.need_update) {
enable_update_btn = true;
dialog.plugins_to_update.push(p.plugin); dialog.plugins_to_update.push(p.plugin);
}
const update_button = dijit.getEnclosingWidget( const update_button = dijit.getEnclosingWidget(
App.find(`*[data-update-btn-for-plugin="${p.plugin}"]`)); App.find(`*[data-update-btn-for-plugin="${p.plugin}"]`));
if (update_button) if (update_button)
update_button.domNode.show(); update_button.domNode.show();
}
if (p.rv.need_update || p.rv.git_status != 0) {
container.innerHTML += container.innerHTML +=
` `
<li><h3>${p.plugin}</h3> <li><h3>${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''} ${p.rv.stderr ? `<pre class="small text-error pre-wrap">${p.rv.stderr}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''} ${p.rv.stdout ? `<pre class="small text-success pre-wrap">${p.rv.stdout}</pre>` : ''}
<div class="small"> <div class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) : ${p.rv.git_status ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.git_status) :
App.FormFields.icon("check") + " " + __("Ready to update")} App.FormFields.icon("check") + " " + __("Ready to update")}
</div> </div>
</li> </li>
` `
});
if (!enable_update_btn) {
container.innerHTML = `<li class='text-center text-info'>${name ? __("Plugin %s is up-to-date").replace("%s", name) :
__("All local plugins are up-to-date.")}</li>`;
} }
dialog.checkNextPlugin();
});
} }
dijit.getEnclosingWidget(dialog.domNode.querySelector(".update-btn")).attr('disabled', !enable_update_btn); });
},
content: `
<ul class="panel panel-scrollable plugin-updater-list update-results">
</ul>
<footer>
${App.FormFields.button_tag(App.FormFields.icon("update") + " " + __("Update"), "", {disabled: true, class: "update-btn alt-primary", onclick: "App.dialogOf(this).performUpdate()"})}
${App.FormFields.cancel_dialog_tag(__("Close"))}
</footer>
`,
}); });
const tmph = dojo.connect(dialog, 'onShow', function () {
dojo.disconnect(tmph);
dialog.plugins_to_update = [];
if (name) {
dialog.checkUpdates(name);
} else {
dialog.plugins_to_check = [...document.querySelectorAll('*[data-plugin-name][data-plugin-local=true]')].map((p) => p.getAttribute('data-plugin-name'));
dialog.checkNextPlugin();
}
}); });
dialog.show(); dialog.show();

Write Preview
Loading…
Cancel
Save