Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-07-06 23:17:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

(refs #1101)Fix variable names

Browse Source
This commit is contained in:
Naoki Takezoe
2017-01-04 20:46:50 +09:00
parent eb50b74b4a
commit b95d912542
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
View File

@@ -22,9 +22,9 @@ class GitLfsTransferServlet extends HttpServlet {
override protected def doGet(req: HttpServletRequest, res: HttpServletResponse): Unit = {
for {
(owner, name, oid) <- getPathInfo(req, res) if checkToken(req, oid)
(owner, repository, oid) <- getPathInfo(req, res) if checkToken(req, oid)
} yield {
val file = new File(FileUtil.getLfsFilePath(owner, name, oid))
val file = new File(FileUtil.getLfsFilePath(owner, repository, oid))
if(file.exists()){
res.setStatus(HttpStatus.SC_OK)
res.setContentType("application/octet-stream")
@@ -42,9 +42,9 @@ class GitLfsTransferServlet extends HttpServlet {
override protected def doPut(req: HttpServletRequest, res: HttpServletResponse): Unit = {
for {
(owner, name, oid) <- getPathInfo(req, res) if checkToken(req, oid)
(owner, repository, oid) <- getPathInfo(req, res) if checkToken(req, oid)
} yield {
val file = new File(FileUtil.getLfsFilePath(owner, name, oid))
val file = new File(FileUtil.getLfsFilePath(owner, repository, oid))
FileUtils.forceMkdir(file.getParentFile)
using(req.getInputStream, new FileOutputStream(file)){ (in, out) =>
IOUtils.copy(in, out)
@@ -65,7 +65,7 @@ class GitLfsTransferServlet extends HttpServlet {
private def getPathInfo(req: HttpServletRequest, res: HttpServletResponse): Option[(String, String, String)] = {
req.getRequestURI.substring(1).split("/") match {
case Array(_, owner, name, oid) => Some((owner, name, oid))
case Array(_, owner, repository, oid) => Some((owner, repository, oid))
case _ => None
}
}

6
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -75,7 +75,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
}
case Some(baseUrl) => {
req.getRequestURI.substring(1).replace(".git/", "/").split("/") match {
case Array(_, owner, name, _*) => {
case Array(_, owner, repository, _*) => {
val timeout = System.currentTimeMillis + (60000 * 10) // 10 min.
val batchResponse = batchRequest.operation match {
case "upload" =>
@@ -83,7 +83,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
GitLfs.BatchResponseObject(requestObject.oid, requestObject.size, true,
GitLfs.Actions(
upload = Some(GitLfs.Action(
href = baseUrl + "/git-lfs/" + owner + "/" + name + "/" + requestObject.oid,
href = baseUrl + "/git-lfs/" + owner + "/" + repository + "/" + requestObject.oid,
header = Map("Authorization" -> StringUtil.encodeBlowfish(timeout + " " + requestObject.oid)),
expires_at = new Date(timeout)
))
@@ -95,7 +95,7 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
GitLfs.BatchResponseObject(requestObject.oid, requestObject.size, true,
GitLfs.Actions(
download = Some(GitLfs.Action(
href = baseUrl + "/git-lfs/" + owner + "/" + name + "/" + requestObject.oid,
href = baseUrl + "/git-lfs/" + owner + "/" + repository + "/" + requestObject.oid,
header = Map("Authorization" -> StringUtil.encodeBlowfish(timeout + " " + requestObject.oid)),
expires_at = new Date(timeout)
))

3
src/main/scala/gitbucket/core/util/FileUtil.scala
View File

@@ -63,6 +63,7 @@ object FileUtil {
"image/png",
"text/plain")
def getLfsFilePath(owner: String, name: String, oid: String): String = Directory.getLfsDir(owner, name) + "/" + oid
def getLfsFilePath(owner: String, repository: String, oid: String): String =
Directory.getLfsDir(owner, repository) + "/" + oid
}