debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #168 from v1ne/fix-appending-to-file

Browse source 
FileStream: Adjust file offset when appending to a file
This commit is contained in:
Sönke Ludwig 2019-08-21 19:25:17 +02:00 committed by GitHub
parent 7c609dd07f 513bebcb95
commit 84907ddbe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/vibe/core/file.d
View file

@ -438,6 +438,9 @@ struct FileStream {
m_ctx.mode = mode; m_ctx.mode = mode;
m_ctx.size = eventDriver.files.getSize(fd); m_ctx.size = eventDriver.files.getSize(fd);
m_ctx.driver = () @trusted { return cast(shared)eventDriver; } (); m_ctx.driver = () @trusted { return cast(shared)eventDriver; } ();
if (mode == FileMode.append)
m_ctx.ptr = m_ctx.size;
} }
this(this) this(this)
@ -472,6 +475,7 @@ struct FileStream {
void seek(ulong offset) void seek(ulong offset)
{ {
enforce(ctx.mode != FileMode.append, "File opened for appending, not random access. Cannot seek.");
ctx.ptr = offset; ctx.ptr = offset;
} }
@ -479,6 +483,8 @@ struct FileStream {
void truncate(ulong size) void truncate(ulong size)
{ {
enforce(ctx.mode != FileMode.append, "File opened for appending, not random access. Cannot truncate.");
auto res = asyncAwaitUninterruptible!(FileIOCallback, auto res = asyncAwaitUninterruptible!(FileIOCallback,
cb => eventDriver.files.truncate(m_fd, size, cb) cb => eventDriver.files.truncate(m_fd, size, cb)
); );
@ -647,8 +653,7 @@ struct DirectoryWatcher { // TODO: avoid all those heap allocations!
m_context = new Context; // FIME: avoid GC allocation (use FD user data slot) m_context = new Context; // FIME: avoid GC allocation (use FD user data slot)
m_context.changeEvent = createManualEvent(); m_context.changeEvent = createManualEvent();
m_watcher = eventDriver.watchers.watchDirectory(path.toNativeString, recursive, &m_context.onChange); m_watcher = eventDriver.watchers.watchDirectory(path.toNativeString, recursive, &m_context.onChange);
if (m_watcher == WatcherID.invalid) enforce(m_watcher != WatcherID.invalid, "Failed to watch directory.");
throw new Exception("Failed to watch directory.");
m_context.path = path; m_context.path = path;
m_context.recursive = recursive; m_context.recursive = recursive;
m_context.changes = appender!(DirectoryChange[]); m_context.changes = appender!(DirectoryChange[]);
@ -785,3 +790,23 @@ version (Windows) {} else unittest {
testCreate(".test_foo/", ".test_foo", true); testCreate(".test_foo/", ".test_foo", true);
test("/", "", false); test("/", "", false);
} }
unittest {
auto name = "toAppend.txt";
scope(exit) removeFile(name);
{
auto handle = openFile(name, FileMode.createTrunc);
handle.write("create,");
assert(handle.tell() == "create,".length);
handle.close();
}
{
auto handle = openFile(name, FileMode.append);
handle.write(" then append");
assert(handle.tell() == "create, then append".length);
handle.close();
}
assert(readFile(name) == "create, then append");
}