mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-14 01:15:50 +01:00
Added automatic rescaling to avatar images (Fixes #835)
This commit is contained in:
@@ -46,6 +46,7 @@ libraryDependencies ++= Seq(
|
|||||||
"com.typesafe.akka" %% "akka-actor" % "2.3.15",
|
"com.typesafe.akka" %% "akka-actor" % "2.3.15",
|
||||||
"fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0",
|
"fr.brouillard.oss.security.xhub" % "xhub4j-core" % "1.0.0",
|
||||||
"com.enragedginger" %% "akka-quartz-scheduler" % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
|
"com.enragedginger" %% "akka-quartz-scheduler" % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
|
||||||
|
"net.coobird" % "thumbnailator" % "0.4.8",
|
||||||
"org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "provided",
|
"org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "provided",
|
||||||
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
|
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
|
||||||
"junit" % "junit" % "4.12" % "test",
|
"junit" % "junit" % "4.12" % "test",
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
|
|||||||
|
|
||||||
import scala.util.Try
|
import scala.util.Try
|
||||||
|
|
||||||
|
import net.coobird.thumbnailator.Thumbnails
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides generic features for controller implementations.
|
* Provides generic features for controller implementations.
|
||||||
@@ -224,10 +226,9 @@ trait AccountManagementControllerBase extends ControllerBase {
|
|||||||
} else {
|
} else {
|
||||||
fileId.map { fileId =>
|
fileId.map { fileId =>
|
||||||
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
|
val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
|
||||||
FileUtils.moveFile(
|
Thumbnails.of(new java.io.File(getTemporaryDir(session.getId), fileId))
|
||||||
new java.io.File(getTemporaryDir(session.getId), fileId),
|
.size(324, 324)
|
||||||
new java.io.File(getUserUploadDir(userName), filename)
|
.toFile(new java.io.File(getUserUploadDir(userName), filename))
|
||||||
)
|
|
||||||
updateAvatarImage(userName, Some(filename))
|
updateAvatarImage(userName, Some(filename))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user