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

i2psnark standalone: Add search icon, display full version

Browse Source
This commit is contained in:
zzz
2023-01-19 08:51:04 -05:00
parent d39d21296f
commit 1b3aed6b6a
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2psnark/java/build.xml
View File

@ -298,6 +298,12 @@
value="url(/i2psnark/.resources/themes/ubergine/images/" >
<include name="**/*.css" />
</replace>
<replace dir="build/standalone-resources/.resources/themes"
summary="true"
token="url(/themes/console/images/buttons/"
value="url(/i2psnark/.resources/icons/" >
<include name="**/*.css" />
</replace>
<!-- Rather than pulling in all the console theme images, let's just specify the ones we need -->
<copy file="../../routerconsole/jsp/themes/console/images/transparent.gif"
@ -308,6 +314,8 @@
todir="build/standalone-resources/.resources/themes/light/images" />
<copy file="../../routerconsole/jsp/themes/console/images/info/errortriangle.png"
todir="build/standalone-resources/.resources/themes/ubergine/images" />
<copy file="../../routerconsole/jsp/themes/console/images/buttons/search.png"
todir="build/standalone-resources/.resources/icons" />
<mkdir dir="build/standalone-resources/.resources/js" />
<copy file="../../routerconsole/jsp/js/ajax.js" todir="build/standalone-resources/.resources/js" />

4
apps/i2psnark/java/src/org/klomp/snark/CommandLine.java
View File

@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.i2p.CoreVersion;
/**
* Simple command line access to various utilities.
* Not a public API. Subject to change.
@ -38,7 +36,7 @@ public class CommandLine extends net.i2p.util.CommandLine {
}
private static void usage(List<String> classes) {
System.err.println("I2PSnark version " + CoreVersion.VERSION + '\n' +
System.err.println("I2PSnark version " + SnarkManager.FULL_VERSION + '\n' +
"USAGE: java -jar /path/to/i2psnark.jar command [args]");
printCommands(classes);
}

4
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -25,6 +25,7 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import net.i2p.CoreVersion;
import net.i2p.I2PAppContext;
import net.i2p.app.ClientApp;
import net.i2p.app.ClientAppManager;
@ -174,6 +175,9 @@ public class SnarkManager implements CompleteListener, ClientApp, DisconnectList
private static final String SUBDIR_PREFIX = "s";
private static final String B64 = Base64.ALPHABET_I2P;
private static final int MAX_MESSAGES = 100;
private static final String EXTRA = "";
/** @since 0.9.58 */
public static final String FULL_VERSION = CoreVersion.VERSION + EXTRA;
/**
* "name", "announceURL=websiteURL" pairs

4
apps/i2psnark/java/src/org/klomp/snark/standalone/RunStandalone.java
View File

@ -15,6 +15,8 @@ import net.i2p.jetty.I2PLogger;
import net.i2p.jetty.JettyStart;
import net.i2p.util.SystemVersion;
import org.klomp.snark.SnarkManager;
/**
* @since moved from ../web and fixed in 0.9.27
*/
@ -71,7 +73,7 @@ public class RunStandalone {
public void start() {
try {
String url = "http://" + _host + ':' + _port + "/i2psnark/";
System.out.println("Starting i2psnark at " + url);
System.out.println("Starting i2psnark " + SnarkManager.FULL_VERSION + " at " + url);
startTrayApp();
_jettyStart.startup();
try {

2
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -367,7 +367,7 @@ public class I2PSnarkServlet extends BasicServlet {
else
out.write(_contextName);
if (!_context.isRouterContext()) {
out.write(' ' + CoreVersion.VERSION);
out.write(' ' + SnarkManager.FULL_VERSION);
}
out.write("</a>");
List<Tracker> sortedTrackers = null;