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

(refs #2048)Fix archive downloading

Browse Source
This commit is contained in:
Naoki Takezoe
2018-06-05 11:58:05 +09:00
parent 7a795525ed
commit c3eb30c01d
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,12 +822,43 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}) })
/** /**
* Download repository contents as an archive as compatible URL. * Download repository contents as a zip archive as compatible URL.
*/ */
get("/:owner/:repository/archive/:branch.:suffix")(referrersOnly { repository => get("/:owner/:repository/archive/:branch.zip")(referrersOnly { repository =>
val branch = params("branch") val branch = params("branch")
val suffix = params("suffix") archiveRepository(branch, branch + ".zip", repository, "")
archiveRepository(branch, branch + "." + suffix, repository, "") })
/**
* Download repository contents as a tar.gz archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.gz")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.gz", repository, "")
})
/**
* Download repository contents as a tar.gz archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.gz")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.gz", repository, "")
})
/**
* Download repository contents as a tar.bz2 archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.bz2")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.bz2", repository, "")
})
/**
* Download repository contents as a tar.xz archive as compatible URL.
*/
get("/:owner/:repository/archive/:branch.tar.xz")(referrersOnly { repository =>
val branch = params("branch")
archiveRepository(branch, branch + ".tar.bz2", repository, "")
}) })
/** /**
@@ -1134,7 +1165,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
} }
} }
def archiveRepository( private def archiveRepository(
revision: String, revision: String,
filename: String, filename: String,
repository: RepositoryService.RepositoryInfo, repository: RepositoryService.RepositoryInfo,
@@ -1176,7 +1207,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
} }
} }
val suffix = path.split("/").lastOption.map("-" + _).getOrElse("") val suffix =
path.split("/").lastOption.collect { case x if x.length > 0 => "-" + x.replace('/', '_') }.getOrElse("")
val zipRe = """(.+)\.zip$""".r val zipRe = """(.+)\.zip$""".r
val tarRe = """(.+)\.tar\.(gz|bz2|xz)$""".r val tarRe = """(.+)\.tar\.(gz|bz2|xz)$""".r