echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New install setup wizard

Browse Source 
Work in progress, run on first install disabled.
Language and bw settings should work,
other panes todo.
This commit is contained in:
zzz
2018-11-13 17:46:18 +00:00
parent c074467163
commit f8f6375738
6 changed files with 394 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigNetHandler.java
View File

@ -477,8 +477,8 @@ public class ConfigNetHandler extends FormHandler {
_context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
}
private static final int DEF_BURST_PCT = 10;
private static final int DEF_BURST_TIME = 20;
static final int DEF_BURST_PCT = 10;
static final int DEF_BURST_TIME = 20;
/**
* @return changed

6
apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java
View File

@ -185,6 +185,12 @@ class SummaryBarRenderer {
.append(_t("A short guide to the sidebar's network reachability notification"))
.append("\">")
.append(nbsp(_t("Reachability")))
.append("</a>\n" +
"<a href=\"/welcome\" target=\"_top\" title=\"")
.append(_t("New Install Wizard"))
.append("\">")
.append(nbsp(_t("Setup")))
.append("</a>\n" +
"<a href=\"/help#sidebarhelp\" target=\"_top\" title=\"")

102
apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHandler.java Normal file
View File

@ -0,0 +1,102 @@
package net.i2p.router.web.helpers;
import java.util.HashMap;
import java.util.Map;
import net.i2p.router.Router;
import net.i2p.router.transport.FIFOBandwidthRefiller;
import net.i2p.router.web.FormHandler;
/**
* The new user wizard.
*
* @since 0.9.38
*/
public class WizardHandler extends FormHandler {
@Override
protected void processForm() {
if (_action == null)
return;
if (getJettyString("next") == null)
return;
if (_action.equals("blah")) {
// note that the page is the page we are on now,
// which is the page after the one the settings were on.
String page = getJettyString("page");
if (getJettyString("lang") != null) {
// Saved in CSSHelper, assume success
addFormNoticeNoEscape(_t("Console language saved."));
}
if ("6".equals(page)) {
Map<String, String> changes = new HashMap<String, String>();
boolean updated = updateRates(changes);
if (updated) {
boolean saved = _context.router().saveConfig(changes, null);
if (saved) // needed?
addFormNotice(_t("Configuration saved successfully"));
else
addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
}
}
} else {
addFormError(_t("Unsupported") + ": " + _action);
}
}
/**
* Modified from ConfigNetHandler
* @return changed
*/
private boolean updateRates(Map<String, String> changes) {
boolean updated = false;
boolean bwUpdated = false;
String sharePct = getJettyString("sharePercentage");
String inboundRate = getJettyString("inboundrate");
String outboundRate = getJettyString("outboundrate");
if (sharePct != null) {
String old = _context.router().getConfigSetting(Router.PROP_BANDWIDTH_SHARE_PERCENTAGE);
if ( (old == null) || (!old.equals(sharePct)) ) {
changes.put(Router.PROP_BANDWIDTH_SHARE_PERCENTAGE, sharePct);
addFormNotice(_t("Updating bandwidth share percentage"));
updated = true;
}
}
if ((inboundRate != null) && (inboundRate.length() > 0) &&
!inboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH,
Integer.toString(FIFOBandwidthRefiller.DEFAULT_INBOUND_BURST_BANDWIDTH)))) {
try {
float rate = Integer.parseInt(inboundRate) / 1.024f;
float kb = ConfigNetHandler.DEF_BURST_TIME * rate;
changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BURST_BANDWIDTH, Integer.toString(Math.round(rate)));
changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH_PEAK, Integer.toString(Math.round(kb)));
rate -= Math.min(rate * ConfigNetHandler.DEF_BURST_PCT / 100, 50);
changes.put(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH, Integer.toString(Math.round(rate)));
bwUpdated = true;
} catch (NumberFormatException nfe) {
addFormError(_t("Invalid bandwidth"));
}
}
if ((outboundRate != null) && (outboundRate.length() > 0) &&
!outboundRate.equals(_context.getProperty(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH,
Integer.toString(FIFOBandwidthRefiller.DEFAULT_OUTBOUND_BURST_BANDWIDTH)))) {
try {
float rate = Integer.parseInt(outboundRate) / 1.024f;
float kb = ConfigNetHandler.DEF_BURST_TIME * rate;
changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BURST_BANDWIDTH, Integer.toString(Math.round(rate)));
changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH_PEAK, Integer.toString(Math.round(kb)));
rate -= Math.min(rate * ConfigNetHandler.DEF_BURST_PCT / 100, 50);
changes.put(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH, Integer.toString(Math.round(rate)));
bwUpdated = true;
} catch (NumberFormatException nfe) {
addFormError(_t("Invalid bandwidth"));
}
}
if (bwUpdated) {
addFormNotice(_t("Updated bandwidth limits"));
updated = true;
}
return updated;
}
}

15
apps/routerconsole/java/src/net/i2p/router/web/helpers/WizardHelper.java Normal file
View File

@ -0,0 +1,15 @@
package net.i2p.router.web.helpers;
import net.i2p.router.web.HelperBase;
/**
* The new user wizard.
*
* @since 0.9.38
*/
public class WizardHelper extends HelperBase {
public void complete() {
_context.router().saveConfig("routerconsole.welcomeWizardComplete", "true");
}
}