From 4369a2f3af843a45bd0f29c58eb0c69158f4c87e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 25 Aug 2018 17:52:52 +0800 Subject: 0.1.6 --- cask/src/cask/endpoints/StaticEndpoints.scala | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala index 876683e..fd194ca 100644 --- a/cask/src/cask/endpoints/StaticEndpoints.scala +++ b/cask/src/cask/endpoints/StaticEndpoints.scala @@ -11,7 +11,11 @@ class staticFiles(val path: String) extends Endpoint{ override def subpath = true def wrapFunction(ctx: Request, delegate: Delegate): Returned = { delegate(Map()).map(t => - cask.model.StaticFile(t + "/" + ctx.remainingPathSegments.filter(s => s != "." && s != "..").mkString("/")) + cask.model.StaticFile( + (cask.internal.Util.splitPath(t) ++ ctx.remainingPathSegments) + .filter(s => s != "." && s != "..") + .mkString("/") + ) ) } @@ -26,7 +30,12 @@ class staticResources(val path: String, resourceRoot: ClassLoader = getClass.get override def subpath = true def wrapFunction(ctx: Request, delegate: Delegate): Returned = { delegate(Map()).map(t => - cask.model.StaticResource(t + "/" + ctx.remainingPathSegments.filter(s => s != "." && s != "..").mkString("/"), resourceRoot) + cask.model.StaticResource( + (cask.internal.Util.splitPath(t) ++ ctx.remainingPathSegments) + .filter(s => s != "." && s != "..") + .mkString("/"), + resourceRoot + ) ) } -- cgit v1.2.3