tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-11-16 15:14:24 +00:00
Code Releases Activity

fix image display

Browse Source
This commit is contained in:
slene 2014-03-28 00:30:20 +08:00
parent 16cb1e974c
commit 346db02d89
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/markdown.go
View File

@ -51,6 +51,14 @@ func IsTextFile(data []byte) (string, bool) {
return contentType, false return contentType, false
} }
func IsImageFile(data []byte) (string, bool) {
contentType := http.DetectContentType(data)
if strings.Index(contentType, "img/") != -1 {
return contentType, true
}
return contentType, false
}
func IsReadmeFile(name string) bool { func IsReadmeFile(name string) bool {
name = strings.ToLower(name) name = strings.ToLower(name)
if len(name) < 6 { if len(name) < 6 {

7
routers/repo/repo.go
View File

@ -120,8 +120,12 @@ func Single(ctx *middleware.Context, params martini.Params) {
data := blob.Contents() data := blob.Contents()
_, isTextFile := base.IsTextFile(data) _, isTextFile := base.IsTextFile(data)
_, isImageFile := base.IsImageFile(data)
ctx.Data["FileIsText"] = isTextFile ctx.Data["FileIsText"] = isTextFile
if isImageFile {
ctx.Data["IsImageFile"] = true
} else {
readmeExist := base.IsMarkdownFile(repoFile.Name) || base.IsReadmeFile(repoFile.Name) readmeExist := base.IsMarkdownFile(repoFile.Name) || base.IsReadmeFile(repoFile.Name)
ctx.Data["ReadmeExist"] = readmeExist ctx.Data["ReadmeExist"] = readmeExist
if readmeExist { if readmeExist {
@ -132,6 +136,7 @@ func Single(ctx *middleware.Context, params martini.Params) {
} }
} }
} }
}
} else { } else {
// Directory and file list. // Directory and file list.
@ -236,9 +241,9 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) {
data := blob.Contents() data := blob.Contents()
contentType, isTextFile := base.IsTextFile(data) contentType, isTextFile := base.IsTextFile(data)
_, isImageFile := base.IsImageFile(data)
ctx.Res.Header().Set("Content-Type", contentType) ctx.Res.Header().Set("Content-Type", contentType)
if !isTextFile { if !isTextFile {
ctx.Res.Header().Set("Content-Type", contentType)
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")
} }

4
templates/repo/single_file.tmpl
View File

@ -23,7 +23,11 @@
</div> </div>
{{if not .FileIsText}} {{if not .FileIsText}}
<div class="panel-footer text-center"> <div class="panel-footer text-center">
{{if .IsImageFile}}
<img src="{{.FileLink}}">
{{else}}
<a href="{{.FileLink}}" class="btn btn-default">View Raw</a> <a href="{{.FileLink}}" class="btn btn-default">View Raw</a>
{{end}}
</div> </div>
{{else}} {{else}}
{{if .ReadmeExist}} {{if .ReadmeExist}}