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

Allow display of LFS stored Readme.md on directory page (#6073) #6099

Merged
merged 11 commits into from Feb 21, 2019
Merged

Allow display of LFS stored Readme.md on directory page (#6073) #6099

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f20add7
Fix display of >1Kb LFS text files
zeripath Feb 16, 2019
fce4619
Make LFS stored Readme files viewable
zeripath Feb 16, 2019
4d3f8c3
Merge branch 'master' into issue-6073-readme.md-lfs
zeripath Feb 17, 2019
a5263d2
Merge branch 'master' into issue-6073-readme.md-lfs
zeripath Feb 17, 2019
7e4a3c2
Slight restructure
zeripath Feb 18, 2019
f7ca6de
Slight restructure
zeripath Feb 18, 2019
654b72f
catch errors and restructure LFS sections
zeripath Feb 19, 2019
4fb9835
Merge branch 'master' into issue-6073-readme.md-lfs
zeripath Feb 19, 2019
5da96f8
Merge branch 'master' into issue-6073-readme.md-lfs
zeripath Feb 20, 2019
0507526
Merge branch 'master' into issue-6073-readme.md-lfs
lunny Feb 21, 2019
6fc05df
Merge branch 'master' into issue-6073-readme.md-lfs
techknowlogick Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
114 changes: 88 additions & 26 deletions routers/repo/view.go
View file
Open in desktop
Expand Up @@ -103,13 +103,62 @@ func renderDirectory(ctx *context.Context, treeLink string) {
isTextFile := base.IsTextFile(buf)
ctx.Data["FileIsText"] = isTextFile
ctx.Data["FileName"] = readmeFile.Name()
fileSize := int64(0)
isLFSFile := false
ctx.Data["IsLFSFile"] = false

// FIXME: what happens when README file is an image?
if isTextFile && setting.LFS.StartServer {
meta := lfs.IsPointerFile(&buf)
if meta != nil {
meta, err = ctx.Repo.Repository.GetLFSMetaObjectByOid(meta.Oid)
if err != nil && err != models.ErrLFSObjectNotExist {
ctx.ServerError("GetLFSMetaObject", err)
zeripath marked this conversation as resolved.
Show resolved Hide resolved
return
}
}

if meta != nil {
ctx.Data["IsLFSFile"] = true
isLFSFile = true

// OK read the lfs object
var err error
dataRc, err = lfs.ReadMetaObject(meta)
if err != nil {
ctx.ServerError("ReadMetaObject", err)
return
}
defer dataRc.Close()

buf = make([]byte, 1024)
n, err = dataRc.Read(buf)
if err != nil {
ctx.ServerError("Data", err)
return
}
buf = buf[:n]

isTextFile = base.IsTextFile(buf)
ctx.Data["IsTextFile"] = isTextFile

fileSize = meta.Size
ctx.Data["FileSize"] = meta.Size
filenameBase64 := base64.RawURLEncoding.EncodeToString([]byte(readmeFile.Name()))
ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, filenameBase64)
}
}

if !isLFSFile {
fileSize = readmeFile.Size()
}

if isTextFile {
if readmeFile.Size() >= setting.UI.MaxDisplayFileSize {
if fileSize >= setting.UI.MaxDisplayFileSize {
// Pretend that this is a normal text file to display 'This file is too large to be shown'
ctx.Data["IsFileTooLarge"] = true
ctx.Data["IsTextFile"] = true
ctx.Data["FileSize"] = readmeFile.Size()
ctx.Data["FileSize"] = fileSize
} else {
d, _ := ioutil.ReadAll(dataRc)
buf = templates.ToUTF8WithFallback(append(buf, d...))
Expand Down Expand Up @@ -168,7 +217,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st

ctx.Data["Title"] = ctx.Data["Title"].(string) + " - " + ctx.Repo.TreePath + " at " + ctx.Repo.BranchName

ctx.Data["FileSize"] = blob.Size()
fileSize := blob.Size()
ctx.Data["FileSize"] = fileSize
ctx.Data["FileName"] = blob.Name()
ctx.Data["HighlightClass"] = highlight.FileNameToHighlightClass(blob.Name())
ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath
Expand All @@ -182,31 +232,43 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["IsTextFile"] = isTextFile

//Check for LFS meta file
if isTextFile {
if meta := lfs.IsPointerFile(&buf); meta != nil {
if meta, _ = ctx.Repo.Repository.GetLFSMetaObjectByOid(meta.Oid); meta != nil {
ctx.Data["IsLFSFile"] = true
isLFSFile = true

// OK read the lfs object
dataRc, err := lfs.ReadMetaObject(meta)
if err != nil {
ctx.ServerError("ReadMetaObject", err)
return
}
defer dataRc.Close()
if isTextFile && setting.LFS.StartServer {
meta := lfs.IsPointerFile(&buf)
if meta != nil {
meta, err = ctx.Repo.Repository.GetLFSMetaObjectByOid(meta.Oid)
if err != nil && err != models.ErrLFSObjectNotExist {
ctx.ServerError("GetLFSMetaObject", err)
return
}
}
if meta != nil {
ctx.Data["IsLFSFile"] = true
isLFSFile = true

// OK read the lfs object
var err error
dataRc, err = lfs.ReadMetaObject(meta)
if err != nil {
ctx.ServerError("ReadMetaObject", err)
return
}
defer dataRc.Close()

buf = make([]byte, 1024)
n, _ = dataRc.Read(buf)
buf = buf[:n]
buf = make([]byte, 1024)
n, err = dataRc.Read(buf)
if err != nil {
ctx.ServerError("Data", err)
return
}
buf = buf[:n]

isTextFile = base.IsTextFile(buf)
ctx.Data["IsTextFile"] = isTextFile
isTextFile = base.IsTextFile(buf)
ctx.Data["IsTextFile"] = isTextFile

ctx.Data["FileSize"] = meta.Size
filenameBase64 := base64.RawURLEncoding.EncodeToString([]byte(blob.Name()))
ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, filenameBase64)
}
fileSize = meta.Size
ctx.Data["FileSize"] = meta.Size
filenameBase64 := base64.RawURLEncoding.EncodeToString([]byte(blob.Name()))
ctx.Data["RawFileLink"] = fmt.Sprintf("%s%s.git/info/lfs/objects/%s/%s", setting.AppURL, ctx.Repo.Repository.FullName(), meta.Oid, filenameBase64)
}
}

Expand All @@ -219,7 +281,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st

switch {
case isTextFile:
if blob.Size() >= setting.UI.MaxDisplayFileSize {
if fileSize >= setting.UI.MaxDisplayFileSize {
ctx.Data["IsFileTooLarge"] = true
break
}
Expand Down