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

Merge pull request #120 from vibe-d/improve_copy_move_file

Browse source 
Improve copyFile/moveFile
merged-on-behalf-of: Leonid Kramer <l-kramer@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2019-01-14 20:11:36 +01:00 committed by GitHub
parent ea4917d4d0 2f552ac408
commit 021f52e633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -191,7 +191,7 @@ void moveFile(string from, string to, bool copy_fallback = false)
try { try {
std.file.rename(from, to); std.file.rename(from, to);
} catch (FileException e) { } catch (FileException e) {
std.file.copy(from, to); copyFile(from, to);
std.file.remove(from); std.file.remove(from);
} }
} }
@ -214,6 +214,17 @@ void moveFile(string from, string to, bool copy_fallback = false)
*/ */
void copyFile(NativePath from, NativePath to, bool overwrite = false) void copyFile(NativePath from, NativePath to, bool overwrite = false)
{ {
DirEntry info;
static if (__VERSION__ < 2078) {
() @trusted {
info = DirEntry(from.toString);
enforce(info.isFile, "The source path is not a file and cannot be copied.");
} ();
} else {
info = DirEntry(from.toString);
enforce(info.isFile, "The source path is not a file and cannot be copied.");
}
{ {
auto src = openFile(from, FileMode.read); auto src = openFile(from, FileMode.read);
scope(exit) src.close(); scope(exit) src.close();
@ -223,7 +234,17 @@ void copyFile(NativePath from, NativePath to, bool overwrite = false)
dst.write(src); dst.write(src);
} }
// TODO: retain attributes and time stamps // TODO: also retain creation time on windows
static if (__VERSION__ < 2078) {
() @trusted {
setAttributes(to.toString, info.attributes);
setTimes(to.toString, info.timeLastAccessed, info.timeLastModified);
} ();
} else {
setAttributes(to.toString, info.attributes);
setTimes(to.toString, info.timeLastAccessed, info.timeLastModified);
}
} }
/// ditto /// ditto
void copyFile(string from, string to) void copyFile(string from, string to)
@ -623,6 +644,8 @@ 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)
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[]);