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

Merge pull request #1931 from gitbucket/fix-release-file-handling

Browse Source 
Fix file upload bug in the release page
This commit is contained in:
Naoki Takezoe
2018-03-31 23:11:57 +09:00
committed by GitHub
parent b09c69afd7 047c877d83
commit 2d8513e18a
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/scala/gitbucket/core/controller/ReleasesController.scala
View File

@@ -90,11 +90,12 @@ trait ReleaseControllerBase extends ControllerBase {
createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
// Insert into RELEASE_ASSET
request.getParameterNames.asScala.filter(_.startsWith("file:")).foreach { paramName =>
val Array(_, fileId) = paramName.split(":")
val fileName = params(paramName)
val files = params.collect { case (name, value) if name.startsWith("file:") =>
val Array(_, fileId) = name.split(":")
(fileId, value)
}
files.foreach { case (fileId, fileName) =>
val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length
createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
}
@@ -126,17 +127,17 @@ trait ReleaseControllerBase extends ControllerBase {
val assets = getReleaseAssets(repository.owner, repository.name, tagName)
deleteReleaseAssets(repository.owner, repository.name, tagName)
val fileIds = request.getParameterNames.asScala.filter(_.startsWith("file:")).map { paramName =>
val Array(_, fileId) = paramName.split(":")
val fileName = params(paramName)
val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + fileId).length
val files = params.collect { case (name, value) if name.startsWith("file:") =>
val Array(_, fileId) = name.split(":")
(fileId, value)
}
files.foreach { case (fileId, fileName) =>
val size = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), tagName + "/" + fileId).length
createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
fileId
}
assets.foreach { asset =>
if(!fileIds.contains(asset.fileName)){
if(!files.exists { case (fileId, _) => fileId == asset.fileName }){
val file = new java.io.File(getReleaseFilesDir(repository.owner, repository.name), release.tag + "/" + asset.fileName)
FileUtils.forceDelete(file)
}