Fork: 0
johnpearcey / gitbucket_jkp
Browse code
(refs #28)Avatar image can be uploaded at the account editing page.
master
1 parent 240a749 commit 2da756692b79518a31d82df2532bbb55bcb9bd20
@takezoe takezoe authored on 10 Jul 2013
Patch
Unified Split
Showing 6 changed files
View
48
■■■■■
 src/main/scala/app/AccountController.scala
package app
 
import service._
import util.OneselfAuthenticator
import util.{FileUtil, FileUploadUtil, OneselfAuthenticator}
import util.StringUtil._
import util.Directory._
import jp.sf.amateras.scalatra.forms._
import org.apache.commons.io.FileSystemUtils
import org.apache.commons.io.FileUtils
 
class AccountController extends AccountControllerBase
with SystemSettingsService with AccountService with RepositoryService with ActivityService
with OneselfAuthenticator
with OneselfAuthenticator =>
 
case class AccountNewForm(userName: String, password: String,mailAddress: String, url: Option[String])
 
case class AccountEditForm(password: Option[String], mailAddress: String, url: Option[String], fileId: Option[String])
case class AccountEditForm(password: Option[String], mailAddress: String, url: Option[String],
fileId: Option[String], clearImage: Boolean)
 
val newForm = mapping(
"userName" -> trim(label("User name" , text(required, maxlength(100), identifier, uniqueUserName))),
"password" -> trim(label("Password" , text(required, maxlength(20)))),
val editForm = mapping(
"password" -> trim(label("Password" , optional(text(maxlength(20))))),
"mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
"url" -> trim(label("URL" , optional(text(maxlength(200))))),
"fileId" -> trim(label("File ID" , optional(text())))
"fileId" -> trim(label("File ID" , optional(text()))),
"clearImage" -> trim(label("Clear image" , boolean()))
)(AccountEditForm.apply)
 
/**
* Displays user information.
}
} getOrElse NotFound
}
 
get("/:userName/_avatar"){
val userName = params("userName")
getAccountByUserName(userName).flatMap(_.image).map { image =>
contentType = FileUtil.getMimeType(image)
new java.io.File(getUserUploadDir(userName), image)
} getOrElse NotFound
}
 
get("/:userName/_edit")(oneselfOnly {
val userName = params("userName")
getAccountByUserName(userName).map(x => account.html.edit(Some(x))) getOrElse NotFound
})
password = form.password.map(encrypt).getOrElse(account.password),
mailAddress = form.mailAddress,
url = form.url))
 
form.fileId.map { fileId =>
val filename = app.FileUploadUtil.getFilename(fileId)
org.apache.commons.io.FileUtils.moveFile(
app.FileUploadUtil.getTemporaryFile(fileId),
new java.io.File(getUserUploadDir(userName), filename.get)
)
updateAvatarImage(userName, filename)
if(form.clearImage){
account.image.map { image =>
new java.io.File(getUserUploadDir(userName), image).delete()
updateAvatarImage(userName, None)
}
} else {
form.fileId.map { fileId =>
val filename = "avatar." + FileUtil.getExtension(FileUploadUtil.getUploadedFilename(fileId).get)
FileUtils.moveFile(
FileUploadUtil.getTemporaryFile(fileId),
new java.io.File(getUserUploadDir(userName), filename)
)
updateAvatarImage(userName, Some(filename))
}
}
 
redirect("/%s".format(userName))
} getOrElse NotFound
View
41
■■■■■
 src/main/scala/app/FileUploadController.scala
package app
 
import util.Directory._
import util.{FileUtil, FileUploadUtil}
import org.scalatra._
import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
import java.text.SimpleDateFormat
import org.apache.commons.io.FileUtils
import javax.servlet.http.HttpSession
 
/**
* Provides Ajax based file upload functionality.
*
* This servlet saves uploaded file as temporary file and returns the unique key.
* You can get uploaded file using [[app.FileUploadUtil#getFile()]] with this key.
* This servlet saves uploaded file as temporary file and returns the unique id.
* You can get uploaded file using [[util.FileUploadUtil#getTemporaryFile()]] with this id.
*/
// TODO Remove temporary files at session timeout by session listener.
class FileUploadController extends ScalatraServlet with FileUploadSupport with FlashMapSupport {
configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
 
post("/"){
post("/image"){
fileParams.get("file") match {
case Some(file) => {
val fileId = new SimpleDateFormat("yyyyMMddHHmmSSsss").format(new java.util.Date(System.currentTimeMillis))
case Some(file) if(FileUtil.isImage(file.name)) => {
val fileId = FileUploadUtil.generateFileId
FileUtils.writeByteArrayToFile(FileUploadUtil.getTemporaryFile(fileId), file.get)
session += "fileId" -> file.name
session += "upload_" + fileId -> file.name
Ok(fileId)
}
case None => BadRequest
}
}
 
}
 
// TODO move to other package or should be trait?
object FileUploadUtil {
def TemporaryDir(implicit session: HttpSession): java.io.File =
new java.io.File(GitBucketHome, "tmp/_%s".format(session.getId))
 
def getTemporaryFile(fileId: String)(implicit session: HttpSession): java.io.File =
new java.io.File(TemporaryDir, fileId)
 
def removeTemporaryFile(fileId: String)(implicit session: HttpSession): Unit =
getTemporaryFile(fileId).delete()
 
def removeTemporaryFiles()(implicit session: HttpSession): Unit =
FileUtils.deleteDirectory(TemporaryDir)
 
def getFilename(fileId: String)(implicit session: HttpSession): Option[String] = {
val filename = Option(session.getAttribute(fileId).asInstanceOf[String])
if(filename.isDefined){
session.removeAttribute(fileId)
}
filename
}
 
}
 
View
src/main/scala/util/Directory.scala
View
src/main/scala/util/FileUploadUtil.scala 0 → 100644
View
src/main/scala/util/FileUtil.scala
View
src/main/twirl/account/edit.scala.html