fix for new git api

This commit is contained in:
slene 2014-05-25 20:16:11 +08:00
parent ab13a29cb5
commit 4ee6bc4fca
5 changed files with 61 additions and 19 deletions

View file

@ -12,12 +12,12 @@
"models": "", "models": "",
"others": [ "others": [
"modules", "modules",
"$GOPATH/src/github.com/gogits/logs", "/project/works/open/src/github.com/gogits/logs",
"$GOPATH/src/github.com/gogits/git" "/project/works/open/src/github.com/gogits/git"
] ]
}, },
"cmd_args": [ "cmd_args": [
"web" "web"
], ],
"envs": [] "envs": []
} }

View file

@ -509,8 +509,7 @@ type argInt []int
func (a argInt) Get(i int, args ...int) (r int) { func (a argInt) Get(i int, args ...int) (r int) {
if i >= 0 && i < len(a) { if i >= 0 && i < len(a) {
r = a[i] r = a[i]
} } else if len(args) > 0 {
if len(args) > 0 {
r = args[0] r = args[0]
} }
return return

View file

@ -85,11 +85,17 @@ func Diff(ctx *middleware.Context, params martini.Params) {
return false return false
} }
data, err := blob.Data() dataRc, err := blob.Data()
if err != nil { if err != nil {
return false return false
} }
_, isImage := base.IsImageFile(data) buf := make([]byte, 1024)
n, _ := dataRc.Read(buf)
if n > 0 {
buf = buf[:n]
}
dataRc.Close()
_, isImage := base.IsImageFile(buf)
return isImage return isImage
} }

View file

@ -5,6 +5,7 @@
package repo package repo
import ( import (
"io"
"os" "os"
"path/filepath" "path/filepath"
@ -26,20 +27,31 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) {
return return
} }
data, err := blob.Data() dataRc, err := blob.Data()
if err != nil { if err != nil {
ctx.Handle(500, "repo.SingleDownload(Data)", err) ctx.Handle(500, "repo.SingleDownload(Data)", err)
return return
} }
contentType, isTextFile := base.IsTextFile(data) buf := make([]byte, 1024)
_, isImageFile := base.IsImageFile(data) n, _ := dataRc.Read(buf)
if n > 0 {
buf = buf[:n]
}
defer func() {
dataRc.Close()
}()
contentType, isTextFile := base.IsTextFile(buf)
_, isImageFile := base.IsImageFile(buf)
ctx.Res.Header().Set("Content-Type", contentType) ctx.Res.Header().Set("Content-Type", contentType)
if !isTextFile && !isImageFile { if !isTextFile && !isImageFile {
ctx.Res.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(treename)) ctx.Res.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(treename))
ctx.Res.Header().Set("Content-Transfer-Encoding", "binary") ctx.Res.Header().Set("Content-Transfer-Encoding", "binary")
} }
ctx.Res.Write(data) ctx.Res.Write(buf)
io.Copy(ctx.Res, dataRc)
} }
func ZipDownload(ctx *middleware.Context, params martini.Params) { func ZipDownload(ctx *middleware.Context, params martini.Params) {

View file

@ -8,6 +8,7 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
@ -148,7 +149,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
if entry != nil && !entry.IsDir() { if entry != nil && !entry.IsDir() {
blob := entry.Blob() blob := entry.Blob()
if data, err := blob.Data(); err != nil { if dataRc, err := blob.Data(); err != nil {
ctx.Handle(404, "repo.Single(blob.Data)", err) ctx.Handle(404, "repo.Single(blob.Data)", err)
} else { } else {
ctx.Data["FileSize"] = blob.Size() ctx.Data["FileSize"] = blob.Size()
@ -161,20 +162,32 @@ func Single(ctx *middleware.Context, params martini.Params) {
ctx.Data["FileExt"] = ext ctx.Data["FileExt"] = ext
ctx.Data["FileLink"] = rawLink + "/" + treename ctx.Data["FileLink"] = rawLink + "/" + treename
_, isTextFile := base.IsTextFile(data) buf := make([]byte, 1024)
_, isImageFile := base.IsImageFile(data) n, _ := dataRc.Read(buf)
if n > 0 {
buf = buf[:n]
}
defer func() {
dataRc.Close()
}()
_, isTextFile := base.IsTextFile(buf)
_, isImageFile := base.IsImageFile(buf)
ctx.Data["FileIsText"] = isTextFile ctx.Data["FileIsText"] = isTextFile
if isImageFile { if isImageFile {
ctx.Data["IsImageFile"] = true ctx.Data["IsImageFile"] = true
} else { } else {
d, _ := ioutil.ReadAll(dataRc)
buf = append(buf, d...)
readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name())
ctx.Data["ReadmeExist"] = readmeExist ctx.Data["ReadmeExist"] = readmeExist
if readmeExist { if readmeExist {
ctx.Data["FileContent"] = string(base.RenderMarkdown(data, "")) ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, ""))
} else { } else {
if isTextFile { if isTextFile {
ctx.Data["FileContent"] = string(data) ctx.Data["FileContent"] = string(buf)
} }
} }
} }
@ -218,17 +231,29 @@ func Single(ctx *middleware.Context, params martini.Params) {
if readmeFile != nil { if readmeFile != nil {
ctx.Data["ReadmeInSingle"] = true ctx.Data["ReadmeInSingle"] = true
ctx.Data["ReadmeExist"] = true ctx.Data["ReadmeExist"] = true
if data, err := readmeFile.Data(); err != nil { if dataRc, err := readmeFile.Data(); err != nil {
ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err) ctx.Handle(404, "repo.Single(readmeFile.LookupBlob)", err)
return return
} else { } else {
buf := make([]byte, 1024)
n, _ := dataRc.Read(buf)
if n > 0 {
buf = buf[:n]
}
defer func() {
dataRc.Close()
}()
ctx.Data["FileSize"] = readmeFile.Size ctx.Data["FileSize"] = readmeFile.Size
ctx.Data["FileLink"] = rawLink + "/" + treename ctx.Data["FileLink"] = rawLink + "/" + treename
_, isTextFile := base.IsTextFile(data) _, isTextFile := base.IsTextFile(buf)
ctx.Data["FileIsText"] = isTextFile ctx.Data["FileIsText"] = isTextFile
ctx.Data["FileName"] = readmeFile.Name() ctx.Data["FileName"] = readmeFile.Name()
if isTextFile { if isTextFile {
ctx.Data["FileContent"] = string(base.RenderMarkdown(data, branchLink)) d, _ := ioutil.ReadAll(dataRc)
buf = append(buf, d...)
ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, branchLink))
} }
} }
} }