The Unified and Autonomous Development Platform
Add rest of code for new extension checking method
Thomas Terry12373517d3ec
diff --git a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java b/server-core/src/main/java/io/onedev/server/git/command/FileChange.javaindex a39f1a61f4..d2ac50eb14 100644--- a/server-core/src/main/java/io/onedev/server/git/command/FileChange.java+++ b/server-core/src/main/java/io/onedev/server/git/command/FileChange.java@@ -7,6 +7,8 @@ import java.util.Set;import javax.annotation.Nullable;+import io.onedev.server.util.FileExtension;+@SuppressWarnings("serial")public class FileChange implements Serializable {@@ -34,7 +36,17 @@ public class FileChange implements Serializable {public String getNewPath() {return newPath;}-++ @Nullable+ public String getOldExtension() {+ return FileExtension.getExtension(this.getOldPath());+ }++ @Nullable+ public String getNewExtension() {+ return FileExtension.getExtension(this.getNewPath());+ }+public int getAdditions() {return additions;}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/ProgrammingLanguageInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/ProgrammingLanguageInfoManager.javanew file mode 100644index 0000000000..1774d56626--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/infomanager/ProgrammingLanguageInfoManager.java@@ -0,0 +1,150 @@+package io.onedev.server.infomanager;++import java.util.HashMap;+import java.util.Map;++import javax.annotation.Nullable;+import javax.inject.Inject;++public class ProgrammingLanguageInfoManager {+ private static final Map<String, String> PROGRAMMING_LANGUAGES = new HashMap<>();++ static {+ PROGRAMMING_LANGUAGES.put("java", "Java");++ PROGRAMMING_LANGUAGES.put("h", "C");+ PROGRAMMING_LANGUAGES.put("c", "C");++ PROGRAMMING_LANGUAGES.put("h++", "C++");+ PROGRAMMING_LANGUAGES.put("c++", "C++");+ PROGRAMMING_LANGUAGES.put("hpp", "C++");+ PROGRAMMING_LANGUAGES.put("cpp", "C++");+ PROGRAMMING_LANGUAGES.put("hxx", "C++");+ PROGRAMMING_LANGUAGES.put("cxx", "C++");+ PROGRAMMING_LANGUAGES.put("hh", "C++");+ PROGRAMMING_LANGUAGES.put("cc", "C++");++ PROGRAMMING_LANGUAGES.put("cob", "Cobol");+ PROGRAMMING_LANGUAGES.put("cpy", "Cobol");++ PROGRAMMING_LANGUAGES.put("cs", "CSharp");++ PROGRAMMING_LANGUAGES.put("clj", "Clojure");+ PROGRAMMING_LANGUAGES.put("cljc", "Clojure");+ PROGRAMMING_LANGUAGES.put("cljx", "Clojure");+ PROGRAMMING_LANGUAGES.put("cljs", "ClojureScript");+ PROGRAMMING_LANGUAGES.put("gss", "Closure Stylesheets");+ PROGRAMMING_LANGUAGES.put("coffee", "CoffeeScript");++ PROGRAMMING_LANGUAGES.put("cl", "Common Lisp");+ PROGRAMMING_LANGUAGES.put("lisp", "Common Lisp");+ PROGRAMMING_LANGUAGES.put("el", "Common Lisp");++ PROGRAMMING_LANGUAGES.put("css", "CSS");+ PROGRAMMING_LANGUAGES.put("d", "D");+ PROGRAMMING_LANGUAGES.put("dart", "Dart");+ PROGRAMMING_LANGUAGES.put("dtd", "DTD");++ PROGRAMMING_LANGUAGES.put("erl", "Erlang");+ PROGRAMMING_LANGUAGES.put("f", "Fortran");+ PROGRAMMING_LANGUAGES.put("for", "Fortran");+ PROGRAMMING_LANGUAGES.put("f77", "Fortran");+ PROGRAMMING_LANGUAGES.put("f90", "Fortran");++ PROGRAMMING_LANGUAGES.put("go", "Go");+ PROGRAMMING_LANGUAGES.put("groovy", "Groovy");+ PROGRAMMING_LANGUAGES.put("gradle", "Groovy");++ PROGRAMMING_LANGUAGES.put("hs", "Haskell");+ PROGRAMMING_LANGUAGES.put("aspx", "ASP.NET");+ PROGRAMMING_LANGUAGES.put("html", "HTML");+ PROGRAMMING_LANGUAGES.put("htm", "HTML");+ PROGRAMMING_LANGUAGES.put("jsp", "Java Server Pages");+ PROGRAMMING_LANGUAGES.put("js", "JavaScript");++ PROGRAMMING_LANGUAGES.put("json", "JSON");+ PROGRAMMING_LANGUAGES.put("jsx", "JSX");++ PROGRAMMING_LANGUAGES.put("kt", "Kotlin");+ PROGRAMMING_LANGUAGES.put("less", "LESS");+ PROGRAMMING_LANGUAGES.put("lua", "Lua");+ PROGRAMMING_LANGUAGES.put("md", "Markdown");+ PROGRAMMING_LANGUAGES.put("mkd", "Markdown");+ PROGRAMMING_LANGUAGES.put("markdown", "Markdown");+ PROGRAMMING_LANGUAGES.put("m", "Objective-C");+ PROGRAMMING_LANGUAGES.put("mm", "Objective-C");++ PROGRAMMING_LANGUAGES.put("p", "Pascal");+ PROGRAMMING_LANGUAGES.put("pas", "Pascal");+ PROGRAMMING_LANGUAGES.put("pl", "Perl");+ PROGRAMMING_LANGUAGES.put("pm", "Perl");++ PROGRAMMING_LANGUAGES.put("php", "PHP");+ PROGRAMMING_LANGUAGES.put("php3", "PHP");+ PROGRAMMING_LANGUAGES.put("php4", "PHP");+ PROGRAMMING_LANGUAGES.put("php5", "PHP");+ PROGRAMMING_LANGUAGES.put("php7", "PHP");+ PROGRAMMING_LANGUAGES.put("phtml", "PHP");++ PROGRAMMING_LANGUAGES.put("sql", "SQL");+ PROGRAMMING_LANGUAGES.put("ps1", "PowerShell");+ PROGRAMMING_LANGUAGES.put("psd1", "PowerShell");+ PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");+ PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");++ PROGRAMMING_LANGUAGES.put("properties", "Properties");+ PROGRAMMING_LANGUAGES.put("ini", "INI");+ PROGRAMMING_LANGUAGES.put("in", "INI");+ PROGRAMMING_LANGUAGES.put("proto", "ProtoBuf");++ PROGRAMMING_LANGUAGES.put("BUILD", "Python");+ PROGRAMMING_LANGUAGES.put("py", "Python");+ PROGRAMMING_LANGUAGES.put("pyw", "Python");+ PROGRAMMING_LANGUAGES.put("bzl", "Python");++ PROGRAMMING_LANGUAGES.put("pp", "Puppet");+ PROGRAMMING_LANGUAGES.put("r", "R");+ PROGRAMMING_LANGUAGES.put("R", "R");+ PROGRAMMING_LANGUAGES.put("rb", "Ruby");+ PROGRAMMING_LANGUAGES.put("rs", "Rust");++ PROGRAMMING_LANGUAGES.put("sas", "SAS");+ PROGRAMMING_LANGUAGES.put("sass", "Sass");+ PROGRAMMING_LANGUAGES.put("scala", "Scala");+ PROGRAMMING_LANGUAGES.put("scm", "Scheme");+ PROGRAMMING_LANGUAGES.put("ss", "Scheme");+ PROGRAMMING_LANGUAGES.put("scss", "Scss");++ PROGRAMMING_LANGUAGES.put("sh", "Shell");+ PROGRAMMING_LANGUAGES.put("ksh", "Shell");+ PROGRAMMING_LANGUAGES.put("bash", "Shell");++ PROGRAMMING_LANGUAGES.put("st", "SmallTalk");+ PROGRAMMING_LANGUAGES.put("soy", "Soy");+ PROGRAMMING_LANGUAGES.put("styl", "Stylus");+ PROGRAMMING_LANGUAGES.put("swift", "Swift");++ PROGRAMMING_LANGUAGES.put("tex", "LaTeX");+ PROGRAMMING_LANGUAGES.put("tcl", "TCL");+ PROGRAMMING_LANGUAGES.put("ts", "TypeScript");+ PROGRAMMING_LANGUAGES.put("tsx", "TypeScript-JSX");+ PROGRAMMING_LANGUAGES.put("vb", "VB.NET");+ PROGRAMMING_LANGUAGES.put("vbs", "VBScript");++ PROGRAMMING_LANGUAGES.put("vue", "Vue.js Component");+ PROGRAMMING_LANGUAGES.put("xml", "XML");+ PROGRAMMING_LANGUAGES.put("xsl", "XML");+ PROGRAMMING_LANGUAGES.put("xsd", "XML");+ PROGRAMMING_LANGUAGES.put("svg", "XML");+ PROGRAMMING_LANGUAGES.put("yaml", "Yaml");+ PROGRAMMING_LANGUAGES.put("yml", "Yaml");+ }++ @Nullable+ public static String getLanguageForExtension(@Nullable String extension) {+ if(extension != null) {+ return PROGRAMMING_LANGUAGES.get(extension.toLowerCase());+ }+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/FileExtension.java b/server-core/src/main/java/io/onedev/server/util/FileExtension.javanew file mode 100644index 0000000000..b9b8f0af48--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/FileExtension.java@@ -0,0 +1,20 @@+package io.onedev.server.util;++import javax.annotation.Nullable;++public class FileExtension {+ @Nullable+ public static String getExtension(@Nullable String filename) {+ if(filename == null) {+ return null;+ }++ int lastIndexOfDot = filename.lastIndexOf('.');+ if (lastIndexOfDot != -1) {+ String fileExt = filename.substring(lastIndexOfDot+1);+ return fileExt;+ }+ // No Extension+ return "";+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.javaindex 774007d84d..4d71f960b2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java@@ -4,6 +4,8 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;+import io.onedev.server.infomanager.ProgrammingLanguageInfoManager;+import io.onedev.server.util.FileExtension;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;@@ -13,7 +15,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRendererer;public class MarkdownRenderer implements BlobRendererer {private boolean isMarkdown(@Nullable String blobPath) {- return blobPath != null && (blobPath.endsWith(".md") || blobPath.endsWith(".mkd"));+ return blobPath != null && ProgrammingLanguageInfoManager.getLanguageForExtension(FileExtension.getExtension(blobPath)) == "Markdown";}@Override