Added a new argument placeholder, renamed filter to package-filter

filters/dagger-butterknife.json

@@ -0,0 +1 @@
+["Dagger", "Injector", ".*\\$_ViewBinding$"]

filters/instructions.txt

@@ -0,0 +1,7 @@
+'dagger-butterknife.json' is a default filterset that is shipped with the releases.
+It filters Dagger and ButterKnife classes.
+
+The file contains json array of RegExps.
+You may extend this array of create a set of your own filter files similar to this one.
+
+Read Usage part of Readme for the details.

src/code/SmaliAnalyzer.java

@@ -33,9 +33,9 @@ public Map<String, Set<String>> getDependencies() {
 	}
 
 	public boolean run() {
-		String filter = arguments.getFilter();
+		String filter = arguments.getPackageFilter();
 		if (filter == null) {
-			System.err.println("Please check your filter!");
+			System.err.println("Please check your package filter!");
 			return false;
 		}
 
@@ -109,7 +109,7 @@ private void processSmaliFile(File file) {
 
 					// filtering
 					for (String fullClassName : classNames) {
-						if (fullClassName != null && isFilterOk(fullClassName)) {
+						if (fullClassName != null && areFiltersOk(fullClassName)) {
 							String simpleClassName = getClassSimpleName(fullClassName);
 							if (isClassOk(simpleClassName, fileName)) {
 								dependencyNames.add(simpleClassName);
@@ -198,8 +198,10 @@ private int getEndGenericIndex(String line, int startGenericIndex) {
 		return endIndex;
 	}
 
-	private boolean isFilterOk(String className) {
-		return arguments.getFilter() == null || className.startsWith(arguments.getFilter().replaceAll("\\.", "/"));
+	private boolean areFiltersOk(String className) {
+		boolean packageFilterIsOk = arguments.getPackageFilter() == null || 
+			className.startsWith(arguments.getPackageFilter().replaceAll("\\.", "/"));
+		return packageFilterIsOk;
 	}
 
 	private void addDependencies(String className, Set<String> dependenciesList) {

src/code/UserFilters.java

@@ -0,0 +1,14 @@
+package code;
+
+public class UserFilters {
+
+    List<String> regex = new ArrayList<>();
+
+    public UserFilters(List<String> regex) {
+        this.regex.addAll(regex);
+    }
+
+    public boolean isClassOk(String className) {
+        return true;
+    }
+}

src/code/io/ArgumentReader.java

@@ -4,12 +4,20 @@
 
 public class ArgumentReader {
 
+	private static final ARG_PROJ = "-i";
+	private static final ARG_RES_JS = "-o";
+	private static final ARG_PACK_F = "-pf";
+	private static final ARG_FILTER = "-f";
+	private static final ARG_INNER = "-d";
+	private static final ARG_APK = "-a";
+
 	private static final String USAGE_STRING = "Usage:\n" +
-			"-i path : path to the decompiled project\n" +
-			"-o path : path to the result js file\n" +
-			"-f filter : java package to filter by (to show all dependencies pass '-f nofilter')\n" +
-			"-d boolean : if true it will contain inner class processing (the ones creating ClassName$InnerClass files)\n" +
-            "-a path : path to the apk file";
+			ARG_PROJ + " path : path to the decompiled project\n" +
+			ARG_RES_JS + " path : path to the result js file\n" +
+			ARG_PACK_F + " package-filter : java package to filter by (to show all dependencies pass '-f nofilter')\n" +
+			ARG_FILTER + " filters : json filterset file(s) (can be comma-separated)\n"
+			ARG_INNER + " boolean : if true it will contain inner class processing (the ones creating ClassName$InnerClass files)\n" +
+			ARG_APK + " path : path to the apk file";
 
 	private String[] args;
 
@@ -18,31 +26,31 @@ public ArgumentReader(String[] args) {
 	}
 
 	public Arguments read() {
-		String projectPath = null, resultPath = null, filter = null;
+		String projectPath = null, resultPath = null, packageFilter = null;
         String apkPath = null;
 		boolean withInnerClasses = false;
 		for (int i = 0; i < args.length; i++) {
 			if (i < args.length - 1) {
-				if (args[i].equals("-i")) {
+				if (args[i].equals(ARG_PROJ)) {
 					projectPath = args[i + 1];
-				} else if (args[i].equals("-o")) {
+				} else if (args[i].equals(ARG_RES_JS)) {
 					resultPath = args[i + 1];
-				} else if (args[i].equals("-f")) {
-					filter = args[i + 1];
-				} else if (args[i].equals("-d")) {
+				} else if (args[i].equals(ARG_PACK_F)) {
+					packageFilter = args[i + 1];
+				} else if (args[i].equals(ARG_INNER)) {
 					withInnerClasses = Boolean.valueOf(args[i + 1]);
-				} else if (args[i].equals("-a")) {
+				} else if (args[i].equals(ARG_APK)) {
                     apkPath = args[i + 1];
                 }
 			}
 		}
-		if (projectPath == null || resultPath == null || filter == null ||
+		if (projectPath == null || resultPath == null || packageFilter == null ||
                 apkPath == null) {
 			System.err.println("Arguments are incorrect!");
 			System.err.println(USAGE_STRING);
 			return null;
 		}
-		if (filter.equals("nofilter")) {
+		if (packageFilter.equals("nofilter")) {
 			filter = null;
 			System.out.println("Warning! Processing without filter.");
 		}
@@ -57,6 +65,6 @@ public Arguments read() {
         }
 
         return new Arguments(
-                apkPath, projectPath, resultPath, filter, withInnerClasses);
+                apkPath, projectPath, resultPath, packageFilter, withInnerClasses);
 	}
 }

src/code/io/Arguments.java

@@ -4,16 +4,16 @@ public class Arguments {
     private String apkFilePath;
     private String projectPath;
     private String resultPath;
-    private String filter;
+    private String packageFilter;
     private boolean withInnerClasses;
 
     public Arguments(String apkPath, String projectPath, String resultPath,
-            String filter, boolean withInnerClasses) {
+            String packageFilter, boolean withInnerClasses) {
         super();
         this.apkFilePath = apkPath;
         this.projectPath = projectPath;
         this.resultPath = resultPath;
-        this.filter = filter;
+        this.packageFilter = packageFilter;
         this.withInnerClasses = withInnerClasses;
     }
     public String getProjectPath() {
@@ -28,11 +28,11 @@ public String getResultPath() {
     public void setResultPath(String resultPath) {
         this.resultPath = resultPath;
     }
-    public String getFilter() {
-        return filter;
+    public String getPackageFilter() {
+        return packageFilter;
     }
-    public void setFilter(String filter) {
-        this.filter = filter;
+    public void setPackageFilter(String packageFilter) {
+        this.packageFilter = packageFilter;
     }
     public boolean withInnerClasses() {
         return withInnerClasses;