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

Merge pull request #2104 from gitbucket/fix-archive-slash-branch

Browse Source 
Fix archiving for slashed branches
This commit is contained in:
Naoki Takezoe
2018-07-16 11:49:42 +09:00
committed by GitHub
parent 18a0c6c92a 3d060ae82f
commit 3f6ca48f26
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -834,52 +834,37 @@ trait RepositoryViewerControllerBase extends ControllerBase {
/**
* Download repository contents as a zip archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.zip")(referrersOnly { repository =>
get("/:owner/:repository/archive/*/:branch.zip")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".zip", repository, "")
val path = multiParams("splat").head
archiveRepository(branch, branch + ".zip", repository, path)
})
/**
* Download repository contents as a tar.gz archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.gz")(referrersOnly { repository =>
get("/:owner/:repository/archive/*/:branch.tar.gz")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.gz", repository, "")
val path = multiParams("splat").head
archiveRepository(branch, branch + ".tar.gz", repository, path)
})
/**
* Download repository contents as a tar.bz2 archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.bz2")(referrersOnly { repository =>
get("/:owner/:repository/archive/*/:branch.tar.bz2")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.bz2", repository, "")
val path = multiParams("splat").head
archiveRepository(branch, branch + ".tar.bz2", repository, path)
})
/**
* Download repository contents as a tar.xz archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.xz")(referrersOnly { repository =>
get("/:owner/:repository/archive/*/:branch.tar.xz")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.xz", repository, "")
})
/**
* Download all repository contents as an archive.
*/
get("/:owner/:repository/archive/:branch/:name")(referrersOnly { repository =>
val branch = params("branch")
val name = params("name")
archiveRepository(branch, name, repository, "")
})
/**
* Download repositories subtree contents as an archive.
*/
get("/:owner/:repository/archive/:branch/*/:name")(referrersOnly { repository =>
val branch = params("branch")
val name = params("name")
val path = multiParams("splat").head
archiveRepository(branch, name, repository, path)
archiveRepository(branch, branch + ".tar.xz", repository, path)
})
get("/:owner/:repository/network/members")(referrersOnly { repository =>

2
src/main/twirl/gitbucket/core/repo/files.scala.html
View File

@@ -33,7 +33,7 @@
<div class="head" style="height: 24px;">
<div class="pull-right">
<div class="btn-group">
<a href="@{helpers.url(repository)}/archive/@{helpers.encodeRefName(branch)}@if(pathList.length > 0){/@pathList.mkString("/")}/@{helpers.encodeRefName(branch)}.zip" class="btn btn-sm btn-default pc"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
<a href="@{helpers.url(repository)}/archive/@if(pathList.length > 0){@pathList.map(helpers.urlEncode).mkString("/")}/@{helpers.urlEncode(branch)}.zip" class="btn btn-sm btn-default pc"><i class="octicon octicon-cloud-download"></i> Download ZIP</a>
<a href="@helpers.url(repository)/find/@helpers.encodeRefName(branch)" class="btn btn-sm btn-default" data-hotkey="t"><i class="octicon octicon-search"></i></a>
<a href="@helpers.url(repository)/commits/@helpers.encodeRefName((branch :: pathList).mkString("/"))" class="btn btn-sm btn-default"><i class="octicon octicon-history"></i> @if(commitCount > 10000){10000+} else {@commitCount} @helpers.plural(commitCount, "commit")</a>
</div>