C# sln 파일 지정 기능 추가

Author: switchover

src/main/java/com/samsungsds/analyst/code/main/App.java

@@ -414,6 +414,8 @@ private void runComplexityForCSharp(CliParser cli) {
 
         codeAnalysis.addOption("-dir", cli.getProjectBaseDir());
 
+        codeAnalysis.addOption("sln", cli.getSrc());
+
         codeAnalysis.run(cli.getInstanceKey());
 
         observerManager.notifyObservers(ProgressEvent.COMPLEXITY_COMPLETE);

src/main/java/com/samsungsds/analyst/code/main/AppForSonarAnalysisForCSharp.java

@@ -110,6 +110,8 @@ private void runScannerForMSBuild(MSBuildEnv env, String scannerDirectory, List<
     }
 
     private void runMSBuild(MSBuildEnv env, String projectBaseDir) {
+        projectBaseDir = getSolutionFile(projectBaseDir);
+
         List<String> command = new ArrayList<>();
         if (env == MSBuildEnv.DOT_NET_FRAMEWORK) {
             command.add("MSBuild.exe");
@@ -124,6 +126,19 @@ private void runMSBuild(MSBuildEnv env, String projectBaseDir) {
         runProcessBuilder(command, projectBaseDir);
     }
 
+    private String getSolutionFile(String projectBaseDir) {
+        if (".".equals(cli.getSrc())) {
+            return projectBaseDir;
+        }
+
+        File sln = new File(projectBaseDir, cli.getSrc());
+        if (sln.exists()) {
+            return sln.getAbsolutePath();
+        } else {
+            throw new IllegalArgumentException("sln file not found : " + sln.getAbsolutePath());
+        }
+    }
+
     private void runProcessBuilder(List<String> command, String workingDirectory) {
         ProcessBuilder builder;
         builder = new ProcessBuilder(command);

src/main/java/com/samsungsds/analyst/code/main/Version.java

@@ -71,7 +71,7 @@ public class Version {
     // 2.10.6 : JavaScript ESLint 여러 src 처리 오류, Python pip Linux 경로 오류, Python radon 관련 오류 수정
     //          PMD CPD 중복 체크 기능 다른 언어 적용, PMD CPD 충돌(w/ SonarQube)으로 인한 오류 수정,
     //          Linux Node 설치 처리 오류 수정, C# CK Metrics exclude/include 오류 수정
-    // 2.10.7 : Python 경로지정 기능 추가("python" 시스템 속성), Unused 처리 소스 인코딩 지정 추가
+    // 2.10.7 : Python 경로지정 기능 추가("python" 시스템 속성), Unused 처리 소스 인코딩 지정 추가, C# sln 파일 지정 기능
     // --------------------------------------------------
 	public static final String CODE_ANALYST = "2.10.7";
 	public static final String DOCUMENT_VERSION = "2.9";

src/main/java/com/samsungsds/analyst/code/main/cli/CliParseProcessorForCSharp.java

@@ -48,7 +48,8 @@ public void setOptions(CliParser cliParser, Options options) {
 
         options.addOption("h", "help", false, "show help.");
         options.addOption("p", "project", true, "specify project base directory. (default: \".\")");
-        options.addOption("s", "src", true, "specify source directories with comma separated. (default: \"${project}" + File.separator + getDefaultSrcOption() + "\")");
+        options.addOption("s", "src", true, "specify '*.sln' file in project directory. (default: 'sln' file in \"${project}\" directory. " +
+            "However, there should be only 1 'sln' file in that directory.)");
 
         options.addOption("d", "debug", false, "debug mode.");
         options.addOption("e", "encoding", true, "encoding of the source code. (default: UTF-8)");

src/main/java/com/samsungsds/analyst/code/roslyn/codemetrics/CodeAnalysisLauncher.java

@@ -31,10 +31,14 @@ public class CodeAnalysisLauncher implements ComplexityAnalysis {
     private final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();;
     private String solutionDirectory = null;
 
+    private String slnFilename = ".";
+
     @Override
     public void addOption(String option, String value) {
         if (option.equals("-dir")) {
             solutionDirectory = value;
+        } else if (option.equals("sln")) {
+            slnFilename = value;
         }
     }
 
@@ -137,14 +141,25 @@ private String installCodeAnalysisAndGetPath() {
     private String findSolutionFile(String directory) {
         File dir = new File(directory);
 
-        File[] list = dir.listFiles((sub, name) -> {
-            return name.endsWith(".sln");
-        });
+        if (".".equals(slnFilename)) {
 
-        if (list.length == 0) {
-            throw new IllegalStateException("Solution(*.sln) not found in " + directory);
-        }
+            File[] list = dir.listFiles((sub, name) -> {
+                return name.endsWith(".sln");
+            });
+
+            if (list.length == 0) {
+                throw new IllegalStateException("Solution(*.sln) not found in " + directory);
+            }
 
-        return list[0].getName();
+            return list[0].getName();
+        } else {
+            File sln = new File(dir, slnFilename);
+
+            if (sln.exists()) {
+                return slnFilename;
+            } else {
+                throw new IllegalArgumentException("sln file not found : " + sln.getAbsolutePath());
+            }
+        }
     }
 }