Supporting external upload directory.

.gitignore

@@ -10,3 +10,4 @@ target
 src/main/resources/fink.properties
 src/main/webapp/uploads
 
+/.cache

src/main/scala/fink/support/MediaManager.scala

@@ -25,8 +25,7 @@ case class SquareImageSpec(override val name: String, width: Int) extends ImageS
 
 object MediaManager {
 
-  var base = "./uploads"
-  def baseDirectory = base
+  def baseDirectory = Config.mediaDirectory
 
   val specs = Array(
     FullImageSpec("full"),
@@ -35,11 +34,6 @@ object MediaManager {
     KeepRatioImageSpec("big", 700)
   )
 
-  // check if the base upload folder exists in the filesystem
-  protected def sanitizeEnv = {
-    checkDirectory(baseDirectory)
-  }
-
   protected def checkDirectory(dir: String) = {
     val target = new File(dir)
     if (!target.exists) target.mkdirs
@@ -49,7 +43,8 @@ object MediaManager {
   protected def isImage(item: FileItem, name: String, ext: String): Boolean = true
 
   def processUpload(item: FileItem): Option[String] = {
-    sanitizeEnv
+    checkDirectory(baseDirectory)
+
     val m = Pattern.compile("(.*)\\.(.*)$").matcher(item.getName)
     if (!m.matches) return None
 

src/main/scala/fink/web/Admin.scala

@@ -15,38 +15,39 @@ import org.scalatra.servlet._
 
 import net.liftweb.json._
 import net.liftweb.json.Serialization.{read, write}
+import java.io.File
 
 class Admin extends ScalatraServlet with RepositorySupport with AuthenticationRoutes with ResourceRoutes with ScalateSupport with FileUploadSupport {
 
-	override implicit val jsonFormats = Serialization.formats(ShortTypeHints(List(classOf[Page], classOf[Category], classOf[Tag]))) + FieldSerializer[Post]()  + FieldSerializer[Gallery]() + FieldSerializer[Image]()
+  override implicit val jsonFormats = Serialization.formats(ShortTypeHints(List(classOf[Page], classOf[Category], classOf[Tag]))) + FieldSerializer[Post]()  + FieldSerializer[Gallery]() + FieldSerializer[Image]()
 
-	def adminTemplateBase = "/WEB-INF/admin"
+  def adminTemplateBase = "/WEB-INF/admin"
 
-	def uri(uri: String) = {
-		if (uri.startsWith("/")) {
-			request.getContextPath + uri
-		} else {
-			uri
-		}
-	}
+  def uri(uri: String) = {
+    if (uri.startsWith("/")) {
+      request.getContextPath + uri
+    } else {
+      uri
+    }
+  }
 
-	override def init(config: ServletConfig) {
-		super.init(config)
-		MediaManager.base = config.getServletContext().getRealPath("/uploads")
-	}
+  before() {
+    contentType = "text/html"
+  }
 
-	before() {
-		contentType = "text/html"
-	}
+  get("/") {
+    if (request.getPathInfo == null) redirect("/admin/")
+    templateAttributes("layout") = ("/admin/layouts/default.jade")
+    jade("/admin/index.jade") 
+  }
 
-	get("/") {
-		if (request.getPathInfo == null) redirect("/admin/")
-		templateAttributes("layout") = ("/admin/layouts/default.jade")
-		jade("/admin/index.jade")	
-	}
+  get("/uploads/:file") {
+    val filename = "%s/%s".format(Config.mediaDirectory, params("file"))
+    new File(filename)
+  }
 
-	notFound {
-		halt(404, <h1>Not found.  Bummer.</h1>)
-	}
+  notFound {
+    halt(404, <h1>Not found.  Bummer.</h1>)
+  }
 
 }

src/main/scala/fink/web/Frontend.scala

@@ -11,6 +11,7 @@ import org.scalatra.ScalatraServlet
 import org.scalatra.servlet._
 
 import org.joda.time.format.DateTimeFormat
+import java.io.File
 
 class Frontend extends ScalatraServlet with ScalateSupport with RepositorySupport {
 
@@ -88,6 +89,12 @@ class Frontend extends ScalatraServlet with ScalateSupport with RepositorySuppor
     }
   }
 
+  get("/uploads/:file") {
+    println(1)
+    val filename = "%s/%s".format(Config.mediaDirectory, params("file"))
+    new File(filename)
+  }
+
   notFound {
     halt(404, "Not found.")
   }

src/main/webapp/WEB-INF/web.xml

@@ -32,7 +32,6 @@
 		<url-pattern>/images/*</url-pattern>
 		<url-pattern>/css/*</url-pattern>
 		<url-pattern>/js/*</url-pattern>
-		<url-pattern>/uploads/*</url-pattern>
 		<url-pattern>/assets/*</url-pattern>
 		<url-pattern>/themes/*</url-pattern>
 		<url-pattern>/admin/app/*</url-pattern>

src/main/webapp/admin/js/controllers.js

@@ -104,6 +104,7 @@ function EditGalleryController($scope, $location, $routeParams, Gallery, Tag, Im
   var self = this;
   self.original = null;
 
+  $scope.fink_base = fink_base
   $scope.tags = Tag.query();
   $scope.galleries = Gallery.query();
 
@@ -122,7 +123,7 @@ function EditGalleryController($scope, $location, $routeParams, Gallery, Tag, Im
           'multi'     : true,
           'method'    : 'POST',
           'debug'     : false,
-          'uploader'  : '/admin/api/images',
+          'uploader'  : fink_base+'/admin/api/images',
           'checkExisting' : false,
           'fileObjName'   : 'file',
           'fileTypeExts'  : '*.jpg;*.jpeg;*.gif;*.png',
@@ -138,7 +139,7 @@ function EditGalleryController($scope, $location, $routeParams, Gallery, Tag, Im
           },
           'onUploadSuccess' : function(file, data, response) {
             var imageId = data;
-            $.post("/admin/api/galleries/"+galleryId+"/images/"+imageId, function(data, status) {
+            $.post(fink_base+"/admin/api/galleries/"+galleryId+"/images/"+imageId, function(data, status) {
               console.log(data + " - " + status);
             })
           } 
@@ -153,7 +154,7 @@ function EditGalleryController($scope, $location, $routeParams, Gallery, Tag, Im
             //   console.log("done");
             // });
             var order = _.map($("#albums-images").sortable('toArray'), function(id) { return id.split('-')[1]; }).join(',');
-            $.post("/admin/api/galleries/"+$scope.gallery.id+"/images", {order: order}, function() {
+            $.post("fink_base+/admin/api/galleries/"+$scope.gallery.id+"/images", {order: order}, function() {
               console.log("done");
             });
           }
@@ -174,7 +175,7 @@ function EditGalleryController($scope, $location, $routeParams, Gallery, Tag, Im
   }
 
   $scope.removeImage = function(image) {
-    $.delete("/admin/api/galleries/"+$scope.gallery.id+"/images/"+image.id, function(data, status) {
+    $.delete(fink_base+"/admin/api/galleries/"+$scope.gallery.id+"/images/"+image.id, function(data, status) {
       Gallery.get({galleryId: $routeParams.galleryId}, function(gallery) {
         $scope.gallery = new Gallery(gallery);
       })

src/main/webapp/admin/partials/galleries-details.html

@@ -32,7 +32,7 @@
                 <a ng-click="removeImage(image)"><i class="trash"></i></a>
               </div>
               <div>
-                <img src="/uploads/{{image.hash}}-medium.jpg" alt="{{image.title}}">
+                <img src="{{fink_base}}/admin/uploads/{{image.hash}}-medium.jpg" alt="{{image.title}}">
               </div>
             </div>
           </div>