Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allows external rendering of other filetypes 2 #8300

Merged
merged 11 commits into from
Oct 21, 2019
Merged

Allows external rendering of other filetypes 2 #8300

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c51ed90
allow external rendering of other filetypes
HarvsG Sep 26, 2019
2e6bd5b
Moves flie-size check before read()
HarvsG Sep 27, 2019
bdfa7d6
Only reads if markType is detected
HarvsG Sep 27, 2019
88bc5c7
Merge branch 'master' into ExtRenders
lunny Oct 16, 2019
8077b52
Merge branch 'master' into ExtRenders
zeripath Oct 16, 2019
c6619eb
Merge branch 'master' into ExtRenders
zeripath Oct 16, 2019
69c93d4
Merge branch 'master' into ExtRenders
zeripath Oct 16, 2019
36086f3
Merge branch 'master' into ExtRenders
lunny Oct 17, 2019
e9a7040
Merge branch 'master' into ExtRenders
zeripath Oct 18, 2019
263eaa9
Merge branch 'master' into ExtRenders
zeripath Oct 20, 2019
03daafa
Merge branch 'master' into ExtRenders
zeripath Oct 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,20 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["IsAudioFile"] = true
case base.IsImageFile(buf):
ctx.Data["IsImageFile"] = true
default:
if fileSize >= setting.UI.MaxDisplayFileSize {
ctx.Data["IsFileTooLarge"] = true
break
}

if markupType := markup.Type(blob.Name()); markupType != "" {
HarvsG marked this conversation as resolved.
Show resolved Hide resolved
d, _ := ioutil.ReadAll(dataRc)
buf = append(buf, d...)
ctx.Data["IsMarkup"] = true
ctx.Data["MarkupType"] = markupType
ctx.Data["FileContent"] = string(markup.Render(blob.Name(), buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
}

}

if ctx.Repo.CanEnableEditor() {
Expand Down