Author: saces
Date: 2008-04-19 13:07:56 +0000 (Sat, 19 Apr 2008)
New Revision: 19412
Modified:
trunk/plugins/KeyExplorer/KeyExplorer.java
trunk/plugins/KeyExplorer/VerySimpleGet.java
trunk/plugins/KeyExplorer/VerySimpleGetter.java
Log:
-KeyExplorer should now handle all keys
-logging
Modified: trunk/plugins/KeyExplorer/KeyExplorer.java
===================================================================
--- trunk/plugins/KeyExplorer/KeyExplorer.java 2008-04-19 07:58:46 UTC (rev
19411)
+++ trunk/plugins/KeyExplorer/KeyExplorer.java 2008-04-19 13:07:56 UTC (rev
19412)
@@ -12,6 +12,7 @@
import freenet.keys.BaseClientKey;
import freenet.keys.ClientKey;
import freenet.keys.FreenetURI;
+import freenet.keys.USK;
import freenet.node.LowLevelGetException;
import freenet.pluginmanager.FredPlugin;
import freenet.pluginmanager.FredPluginFCP;
@@ -67,7 +68,9 @@
sfs.put("Pong", System.currentTimeMillis());
replysender.send(sfs);
return;
- } else if ("Get".equals(command)) {
+ }
+
+ if ("Get".equals(command)) {
final String identifier = params.get("Identifier");
if (identifier == null || identifier.trim().length() ==
0) {
@@ -83,13 +86,13 @@
try {
FreenetURI furi = new FreenetURI(uri);
- GetResult getresult = simpleGet(furi);
+ GetResult getResult = simpleGet(furi);
SimpleFieldSet sfs = new SimpleFieldSet(true);
sfs.putSingle("Identifier", identifier);
- sfs.put("IsMetadata", getresult.isMetaData);
+ sfs.put("IsMetadata", getResult.isMetaData);
sfs.putSingle("Status", "DataFound");
- replysender.send(sfs, getresult.data);
+ replysender.send(sfs, getResult.data);
return;
} catch (MalformedURLException e) {
@@ -153,10 +156,17 @@
String error = null;
byte[] data = null;
GetResult getresult = null;
+
+ FreenetURI furi = null;
try {
if (key != null && (key.trim().length() > 0)) {
- FreenetURI furi = new FreenetURI(key);
+ furi = new FreenetURI(key);
+ if ("USK".equals(furi.getKeyType())) {
+ USK tempUSK = USK.create(furi);
+ ClientKey tempKey = tempUSK.getSSK();
+ furi = tempKey.getURI();
+ }
getresult = simpleGet(furi);
data = BucketTools.toByteArray(getresult.data);
}
@@ -175,7 +185,7 @@
contentNode.addChild(createUriBox());
if (data != null) {
- String title = "Key: " + key;
+ String title = "Key: " + furi.toString();
if (getresult.isMetaData)
title = title + "\u00a0(MetaData)";
HTMLNode dataBox2 = m_pm.getInfobox(title);
Modified: trunk/plugins/KeyExplorer/VerySimpleGet.java
===================================================================
--- trunk/plugins/KeyExplorer/VerySimpleGet.java 2008-04-19 07:58:46 UTC
(rev 19411)
+++ trunk/plugins/KeyExplorer/VerySimpleGet.java 2008-04-19 13:07:56 UTC
(rev 19412)
@@ -36,7 +36,6 @@
public void onFailure(LowLevelGetException e, Object token,
RequestScheduler sheduler) {
error = e;
finished = true;
- Logger.error(this, "TODO", e);
synchronized(waiter)
{
waiter.notifyAll();
@@ -48,7 +47,6 @@
ismetadata = block.isMetadata();
if(data == null) return; // failed
finished = true;
- Logger.error(this, "TODO", new Error("TODO"));
synchronized(waiter)
{
waiter.notifyAll();
@@ -66,7 +64,6 @@
// Ignore
}
}
- Logger.error(this, "TODO", new Error("TODO"));
if(error != null) throw error;
return data;
}
Modified: trunk/plugins/KeyExplorer/VerySimpleGetter.java
===================================================================
--- trunk/plugins/KeyExplorer/VerySimpleGetter.java 2008-04-19 07:58:46 UTC
(rev 19411)
+++ trunk/plugins/KeyExplorer/VerySimpleGetter.java 2008-04-19 13:07:56 UTC
(rev 19412)
@@ -34,16 +34,16 @@
}
public boolean isFinished() {
- Logger.error(this, "TODO", new Error("TODO"));
+ Logger.error(this, "TODO?", new Error("TODO?"));
return false;
}
public void notifyClients() {
- Logger.error(this, "TODO", new Error("TODO"));
+ Logger.error(this, "TODO?", new Error("TODO?"));
}
public void onTransition(ClientGetState oldState, ClientGetState
newState) {
- Logger.error(this, "TODO", new Error("TODO"));
+ Logger.error(this, "TODO?", new Error("TODO?"));
}
}
