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

Fix a number of issues related to mixing different path types.

Browse source
This commit is contained in:
Sönke Ludwig 2017-06-12 17:33:25 +02:00
parent 6f7c897f91
commit 62e3add3ab
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/vibe/core/path.d
View file

@ -36,7 +36,7 @@ Path relativeTo(Path path, Path base_path)
size_t base = commonPrefix(path[], base_path[]).length; size_t base = commonPrefix(path[], base_path[]).length;
auto ret = Path("../".replicate(base_path.length - base), path.type) ~ path[base .. $]; auto ret = Path("../".replicate(base_path.length - base), path.type) ~ path[base .. $];
if (path.endsWithSlash && !ret.endsWithSlash) ret ~= Path("./"); if (path.endsWithSlash && !ret.endsWithSlash) ret ~= Path("./", path.type);
return ret; return ret;
} }
@ -233,7 +233,7 @@ struct Path {
if (m_type == type) return m_path; if (m_type == type) return m_path;
if (type == PathType.windows) { if (type == PathType.windows) {
auto ret = this[].map!(p => p.toString()).join('\\'); auto ret = (absolute ? this[1 .. $] : this[]).map!(p => p.toString()).join('\\');
if (endsWithSlash) ret ~= '\\'; if (endsWithSlash) ret ~= '\\';
return ret; return ret;
} else { } else {
@ -277,14 +277,14 @@ struct Path {
assert(!subpath.absolute || m_path.length == 0, "Cannot append absolute path."); assert(!subpath.absolute || m_path.length == 0, "Cannot append absolute path.");
if (this.endsWithSlash) if (this.endsWithSlash)
return Path(m_path ~ subpath.m_path, m_type); return Path(m_path ~ subpath.toString(m_type), m_type);
if (!m_path.length) return subpath; if (!m_path.length) return subpath.m_type == m_type ? subpath : Path(subpath.toString(m_type), m_type);
final switch (m_type) { final switch (m_type) {
case PathType.inet, PathType.posix: case PathType.inet, PathType.posix:
return Path(m_path ~ '/' ~ subpath.m_path, m_type); return Path(m_path ~ '/' ~ subpath.toString(m_type), m_type);
case PathType.windows: case PathType.windows:
return Path(m_path ~ '\\' ~ subpath.m_path, m_type); return Path(m_path ~ '\\' ~ subpath.toString(m_type), m_type);
} }
} }
@ -451,6 +451,14 @@ unittest
assert(p2.relativeTo(p2).toString() == "./"); assert(p2.relativeTo(p2).toString() == "./");
} }
assert(Path("C:\\Windows", PathType.windows).absolute);
assert(Path("C:\\Windows", PathType.windows).toString(PathType.inet) == "/C:/Windows");
assert((Path("C:\\Windows", PathType.windows) ~ Path("test/this", PathType.inet)).toString() == "C:\\Windows\\test\\this");
assert(Path("/C:/Windows", PathType.inet).absolute);
assert(Path("/C:/Windows", PathType.inet).toString(PathType.windows) == "C:\\Windows");
assert((Path("/C:/Windows", PathType.inet) ~ Path("test\\this", PathType.windows)).toString() == "/C:/Windows/test/this");
assert((Path("", PathType.inet) ~ Path("foo\\bar", PathType.windows)).toString() == "foo/bar");
assert(Path("").empty); assert(Path("").empty);
assert(Path("a/b/c")[1 .. 3].map!(p => p.toString()).equal(["b", "c"])); assert(Path("a/b/c")[1 .. 3].map!(p => p.toString()).equal(["b", "c"]));