From e2cbb54b2c8f5666a9eabcbf80fb6a3e4d0676a3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 28 Feb 2021 09:46:06 +0300
Subject: [PATCH] plugin updater: show changes before updating
---
classes/pref/prefs.php | 2 +-
js/PrefHelpers.js | 76 +++++++++++++++++++++++++++++-------------
2 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 8746aa1e0..7f986858f 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1174,7 +1174,7 @@ class Pref_Prefs extends Handler_Protected {
$root_dir = dirname(dirname(__DIR__)); # we're in classes/pref/
if (!empty($plugin_name)) {
- $rv = ["plugin" => $plugin_name, "rv" => self::_plugin_needs_update($root_dir, $plugin_name)];
+ $rv = [["plugin" => $plugin_name, "rv" => self::_plugin_needs_update($root_dir, $plugin_name)]];
} else {
$rv = self::_get_updated_plugins();
}
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index efb6a2a89..4fb3cdddf 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -323,39 +323,30 @@ const Helpers = {
});
},
update: function(name = null) {
- const msg = name ? __("Update %p using git?").replace("%p", name) :
- __("Update all local plugins using git?");
- if (confirm(msg)) {
-
- const dialog = new fox.SingleUseDialog({
- title: __("Plugin Updater"),
- execute: function() {
+ const dialog = new fox.SingleUseDialog({
+ title: __("Plugin Updater"),
+ need_refresh: false,
+ onHide: function() {
+ if (this.need_refresh) {
Helpers.Prefs.refresh();
- },
- content: `
- <ul class="panel panel-scrollable update-results">
- <li>${__("Loading, please wait...")}</li>
- </ul>
-
- <footer class="text-center">
- ${App.FormFields.submit_tag(__("Reload preferences"))}
- </footer>
- `,
- });
+ }
+ },
+ performUpdate: function() {
+ const container = dialog.domNode.querySelector(".update-results");
- const tmph = dojo.connect(dialog, 'onShow', function () {
- dojo.disconnect(tmph);
+ container.innerHTML = `<li>${__("Loading, please wait...")}</li>`;
xhr.json("backend.php", {op: "pref-prefs", method: "updateLocalPlugins", name: name}, (reply) => {
- const container = dialog.domNode.querySelector(".update-results");
if (!reply) {
- container.innerHTML = __("Operation failed: check event log.");
+ container.innerHTML = `<li>${__("Operation failed: check event log.")}</li>`;
} else {
container.innerHTML = "";
reply.forEach((p) => {
+ if (p.rv.s == 0) dialog.need_refresh = true;
+
container.innerHTML +=
`
<li><h3 style="margin-top: 0">${p.plugin}</h3>
@@ -369,11 +360,48 @@ const Helpers = {
});
}
});
+ },
+ content: `
+ <ul class="panel panel-scrollable update-results">
+ <li>${__("Loading, please wait...")}</li>
+ </ul>
+
+ <footer>
+ ${App.FormFields.button_tag(__("Update"), "", {class: "alt-primary", onclick: "App.dialogOf(this).performUpdate()"})}
+ ${App.FormFields.cancel_dialog_tag(__("Close"))}
+ </footer>
+ `,
+ });
+
+ const tmph = dojo.connect(dialog, 'onShow', function () {
+ dojo.disconnect(tmph);
+
+ xhr.json("backend.php", {op: "pref-prefs", method: "checkForPluginUpdates", name: name}, (reply) => {
+ const container = dialog.domNode.querySelector(".update-results");
+ if (!reply) {
+ container.innerHTML = `<li>${__("Operation failed: check event log.")}</li>`;
+ } else {
+ container.innerHTML = "";
+
+ reply.forEach((p) => {
+ container.innerHTML +=
+ `
+ <li><h3 style="margin-top: 0">${p.plugin}</h3>
+ ${p.rv.e ? `<pre class="small text-error">${p.rv.e}</pre>` : ''}
+ ${p.rv.o ? `<pre class="small text-success">${p.rv.o}</pre>` : ''}
+ <p class="small">
+ ${p.rv.s ? __("Exited with RC: %d").replace("%d", p.rv.s) : __("OK")}
+ </p>
+ </li>
+ `
+ });
+ }
});
- dialog.show();
- }
+ });
+
+ dialog.show();
},
},
OPML: {
--
GitLab