Merge pull request #51 from bsync/exclusions

Support command line exclusions from the dependency scan

Author: gangz

pom.xml

@@ -7,7 +7,7 @@
 	<groupId>cn.emergentdesign.se</groupId>
 	<artifactId>depends</artifactId>
 	<!-- <version>1.0-SNAPSHOT</version> -->
-	<version>0.9.7</version>
+	<version>0.9.8</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<antlr4.visitor>true</antlr4.visitor>

src/main/java/depends/DependsCommand.java

@@ -68,6 +68,8 @@ public static class SupportedTypes extends ArrayList<String> {
     private String namePathPattern="";
 	@Option(names = {"-i","--includes"},split=",", description = "The files of searching path")
     private String[] includes = new String[] {};
+	@Option(names = {"--exclude"},split=",", description = "Exclude files/directories matching path patterns")
+	private String[] excludes = new String[] {};
 	@Option(names = {"--auto-include"},split=",", description = "auto include all paths under the source path (please notice the potential side effect)")
 	private boolean autoInclude = false;
 	@Option(names = {"--detail"},split=",", description = "add detail dependency information to output (only applicable for JSON output format)")
@@ -119,6 +121,9 @@ public boolean isDv8map() {
 	public String[] getIncludes() {
 		return includes;
 	}
+	public String[] getExcludes() {
+		return excludes;
+	}
 	public boolean isHelp() {
 		return help;
 	}

src/main/java/depends/Main.java

@@ -99,6 +99,7 @@ private static void executeCommand(DependsCommand args) throws ParameterExceptio
 		String lang = args.getLang();
 		String inputDir = args.getSrc();
 		String[] includeDir = args.getIncludes();
+		String[] excludes = args.getExcludes();
 		String outputName = args.getOutputName();
 		String outputDir = args.getOutputDir();
 		String[] outputFormat = args.getFormat();
@@ -119,7 +120,7 @@ private static void executeCommand(DependsCommand args) throws ParameterExceptio
 
 		long startTime = System.currentTimeMillis();
 		//step1: build data
-		EntityRepo entityRepo = langProcessor.buildDependencies(inputDir, includeDir, bindingResolver);
+		EntityRepo entityRepo = langProcessor.buildDependencies(inputDir, includeDir, excludes, bindingResolver);
 
 		new RelationCounter(entityRepo,langProcessor, bindingResolver).computeRelations();
 		System.out.println("Dependency done....");

src/main/java/depends/extractor/AbstractLangProcessor.java

@@ -87,6 +87,7 @@ abstract public class AbstractLangProcessor {
 	protected EntityRepo entityRepo;
 	protected String inputSrcPath;
 	public String[] includeDirs;
+	private String[] excludes;
 	private Set<UnsolvedBindings> potentialExternalDependencies;
 	private List<String> includePaths;
 	private static Logger logger = LoggerFactory.getLogger(AbstractLangProcessor.class);
@@ -106,8 +107,13 @@ public AbstractLangProcessor() {
 	 * @return
 	 */
 	public EntityRepo buildDependencies(String inputDir, String[] includeDir, IBindingResolver bindingResolver) {
+		return buildDependencies(inputDir, includeDir, new String[]{}, bindingResolver);
+	}
+
+	public EntityRepo buildDependencies(String inputDir, String[] includeDir, String[] excludes, IBindingResolver bindingResolver) {
 		this.inputSrcPath = inputDir;
 		this.includeDirs = includeDir;
+		this.excludes = excludes;
 		this.bindingResolver = bindingResolver;
 		logger.info("Start parsing files...");
 		parseAllFiles();
@@ -166,6 +172,9 @@ public void visit(File file) {
 
 		});
 		fileTransversal.extensionFilter(this.fileSuffixes());
+		if (this.excludes != null && this.excludes.length > 0) {
+			fileTransversal.excludeFilter(this.excludes);
+		}
 		fileTransversal.travers(this.inputSrcPath);
 		for (String f : phase2Files) {
 			parseFile(f, phase2Files);

src/main/java/depends/extractor/python/union/PythonCodeListener.java

@@ -68,11 +68,30 @@ public void enterImport_stmt(Import_stmtContext ctx) {
 			}
 			List<String> fullNames = sureImportedModulesParsed(0,moduleName,null);
 
+			// Find the main entity for this import (the package or main module)
+			Entity mainEntity = null;
+			String mainFullName = null;
 			for (String fullName:fullNames) {
 				if (FileUtil.existFile(fullName) && !(FileUtil.isDirectory(fullName))) {
 					context.foundNewImport(new FileImport(fullName));
 				}
-				context.foundNewImport(new NameAliasImport(fullName, entityRepo.getEntity(fullName), aliasName));
+				Entity importedEntity = entityRepo.getEntity(fullName);
+				// If this is the __init__.py file, use the package entity instead
+				if (fullName.endsWith(PythonBuiltInType.PACKAGE_PY_NAME) && importedEntity != null) {
+					Entity parent = importedEntity.getParent();
+					if (parent != null) {
+						mainEntity = parent;
+						mainFullName = parent.getRawName().uniqName();
+					}
+				} else if (mainEntity == null && importedEntity != null) {
+					// For non-package imports, use the first file as main entity
+					mainEntity = importedEntity;
+					mainFullName = fullName;
+				}
+			}
+			// Create only ONE NameAliasImport for the main entity
+			if (mainEntity != null) {
+				context.foundNewImport(new NameAliasImport(mainFullName, mainEntity, aliasName));
 			}
 		}
 		super.enterImport_stmt(ctx);
@@ -220,7 +239,9 @@ private List<String> visitIncludedFile(String fullName) {
 				}
 			}
 			if (FileUtil.existFile(fullName+File.separator + PythonBuiltInType.PACKAGE_PY_NAME)) {
-				visitedFiles.add( fullName+File.separator +PythonBuiltInType.PACKAGE_PY_NAME);
+				String initFile = fullName+File.separator +PythonBuiltInType.PACKAGE_PY_NAME;
+				invokeParser(initFile);
+				visitedFiles.add(initFile);
 			}
 		}else{
 			invokeParser(fullName);