let appengine set content type if from blobstore

softprops · Aug 8, 2010 · 847d9ae · 847d9ae
1 parent 77d8a5c
commit 847d9ae
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/main/scala/Sourced.scala b/src/main/scala/Sourced.scala
@@ -87,14 +87,11 @@ class Sourced extends Responses with Urls with Requests with Auth with IO with u
         } orElse { _ => InternalServerError }
 
       case GET(Path(Seg(org :: project :: version :: srcName :: _), req)) =>
-        DocStore(url(req)) match {
-          case Some(src) =>
-            Ok ~> ContentType(src.contentType) ~> (src.doc match{
-              case null => BlobResponder(src.blobKey, blobs)
-              case _ => ResponseBytes(src.doc.getBytes)
-            })
-          case _ => NotFound
-        }
+        DocStore(url(req)) map { src =>
+          Option(src.doc) map { doc =>
+            Ok ~> ContentType(src.contentType) ~> ResponseBytes(doc.getBytes)
+          } getOrElse BlobResponder(src.blobKey, blobs)
+        } getOrElse NotFound
 
       case GET(Path(Seg("admin" ::  Nil), req)) => adminPage(req) {
           <form action="setkey" method="post">