The Unified and Autonomous Development Platform
Fix issue #1021 - can't view 6MB large yaml file in webview
Robin Shen28a4f488a9a6
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex a29882e198..4f0045bda3 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -222,7 +222,11 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imnew BlobIdent(historyCommit.name(), pathEntry.getKey(), FileMode.REGULAR_FILE.getBits()),WhitespaceOption.DEFAULT, false);if (oldLines != null) {- Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);+ Map<Integer, Integer> lineMapping;+ if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE)+ lineMapping = DiffUtils.mapLines(oldLines, newLines);+ else+ lineMapping = new HashMap<>();for (CodeComment comment: pathEntry.getValue()) {PlanarRange newRange = DiffUtils.mapRange(lineMapping, comment.getMark().getRange());if (newRange != null)diff --git a/server-core/src/main/java/io/onedev/server/git/Blob.java b/server-core/src/main/java/io/onedev/server/git/Blob.javaindex fa8918ccad..a26ba22311 100644--- a/server-core/src/main/java/io/onedev/server/git/Blob.java+++ b/server-core/src/main/java/io/onedev/server/git/Blob.java@@ -121,15 +121,11 @@ public class Blob implements Serializable {if (ident.isGitLink() || ident.isSymbolLink() || ident.isTree()) {Charset charset = StandardCharsets.UTF_8;text = Optional.of(new Text(charset, new String(bytes, charset)));- } else if (!isPartial()) {- if (!ContentDetector.isBinary(bytes, ident.path)) {- Charset charset = ContentDetector.detectCharset(bytes);- if (charset == null)- charset = Charset.defaultCharset();- text = Optional.of(new Text(charset, new String(bytes, charset)));- } else {- text = Optional.absent();- }+ } else if (!ContentDetector.isBinary(bytes, ident.path)) {+ Charset charset = ContentDetector.detectCharset(bytes);+ if (charset == null)+ charset = Charset.defaultCharset();+ text = Optional.of(new Text(charset, new String(bytes, charset)));} else {text = Optional.absent();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.htmlindex 4337606256..bc18c394db 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html@@ -27,7 +27,7 @@<div wicket:id="content" class="flex-grow-1 d-flex flex-column overflow-hidden"></div></div></div>- <wicket:fragment wicket:id="binaryFileFrag">+ <wicket:fragment wicket:id="binaryOrLargeFileFrag"><div class="border-bottom d-flex align-items-center px-3 py-2 justify-content-between"><span wicket:id="size"></span><span>@@ -37,9 +37,7 @@</span></span></div>- <div class="alert alert-notice alert-light-warning m-4">- Binary file- </div>+ <div wicket:id="message" class="alert alert-notice alert-light-warning m-4"></div></wicket:fragment><wicket:fragment wicket:id="lfsObjectMissingFrag"><div class="alert alert-notice alert-light-warning m-4">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 4a6771e196..293c9c2a25 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -765,14 +765,20 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,if (blobContent == null) {if (getMode() == Mode.ADD|| getMode() == Mode.EDIT- && getProject().getBlob(getBlobIdent(), true).getText() != null) {+ && getProject().getBlob(getBlobIdent(), true).getText() != null+ && !getProject().getBlob(getBlobIdent(), true).isPartial()) {blobContent = new SourceEditPanel(BLOB_CONTENT_ID, this);} else if ((getMode() == Mode.VIEW || getMode() == Mode.BLAME)&& getBlobIdent().isFile()&& getProject().getBlob(getBlobIdent(), true).getText() != null) {blobContent = new SourceViewPanel(BLOB_CONTENT_ID, this, false);} else {- Fragment fragment = new Fragment(BLOB_CONTENT_ID, "binaryFileFrag", this);+ Fragment fragment = new Fragment(BLOB_CONTENT_ID, "binaryOrLargeFileFrag", this);++ if (getProject().getBlob(getBlobIdent(), true).getText() == null)+ fragment.add(new Label("message", "Binary file"));+ else+ fragment.add(new Label("message", "File is too large"));long size = getProject().getBlob(getBlobIdent(), true).getSize();fragment.add(new Label("size", FileUtils.byteCountToDisplaySize(size)));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.htmlindex 191b60614f..89824b9924 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html@@ -5,6 +5,8 @@<wicket:enclosure child="lines"><span wicket:id="lines"></span><span class="text-muted">|</span>+ </wicket:enclosure>+ <wicket:enclosure child="charset"><span wicket:id="charset"></span><span class="text-muted">|</span></wicket:enclosure>@@ -36,6 +38,7 @@<div wicket:id="formats" class="formats d-none d-sm-block"></div></div></div>+ <div wicket:id="fileTooLarge" class="alert alert-light-warning flex-shrink-0 mb-0 px-3 py-2"></div><div class="body autofit flex-grow-1 d-flex flex-column"><wicket:child></wicket:child></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex da102b12b0..7d14519db7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -74,6 +74,7 @@ public abstract class BlobViewPanel extends Panel {String path = context.getBlobIdent().path;boolean reviewRequired = project.isReviewRequiredForModification(user, revision, path);boolean buildRequired = project.isBuildRequiredForModification(user, revision, path);+ boolean fileTooLarge = context.getProject().getBlob(context.getBlobIdent(), true).isPartial();boolean signatureRequiredButNoSigningKey = project.isCommitSignatureRequiredButNoSigningKey(user, revision);WebMarkupContainer edit = new WebMarkupContainer("edit");@@ -86,7 +87,9 @@ public abstract class BlobViewPanel extends Panel {title = "Build required for this change. Submit pull request instead";else if (signatureRequiredButNoSigningKey)title = "Signature required for this change, please generate system GPG signing key first";- else+ else if (fileTooLarge)+ title = "File is too large to edit here";+ elsetitle = "Edit on branch " + context.getBlobIdent().revision;edit.add(AttributeAppender.append("title", title));@@ -105,7 +108,7 @@ public abstract class BlobViewPanel extends Panel {}};- if (reviewRequired || buildRequired) {+ if (reviewRequired || buildRequired || fileTooLarge) {link.add(AttributeAppender.append("class", "disabled"));link.setEnabled(false);}@@ -190,7 +193,7 @@ public abstract class BlobViewPanel extends Panel {super.onConfigure();Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);- setVisible(blob.getLfsPointer() == null && blob.getText() != null);+ setVisible(!blob.isPartial() && blob.getLfsPointer() == null && blob.getText() != null);}});@@ -284,6 +287,24 @@ public abstract class BlobViewPanel extends Panel {add(newExtraOptions("extraOptions"));newChangeActions(null);+ add(new Label("fileTooLarge", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return "Displaying first " + context.getProject().getBlob(context.getBlobIdent(), true).getText().getLines().size()+ + " lines as file is too large";+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(context.getProject().getBlob(context.getBlobIdent(), true).isPartial());+ }++ });+setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.cssindex d4ac6e6567..5b91564cf6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css@@ -34,3 +34,8 @@.blob-view>.head>.tools>.options>:last-child {margin-right: 0;}++.blob-view>.alert {+ border: none !important;+ border-radius: 0 !important;+}\ No newline at end of file