Author: toad
Date: 2006-01-14 16:57:12 +0000 (Sat, 14 Jan 2006)
New Revision: 7854
Modified:
trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
trunk/freenet/src/freenet/client/Metadata.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/Version.java
Log:
350: MIME type in redirects related fixes.
Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClient.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2006-01-14
01:51:07 UTC (rev 7853)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClient.java 2006-01-14
16:57:12 UTC (rev 7854)
@@ -1,5 +1,7 @@
package freenet.client;
+import java.util.HashMap;
+
import freenet.client.events.ClientEventListener;
import freenet.keys.FreenetURI;
import freenet.node.RequestStarterClient;
@@ -34,6 +36,11 @@
public FreenetURI insertRedirect(FreenetURI insertURI, FreenetURI
target) throws InserterException;
/**
+ * Blocking insert of multiple files as a manifest (or zip manifest,
etc).
+ */
+ public FreenetURI insertManifest(FreenetURI insertURI, HashMap
bucketsByName) throws InserterException;
+
+ /**
* Add a ClientEventListener.
*/
public void addGlobalHook(ClientEventListener listener);
Modified: trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-01-14 01:51:07 UTC (rev 7853)
+++ trunk/freenet/src/freenet/client/HighLevelSimpleClientImpl.java
2006-01-14 16:57:12 UTC (rev 7854)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
+import java.util.HashMap;
import freenet.client.events.ClientEventListener;
import freenet.client.events.ClientEventProducer;
@@ -135,6 +136,11 @@
return i.run(block, true, false, false);
}
+ public FreenetURI insertManifest(FreenetURI insertURI, HashMap
bucketsByName) throws InserterException {
+ // FIXME
+ throw new UnsupportedOperationException();
+ }
+
public void addGlobalHook(ClientEventListener listener) {
globalEventProducer.addEventListener(listener);
}
Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java 2006-01-14 01:51:07 UTC
(rev 7853)
+++ trunk/freenet/src/freenet/client/Metadata.java 2006-01-14 16:57:12 UTC
(rev 7854)
@@ -117,7 +117,7 @@
}
if(noMIME) {
- mimeType = DefaultMIMETypes.DEFAULT_MIME_TYPE;
+ mimeType = null;
Logger.minor(this, "noMIME enabled");
} else {
if(compressedMIME) {
@@ -387,8 +387,10 @@
clientMetadata = cm;
if(cm != null)
setMIMEType(cm.getMIMEType());
- else
+ else {
setMIMEType(DefaultMIMETypes.DEFAULT_MIME_TYPE);
+ noMIME = true;
+ }
simpleRedirectKey = uri;
} else
throw new IllegalArgumentException();
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-14
01:51:07 UTC (rev 7853)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-14
16:57:12 UTC (rev 7854)
@@ -503,6 +503,8 @@
directory = directory + "/";
File thisdir = new File(directory);
+ System.out.println("Listing dir: "+thisdir);
+
HashMap ret = new HashMap();
File filelist[] = thisdir.listFiles();
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-14 01:51:07 UTC (rev
7853)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-14 16:57:12 UTC (rev
7854)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 349;
+ public static final int buildNumber = 350;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 348;
