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

Merge pull request #2027 from gitbucket/fix-download

Browse Source 
Fix for repository downloading improvement
This commit is contained in:
Naoki Takezoe
2018-05-24 18:20:30 +09:00
committed by GitHub
parent e7493eff3b 1adb0b7bcf
commit 2b2669978f
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
import org.eclipse.jgit.dircache.{DirCache, DirCacheBuilder}
import org.eclipse.jgit.errors.MissingObjectException
import org.eclipse.jgit.lib._
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.transport.{ReceiveCommand, ReceivePack}
import org.eclipse.jgit.treewalk.TreeWalk
import org.eclipse.jgit.treewalk.filter.PathFilter
@@ -1151,39 +1150,42 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val repositorySuffix = (if (sha1.startsWith(revision)) sha1 else revision).replace('/', '-')
val pathSuffix = if (path.isEmpty) "" else '-' + path.replace('/', '-')
val baseName = repository.name + "-" + repositorySuffix + pathSuffix
val filename = baseName + archiveFormat
using(new RevWalk(git.getRepository)) { revWalk =>
using(new TreeWalk(git.getRepository)) { treeWalk =>
treeWalk.addTree(revCommit.getTree)
treeWalk.setRecursive(true)
if (!path.isEmpty) {
treeWalk.setFilter(PathFilter.create(path))
}
if (treeWalk != null) {
while (treeWalk.next()) {
val entryPath =
if (path.isEmpty) baseName + "/" + treeWalk.getPathString
else path.split("/").last + treeWalk.getPathString.substring(path.length)
val size = JGitUtil.getFileSize(git, repository, treeWalk)
val mode = treeWalk.getFileMode.getBits
val entry: ArchiveEntry = entryCreator(entryPath, size, mode)
JGitUtil.openFile(git, repository, revCommit.getTree, treeWalk.getPathString) { in =>
archive.putArchiveEntry(entry)
IOUtils.copy(in, archive)
archive.closeArchiveEntry()
}
using(new TreeWalk(git.getRepository)) { treeWalk =>
treeWalk.addTree(revCommit.getTree)
treeWalk.setRecursive(true)
if (!path.isEmpty) {
treeWalk.setFilter(PathFilter.create(path))
}
if (treeWalk != null) {
while (treeWalk.next()) {
val entryPath =
if (path.isEmpty) baseName + "/" + treeWalk.getPathString
else path.split("/").last + treeWalk.getPathString.substring(path.length)
val size = JGitUtil.getFileSize(git, repository, treeWalk)
val mode = treeWalk.getFileMode.getBits
val entry: ArchiveEntry = entryCreator(entryPath, size, mode)
JGitUtil.openFile(git, repository, revCommit.getTree, treeWalk.getPathString) { in =>
archive.putArchiveEntry(entry)
IOUtils.copy(in, archive)
archive.closeArchiveEntry()
}
}
}
}
}
}
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 {
case name if name.endsWith(".zip") =>
response.setHeader("Content-Disposition", s"attachment; filename=${filename}")
case zipRe(branch) =>
response.setHeader(
"Content-Disposition",
s"attachment; filename=${repository.name}-${branch}${suffix}.zip"
)
contentType = "application/octet-stream"
response.setBufferSize(1024 * 1024);
using(new ZipArchiveOutputStream(response.getOutputStream)) { zip =>
@@ -1195,8 +1197,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}
}
()
case tarRe(compressor) =>
response.setHeader("Content-Disposition", s"attachment; filename=${filename}")
case tarRe(branch, compressor) =>
response.setHeader(
"Content-Disposition",
s"attachment; filename=${repository.name}-${branch}${suffix}.tar.${compressor}"
)
contentType = "application/octet-stream"
response.setBufferSize(1024 * 1024)
using(compressor match {

4
src/main/scala/gitbucket/core/util/JGitUtil.scala
View File

@@ -1253,7 +1253,7 @@ object JGitUtil {
f(in)
}
} else {
throw new EmptyLfsAttributesException
throw new NoSuchElementException("LFS attribute is empty.")
}
} else {
using(loader.openStream()) { in =>
@@ -1277,6 +1277,4 @@ object JGitUtil {
JGitUtil.getLfsObjects(text)
}
case class EmptyLfsAttributesException() extends Exception
}