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

Ignore submodules in repository archive downloading (#2817)

Browse Source
This commit is contained in:
Naoki Takezoe
2021-07-11 16:55:44 +09:00
committed by GitHub
parent 897cc5eea4
commit 6a1da37e9a
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1223,34 +1223,37 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}
if (treeWalk != null) {
while (treeWalk.next()) {
val entryPath =
if (path.isEmpty) baseName + "/" + treeWalk.getPathString
else path.split("/").last + treeWalk.getPathString.substring(path.length)
val mode = treeWalk.getFileMode.getBits
JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
val tempFile = File.createTempFile("gitbucket", ".archive")
val size = Using.resource(new FileOutputStream(tempFile)) { out =>
IOUtils.copy(
EolStreamTypeUtil.wrapInputStream(
in,
EolStreamTypeUtil
.detectStreamType(
OperationType.CHECKOUT_OP,
git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
treeWalk.getAttributes
)
),
out
)
}
if (treeWalk.getFileMode != FileMode.GITLINK) {
val entryPath =
if (path.isEmpty) baseName + "/" + treeWalk.getPathString
else path.split("/").last + treeWalk.getPathString.substring(path.length)
val mode = treeWalk.getFileMode.getBits
val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
archive.putArchiveEntry(entry)
Using.resource(new FileInputStream(tempFile)) { in =>
IOUtils.copy(in, archive)
JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
val tempFile = File.createTempFile("gitbucket", ".archive")
val size = Using.resource(new FileOutputStream(tempFile)) { out =>
IOUtils.copy(
EolStreamTypeUtil.wrapInputStream(
in,
EolStreamTypeUtil
.detectStreamType(
OperationType.CHECKOUT_OP,
git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
treeWalk.getAttributes
)
),
out
)
}
val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
archive.putArchiveEntry(entry)
Using.resource(new FileInputStream(tempFile)) { in =>
IOUtils.copy(in, archive)
}
archive.closeArchiveEntry()
tempFile.delete()
}
archive.closeArchiveEntry()
tempFile.delete()
}
}
}