Skip to content

Commit ec90ee6

Browse files
authored
Fix object does not exist error when checking citation file (go-gitea#28314)
Fix go-gitea#28264 `DataAsync()` will be called twice. Caused by go-gitea#27958. I'm sorry, I didn't completely remove all unnecessary codes.
1 parent 09d5028 commit ec90ee6

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

routers/web/repo/view.go

+6-13
Original file line numberDiff line numberDiff line change
@@ -711,21 +711,14 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) {
711711
}
712712
for _, entry := range allEntries {
713713
if entry.Name() == "CITATION.cff" || entry.Name() == "CITATION.bib" {
714-
ctx.Data["CitiationExist"] = true
715714
// Read Citation file contents
716-
blob := entry.Blob()
717-
dataRc, err := blob.DataAsync()
718-
if err != nil {
719-
ctx.ServerError("DataAsync", err)
720-
return
721-
}
722-
defer dataRc.Close()
723-
ctx.PageData["citationFileContent"], err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize)
724-
if err != nil {
725-
ctx.ServerError("GetBlobContent", err)
726-
return
715+
if content, err := entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil {
716+
log.Error("checkCitationFile: GetBlobContent: %v", err)
717+
} else {
718+
ctx.Data["CitiationExist"] = true
719+
ctx.PageData["citationFileContent"] = content
720+
break
727721
}
728-
break
729722
}
730723
}
731724
}

0 commit comments

Comments
 (0)