diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-08-25 17:52:52 +0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-08-25 17:52:52 +0800 |
commit | 4369a2f3af843a45bd0f29c58eb0c69158f4c87e (patch) | |
tree | 2f11efea9422d1b577a82f215e83626c01b62b07 | |
parent | ece16bb6984f026f3244f8ba9b26a7f6c72fd8bf (diff) | |
download | cask-4369a2f3af843a45bd0f29c58eb0c69158f4c87e.tar.gz cask-4369a2f3af843a45bd0f29c58eb0c69158f4c87e.tar.bz2 cask-4369a2f3af843a45bd0f29c58eb0c69158f4c87e.zip |
0.1.60.1.6
-rw-r--r-- | cask/src/cask/endpoints/StaticEndpoints.scala | 13 |
1 files 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 + ) ) } |