From 1be63d23e611ea7bbfdb09ca69c7d00df2378414 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 1 Dec 2023 09:04:36 +0000 Subject: [PATCH 1/4] fix --- routers/web/repo/view.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index ba2ac3af115e..ead70e634120 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -713,14 +713,7 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) { if entry.Name() == "CITATION.cff" || entry.Name() == "CITATION.bib" { ctx.Data["CitiationExist"] = true // Read Citation file contents - blob := entry.Blob() - dataRc, err := blob.DataAsync() - if err != nil { - ctx.ServerError("DataAsync", err) - return - } - defer dataRc.Close() - ctx.PageData["citationFileContent"], err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize) + ctx.PageData["citationFileContent"], err = entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize) if err != nil { ctx.ServerError("GetBlobContent", err) return From 18e755ca1db66fc8035abf2d3e3edd27c97e5be8 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 4 Dec 2023 06:10:21 +0000 Subject: [PATCH 2/4] ignore error --- routers/web/repo/view.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index ead70e634120..466f9544cf95 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -715,8 +715,7 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) { // Read Citation file contents ctx.PageData["citationFileContent"], err = entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize) if err != nil { - ctx.ServerError("GetBlobContent", err) - return + log.Error("checkCitationFile: GetBlobContent: %v", err) } break } From d2c515edcc82daf5782ef3b6c7a5d074ec2f854a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 5 Dec 2023 13:38:08 +0000 Subject: [PATCH 3/4] fix --- routers/web/repo/view.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 466f9544cf95..171cc3b96192 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -711,11 +711,12 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) { } for _, entry := range allEntries { if entry.Name() == "CITATION.cff" || entry.Name() == "CITATION.bib" { - ctx.Data["CitiationExist"] = true // Read Citation file contents - ctx.PageData["citationFileContent"], err = entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize) - if err != nil { + if content, err := entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { log.Error("checkCitationFile: GetBlobContent: %v", err) + } else { + ctx.Data["CitiationExist"] = true + ctx.PageData["citationFileContent"] = content } break } From 05d9cff28812f5bce00b700bfab70cac16c6c480 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 5 Dec 2023 13:41:40 +0000 Subject: [PATCH 4/4] break when really readed file contents --- routers/web/repo/view.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 171cc3b96192..70556185bb53 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -717,8 +717,8 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) { } else { ctx.Data["CitiationExist"] = true ctx.PageData["citationFileContent"] = content + break } - break } } }