Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include repository name and directory name in download filename

Browse Source
This commit is contained in:
Naoki Takezoe
2018-05-24 16:25:43 +09:00
parent 587970a477
commit 1adb0b7bcf
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -1175,11 +1175,17 @@ trait RepositoryViewerControllerBase extends ControllerBase {
} }
} }
} }
val tarRe = """\.tar\.(gz|bz2|xz)$""".r
val suffix = path.split("/").lastOption.map("-" + _).getOrElse("")
val zipRe = """(.+)\.zip$""".r
val tarRe = """(.+)\.tar\.(gz|bz2|xz)$""".r
filename match { filename match {
case name if name.endsWith(".zip") => case zipRe(branch) =>
response.setHeader("Content-Disposition", s"attachment; filename=${filename}") response.setHeader(
"Content-Disposition",
s"attachment; filename=${repository.name}-${branch}${suffix}.zip"
)
contentType = "application/octet-stream" contentType = "application/octet-stream"
response.setBufferSize(1024 * 1024); response.setBufferSize(1024 * 1024);
using(new ZipArchiveOutputStream(response.getOutputStream)) { zip => using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
@@ -1191,8 +1197,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
} }
} }
() ()
case tarRe(compressor) => case tarRe(branch, compressor) =>
response.setHeader("Content-Disposition", s"attachment; filename=${filename}") response.setHeader(
"Content-Disposition",
s"attachment; filename=${repository.name}-${branch}${suffix}.tar.${compressor}"
)
contentType = "application/octet-stream" contentType = "application/octet-stream"
response.setBufferSize(1024 * 1024) response.setBufferSize(1024 * 1024)
using(compressor match { using(compressor match {