danog/file
1
0
Fork 0
mirror of https://github.com/danog/file.git synced 2024-11-26 11:54:54 +01:00
Code Issues Projects Releases Wiki Activity

Return written length in blocking and parallel drivers, test

Browse Source
This commit is contained in:
Daniil Gentili 2021-12-15 14:34:25 +01:00
parent 3d3d084b81
commit 38f5eab353
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Driver/BlockingFile.php
View File

@ -75,7 +75,7 @@ final class BlockingFile implements File
throw new StreamException("Failed writing to file '{$this->path}'");
}
return new Success;
return new Success($length);
} catch (StreamException $e) {
return new Failure($e);
} finally {

5
src/Driver/ParallelFile.php
View File

@ -176,8 +176,8 @@ final class ParallelFile implements File
$this->busy = true;
try {
yield $this->worker->enqueue(new Internal\FileTask('fwrite', [$data], $this->id));
$this->position += \strlen($data);
$wrote = yield $this->worker->enqueue(new Internal\FileTask('fwrite', [$data], $this->id));
$this->position += $wrote;
} catch (TaskException $exception) {
throw new StreamException("Writing to the file failed", 0, $exception);
} catch (WorkerException $exception) {
@ -187,6 +187,7 @@ final class ParallelFile implements File
$this->busy = false;
}
}
return $wrote;
});
}

22
test/FileTest.php
View File

@ -18,7 +18,7 @@ abstract class FileTest extends FilesystemTest
$this->assertSame(0, $handle->tell());
$handle->write("foo");
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
yield $handle->seek(0);
$contents = yield $handle->read();
$this->assertSame(6, $handle->tell());
@ -35,7 +35,7 @@ abstract class FileTest extends FilesystemTest
$handle = yield $this->driver->openFile($path, "c+");
$this->assertSame(0, $handle->tell());
yield $handle->write("");
$this->assertSame(0, yield $handle->write(""));
$this->assertSame(0, $handle->tell());
yield $handle->close();
@ -49,7 +49,7 @@ abstract class FileTest extends FilesystemTest
yield $handle->close();
$this->expectException(ClosedException::class);
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
}
public function testDoubleClose(): \Generator
@ -70,7 +70,7 @@ abstract class FileTest extends FilesystemTest
yield $handle->end("foo");
$this->expectException(ClosedException::class);
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
}
public function testWriteInAppendMode(): \Generator
@ -79,9 +79,9 @@ abstract class FileTest extends FilesystemTest
/** @var File\File $handle */
$handle = yield $this->driver->openFile($path, "a+");
$this->assertSame(0, $handle->tell());
yield $handle->write("bar");
yield $handle->write("foo");
yield $handle->write("baz");
$this->assertSame(3, yield $handle->write("bar"));
$this->assertSame(3, yield $handle->write("foo"));
$this->assertSame(3, yield $handle->write("baz"));
$this->assertSame(9, $handle->tell());
yield $handle->seek(0);
$this->assertSame(0, $handle->tell());
@ -213,14 +213,14 @@ abstract class FileTest extends FilesystemTest
$handle = yield $this->driver->openFile($path, "c+");
$handle->write("foo");
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
yield $handle->truncate(4);
yield $handle->seek(0);
$contents = yield $handle->read();
$this->assertTrue($handle->eof());
$this->assertSame("foob", $contents);
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
$this->assertSame(7, $handle->tell());
yield $handle->seek(0);
$contents = yield $handle->read();
@ -238,7 +238,7 @@ abstract class FileTest extends FilesystemTest
/** @var File\File $handle */
$handle = yield $this->driver->openFile($path, "c+");
yield $handle->write("foo");
$this->assertSame(3, yield $handle->write("foo"));
yield $handle->truncate(6);
$this->assertSame(3, $handle->tell());
yield $handle->seek(0);
@ -246,7 +246,7 @@ abstract class FileTest extends FilesystemTest
$this->assertTrue($handle->eof());
$this->assertSame("foo\0\0\0", $contents);
yield $handle->write("bar");
$this->assertSame(3, yield $handle->write("bar"));
$this->assertSame(9, $handle->tell());
yield $handle->seek(0);
$contents = yield $handle->read();