stonewareslord/gogs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #596 from isotas38/dev

Browse Source 
Fix #595
This commit is contained in:
无闻 2014-11-02 10:57:04 -05:00
commit 7e2ea7639e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
routers/repo/repo.go
View File

@ -263,15 +263,18 @@ func Download(ctx *middleware.Context) {
refName string refName string
ext string ext string
archivePath string archivePath string
archiveType git.ArchiveType
) )
switch { switch {
case strings.HasSuffix(uri, ".zip"): case strings.HasSuffix(uri, ".zip"):
ext = ".zip" ext = ".zip"
archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/zip") archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/zip")
archiveType = git.ZIP
case strings.HasSuffix(uri, ".tar.gz"): case strings.HasSuffix(uri, ".tar.gz"):
ext = ".tar.gz" ext = ".tar.gz"
archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz") archivePath = path.Join(ctx.Repo.GitRepo.Path, "archives/targz")
archiveType = git.TARGZ
default: default:
ctx.Error(404) ctx.Error(404)
return return
@ -316,7 +319,7 @@ func Download(ctx *middleware.Context) {
archivePath = path.Join(archivePath, base.ShortSha(commit.Id.String())+ext) archivePath = path.Join(archivePath, base.ShortSha(commit.Id.String())+ext)
if !com.IsFile(archivePath) { if !com.IsFile(archivePath) {
if err := commit.CreateArchive(archivePath, git.ZIP); err != nil { if err := commit.CreateArchive(archivePath, archiveType); err != nil {
ctx.Handle(500, "Download -> CreateArchive "+archivePath, err) ctx.Handle(500, "Download -> CreateArchive "+archivePath, err)
return return
} }