few improvements on ReadableToSeekable

Author: lecousin

net.lecousin.core/src/main/java/net/lecousin/framework/io/buffering/ReadableToSeekable.java

@@ -155,6 +155,10 @@ public void fire(CancelException event) {
 	}
 
 	private void readNextBuffer() {
+		if (knownSize == ioPos) {
+			buffering = new AsyncWork<Boolean,IOException>(Boolean.TRUE, null);
+			return;
+		}
 		buffering = new AsyncWork<Boolean,IOException>();
 		ByteBuffer buffer = ByteBuffer.allocate(8192);
 		AsyncWork<Integer,IOException> read = io.readFullyAsync(buffer);
@@ -184,8 +188,10 @@ private void readNextBuffer() {
 		}, buffering);
 	}
 
+	/** Wait to be able to read at least one byte at the given position, return false if this is beyond the end. */
 	private boolean waitPosition(long pos) throws IOException {
 		while (pos >= ioPos) {
+			if (knownSize == ioPos) return false;
 			buffering.block(0);
 			if (pos < ioPos) break;
 			synchronized (this) {
@@ -304,7 +310,7 @@ public void run() {
 						result.unblockCancel(bufferize.getCancelEvent());
 						return;
 					}
-					if (!bufferize.isSuccessful()) {
+					if (bufferize.hasError()) {
 						if (ondone != null) ondone.run(new Pair<>(null, bufferize.getError()));
 						result.unblockError(bufferize.getError());
 						return;

net.lecousin.core/src/main/java/net/lecousin/framework/io/out2in/OutputToInput.java

@@ -49,7 +49,7 @@ protected void closeResources(SynchronizationPoint<Exception> ondone) {
 	}
 
 	@Override
-	public byte getPriority() { return io.getPriority(); }
+	public byte getPriority() { return io != null ? io.getPriority() : Task.PRIORITY_NORMAL; }
 
 	@Override
 	public void setPriority(byte priority) { io.setPriority(priority); }

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/TestReadableToSeekableReadableSeekableUsingOutputToInput.java

@@ -0,0 +1,45 @@
+package net.lecousin.framework.core.tests.io;
+
+import java.io.File;
+import java.util.Collection;
+
+import net.lecousin.framework.concurrent.Task;
+import net.lecousin.framework.core.test.io.TestIO;
+import net.lecousin.framework.core.test.io.TestReadableSeekable;
+import net.lecousin.framework.io.FileIO;
+import net.lecousin.framework.io.IO;
+import net.lecousin.framework.io.IOUtil;
+import net.lecousin.framework.io.buffering.ReadableToSeekable;
+import net.lecousin.framework.io.out2in.OutputToInput;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TestReadableToSeekableReadableSeekableUsingOutputToInput extends TestReadableSeekable {
+
+	@Parameters(name = "nbBuf = {2}")
+	public static Collection<Object[]> parameters() {
+		return TestIO.UsingGeneratedTestFiles.generateTestCases(false);
+	}
+	
+	public TestReadableToSeekableReadableSeekableUsingOutputToInput(File testFile, byte[] testBuf, int nbBuf) {
+		super(testFile, testBuf, nbBuf);
+	}
+	
+	@SuppressWarnings("resource")
+	@Override
+	protected IO.Readable.Seekable createReadableSeekableFromFile(FileIO.ReadOnly file, long fileSize) throws Exception {
+		File tmp = File.createTempFile("test", "readableasseekable");
+		tmp.deleteOnExit();
+		FileIO.ReadWrite tmpIO = new FileIO.ReadWrite(tmp, Task.PRIORITY_NORMAL);
+		OutputToInput o2i = new OutputToInput(tmpIO, "test");
+		IOUtil.copy(file, o2i, fileSize, false, null, 0).listenInline(() -> {
+			file.closeAsync();
+			o2i.endOfData();
+		});
+		return new ReadableToSeekable(o2i, 512);
+	}
+	
+}