diff options
| -rw-r--r-- | bee.json | 6 | ||||
| -rw-r--r-- | modules/base/tool.go | 3 | ||||
| -rw-r--r-- | routers/repo/commit.go | 10 | ||||
| -rw-r--r-- | routers/repo/download.go | 20 | ||||
| -rw-r--r-- | routers/repo/repo.go | 41 |
5 files changed, 61 insertions, 19 deletions
@@ -12,12 +12,12 @@ "models": "", "others": [ "modules", - "$GOPATH/src/github.com/gogits/logs", - "$GOPATH/src/github.com/gogits/git" + "/project/works/open/src/github.com/gogits/logs", + "/project/works/open/src/github.com/gogits/git" ] }, "cmd_args": [ "web" ], "envs": [] -}
\ No newline at end of file +} diff --git a/modules/base/tool.go b/modules/base/tool.go index a8bad9de..5b066b2b 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -509,8 +509,7 @@ type argInt []int func (a argInt) Get(i int, args ...int) (r int) { if i >= 0 && i < len(a) { r = a[i] - } - if len(args) > 0 { + } else if len(args) > 0 { r = args[0] } return diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 44427b8a..09dcaf5e 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -85,11 +85,17 @@ func Diff(ctx *middleware.Context, params martini.Params) { return false } - data, err := blob.Data() + dataRc, err := blob.Data() if err != nil { 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 } diff --git a/routers/repo/download.go b/routers/repo/download.go index 5df78dc7..ac9c390b 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -5,6 +5,7 @@ package repo import ( + "io" "os" "path/filepath" @@ -26,20 +27,31 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) { return } - data, err := blob.Data() + dataRc, err := blob.Data() if err != nil { ctx.Handle(500, "repo.SingleDownload(Data)", err) return } - contentType, isTextFile := base.IsTextFile(data) - _, isImageFile := base.IsImageFile(data) + buf := make([]byte, 1024) + 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) if !isTextFile && !isImageFile { ctx.Res.Header().Set("Content-Disposition", "attachment; filename="+filepath.Base(treename)) 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) { diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 7769d227..3f46332c 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -8,6 +8,7 @@ import ( "encoding/base64" "errors" "fmt" + "io/ioutil" "path" "path/filepath" "strings" @@ -148,7 +149,7 @@ func Single(ctx *middleware.Context, params martini.Params) { if entry != nil && !entry.IsDir() { 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) } else { ctx.Data["FileSize"] = blob.Size() @@ -161,20 +162,32 @@ func Single(ctx *middleware.Context, params martini.Params) { ctx.Data["FileExt"] = ext ctx.Data["FileLink"] = rawLink + "/" + treename - _, isTextFile := base.IsTextFile(data) - _, isImageFile := base.IsImageFile(data) + buf := make([]byte, 1024) + 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 if isImageFile { ctx.Data["IsImageFile"] = true } else { + d, _ := ioutil.ReadAll(dataRc) + buf = append(buf, d...) readmeExist := base.IsMarkdownFile(blob.Name()) || base.IsReadmeFile(blob.Name()) ctx.Data["ReadmeExist"] = readmeExist if readmeExist { - ctx.Data["FileContent"] = string(base.RenderMarkdown(data, "")) + ctx.Data["FileContent"] = string(base.RenderMarkdown(buf, "")) } else { 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 { ctx.Data["ReadmeInSingle"] = 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) return } 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["FileLink"] = rawLink + "/" + treename - _, isTextFile := base.IsTextFile(data) + _, isTextFile := base.IsTextFile(buf) ctx.Data["FileIsText"] = isTextFile ctx.Data["FileName"] = readmeFile.Name() 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)) } } } |