WIP

Author: stephen-carter-at-sf

packages/code-analyzer-pmd-engine/pmd-cpd-wrappers/src/main/java/com/salesforce/sfca/cpdwrapper/CpdRunner.java

@@ -1,9 +1,6 @@
 package com.salesforce.sfca.cpdwrapper;
 
-import net.sourceforge.pmd.cpd.CPDConfiguration;
-import net.sourceforge.pmd.cpd.CpdAnalysis;
-import net.sourceforge.pmd.cpd.Mark;
-import net.sourceforge.pmd.cpd.Match;
+import net.sourceforge.pmd.cpd.*;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.document.FileLocation;
 import net.sourceforge.pmd.reporting.Report;
@@ -64,8 +61,15 @@ private CpdLanguageRunResults runLanguage(String language, List<Path> pathsToSca
         CpdLanguageRunResults languageRunResults = new CpdLanguageRunResults();
 
         try (CpdAnalysis cpd = CpdAnalysis.create(config)) {
-            cpd.performAnalysis(report -> {
 
+            // Note that we could use cpd.files().getCollectedFiles().size() to get the true totalNumFiles but
+            // unfortunately getCollectedFiles doesn't cache and does a sort operation which is expensive.
+            // So instead we use pathsToScan.size() since we send in the list of files instead of folders and so
+            // these numbers should be the same.
+            int totalNumFiles = pathsToScan.size();
+            cpd.setCpdListener(new CpdRunListener(totalNumFiles));
+
+            cpd.performAnalysis(report -> {
                 for (Report.ProcessingError reportProcessingError : report.getProcessingErrors()) {
                     CpdLanguageRunResults.ProcessingError processingErr = new CpdLanguageRunResults.ProcessingError();
                     processingErr.file = reportProcessingError.getFileId().getAbsolutePath();
@@ -134,4 +138,44 @@ public boolean isLoggable(Level level) {
     public int numErrors() {
         return 0;
     }
+}
+
+class CpdRunListener implements CPDListener {
+    private final int totalNumFiles;
+    private int numFilesAdded = 0;
+    private int currentPhase = CPDListener.INIT;
+
+    public CpdRunListener(int totalNumFiles) {
+        this.totalNumFiles = totalNumFiles;
+    }
+
+    @Override
+    public void addedFile(int i) {
+        // All files are added while we still are on phase 0 - INIT, i.e. before the phase is updated to phase 1 - HASH.
+        this.numFilesAdded += i;
+        printCompletePercentage();
+    }
+
+    @Override
+    public void phaseUpdate(int i) {
+        this.currentPhase = i;
+        printCompletePercentage();
+    }
+
+    private float calculateCompletePercentage() {
+        if (this.currentPhase == CPDListener.INIT) {
+            // Using Math.min just in case the totalNumFiles is inaccurate - although it shouldn't be.
+            return 25*(Math.min((float) this.numFilesAdded / this.totalNumFiles, 1.0f));
+        }
+        return 100 * ((float) this.currentPhase / CPDListener.DONE);
+    }
+
+    private void printCompletePercentage() {
+        System.out.println(calculateCompletePercentage());
+    }
+}
+
+// TODO: add in per language
+class ProgressReporter {
+    // updateProgressForLanguage(language, percComplete)
 }