Minor clarity improvements to addTemplate

outr · Aug 21, 2019 · c5da38e · c5da38e
1 parent bb7a178
commit c5da38e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/jvm/src/main/scala/io/youi/app/ServerApplication.scala b/app/jvm/src/main/scala/io/youi/app/ServerApplication.scala
@@ -139,12 +139,12 @@ trait ServerApplication extends YouIApplication with Server {
         val url = httpConnection.request.url
         val fileName = url.path.decoded
         val mapped = mappings.toStream.flatMap(_ (httpConnection)).headOption
-        val withHTML = if (excludeDotHTML) {
+        val content = lookup(fileName).orElse { if (excludeDotHTML) {
           lookup(s"$fileName.html")
         } else {
           None
-        }
-        mapped.orElse(lookup(fileName).orElse(withHTML)).map { content =>
+        }}
+        mapped.orElse(content).map { content =>
           if (content.contentType == ContentType.`text/html`) {
             CachingManager.NotCached.handle(httpConnection)
             serveHTML(httpConnection, content, deltas, includeApplication(url))