Merge pull request #376 from stefanie-koss/feature/summariesUsingMultipleJars

Enable simultaneous processing of multiple JARs for summary generation

Author: StevenArzt

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/Main.java

@@ -5,6 +5,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -104,9 +105,32 @@ public void run(final String[] args) throws FileNotFoundException, XMLStreamExce
 			SummaryGenerator generator = new SummaryGeneratorFactory().initSummaryGenerator();
 
 			// Parse the mandatory arguments
-			File toAnalyze = new File(extraArgs[0]);
+			String toAnalyze = extraArgs[0];
 			File outputFolder = new File(extraArgs[1]);
 
+			// Check if the given files to analyze do exist
+			List<String> filesToAnalyze = Arrays.asList(toAnalyze.split(File.pathSeparator));
+			for (String fileStr : filesToAnalyze) {
+				File file = new File(fileStr);
+				if (!file.exists()) {
+					System.err.println("File not found: " + file);
+					System.exit(1);
+					return;
+				}
+				if (file.isDirectory()) {
+					File[] files = file.listFiles(new FilenameFilter() {
+						@Override
+						public boolean accept(File dir, String name) {
+							return name.toLowerCase().endsWith(".jar");
+						}
+					});
+					for (int c = 0; c < files.length; c++) {
+						File f = files[c];
+						toAnalyze += File.pathSeparator + f.getPath();
+					}
+				}
+			}
+
 			// Collect the classes to be analyzed from our command line
 			List<String> classesToAnalyze = new ArrayList<>();
 			if (!summarizeFullJAR) {
@@ -133,38 +157,10 @@ public void run(final String[] args) throws FileNotFoundException, XMLStreamExce
 			configureOptionalSettings(cmd, generator);
 
 			// Configure the output directory
-			if (!toAnalyze.exists()) {
-				System.err.println("File not found: " + toAnalyze);
-				System.exit(1);
-				return;
-			}
 			generator.getConfig().addAdditionalSummaryDirectory(outputFolder.getAbsolutePath());
 
 			// Run it
-			if (toAnalyze.isDirectory()) {
-				File[] files = toAnalyze.listFiles(new FilenameFilter() {
-
-					@Override
-					public boolean accept(File dir, String name) {
-						return name.toLowerCase().endsWith(".jar");
-					}
-
-				});
-				for (int c = 0; c < files.length; c++) {
-					File f = files[c];
-					System.out.println(String.format("Jar %d of %d: %s", c + 1, files.length, f));
-					createSummaries(generator, classesToAnalyze, forceOverwrite, f, outputFolder);
-				}
-
-				// If we don't have any JAR files, the target may be a normal classpath with
-				// Java class files
-				if (files.length == 0) {
-					System.out.println(String.format("Analyzing directory %s...", toAnalyze.getAbsolutePath()));
-					createSummaries(generator, classesToAnalyze, forceOverwrite, toAnalyze, outputFolder);
-				}
-			} else {
-				createSummaries(generator, classesToAnalyze, forceOverwrite, toAnalyze, outputFolder);
-			}
+			createSummaries(generator, classesToAnalyze, forceOverwrite, toAnalyze, outputFolder);
 
 			System.out.println("Done.");
 		} catch (ParseException e) {
@@ -236,8 +232,8 @@ private void printHelpMessage() {
 	}
 
 	private static void createSummaries(SummaryGenerator generator, List<String> classesToAnalyze,
-			final boolean doForceOverwrite, File toAnalyze, File outputFolder) {
-		ClassSummaries summaries = generator.createMethodSummaries(toAnalyze.getPath(), classesToAnalyze,
+			final boolean doForceOverwrite, String toAnalyze, File outputFolder) {
+		ClassSummaries summaries = generator.createMethodSummaries(toAnalyze, classesToAnalyze,
 				new IClassSummaryHandler() {
 
 					@Override