From 077af20ceb0869ddff9e08f5db1055138450fe2e Mon Sep 17 00:00:00 2001 From: "Kevin (Kun) \"Kassimo\" Qian" Date: Mon, 18 Feb 2019 15:26:41 -0800 Subject: Add `seek` and implement `Seeker` on `File` (#1797) This patch contains a special hack that circumvents the current tokio seek problem. tokio `seek` is implemented to take ownership of the original File and emit a new one in its future, which conflicts with the design of ResourceTable. To avoid the problem, the current hack makes the FsFile resource an Option which we could `take` the value ownership out of it. We then convert the tokio File into a Rust std File, perform the seek, and then put it back into the resource. This might be able to drop this hack after https://github.com/tokio-rs/tokio/pull/785 lands. --- js/files_test.ts | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 9 deletions(-) (limited to 'js/files_test.ts') diff --git a/js/files_test.ts b/js/files_test.ts index 6698f85c3..5d23cff52 100644 --- a/js/files_test.ts +++ b/js/files_test.ts @@ -141,15 +141,61 @@ testPerm({ read: true, write: true }, async function openModeWriteRead() { fileInfo = Deno.statSync(filename); assertEqual(fileInfo.len, 13); - // TODO: this test is not working, I expect because - // file handle points to the end of file, but ATM - // deno has no seek implementation on Rust side - // assert file can be read - // const buf = new Uint8Array(20); - // const result = await file.read(buf); - // console.log(result.eof, result.nread); - // assertEqual(result.nread, 13); - // file.close(); + const buf = new Uint8Array(20); + await file.seek(0, Deno.SeekMode.SEEK_START); + const result = await file.read(buf); + assertEqual(result.nread, 13); + file.close(); await Deno.remove(tempDir, { recursive: true }); }); + +testPerm({ read: true }, async function seekStart() { + const filename = "tests/hello.txt"; + const file = await Deno.open(filename); + // Deliberately move 1 step forward + await file.read(new Uint8Array(1)); // "H" + // Skipping "Hello " + await file.seek(6, Deno.SeekMode.SEEK_START); + const buf = new Uint8Array(6); + await file.read(buf); + const decoded = new TextDecoder().decode(buf); + assertEqual(decoded, "world!"); +}); + +testPerm({ read: true }, async function seekCurrent() { + const filename = "tests/hello.txt"; + const file = await Deno.open(filename); + // Deliberately move 1 step forward + await file.read(new Uint8Array(1)); // "H" + // Skipping "ello " + await file.seek(5, Deno.SeekMode.SEEK_CURRENT); + const buf = new Uint8Array(6); + await file.read(buf); + const decoded = new TextDecoder().decode(buf); + assertEqual(decoded, "world!"); +}); + +testPerm({ read: true }, async function seekEnd() { + const filename = "tests/hello.txt"; + const file = await Deno.open(filename); + await file.seek(-6, Deno.SeekMode.SEEK_END); + const buf = new Uint8Array(6); + await file.read(buf); + const decoded = new TextDecoder().decode(buf); + assertEqual(decoded, "world!"); +}); + +testPerm({ read: true }, async function seekMode() { + const filename = "tests/hello.txt"; + const file = await Deno.open(filename); + let err; + try { + await file.seek(1, -1); + } catch (e) { + err = e; + } + assert(!!err); + assertEqual(err.kind, Deno.ErrorKind.InvalidSeekMode); + assertEqual(err.name, "InvalidSeekMode"); +}); -- cgit v1.2.3