Merge pull request #53 from patrick-premont/zap-anything

Modified Zap so that it removes matched resources
eed3si9n · Feb 26, 2024 · 38ed500 · 38ed500
2 parents ad175de + 986d33d
commit 38ed500
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/jarjar/src/main/java/com/eed3si9n/jarjar/ZapProcessor.java b/jarjar/src/main/java/com/eed3si9n/jarjar/ZapProcessor.java
@@ -30,9 +30,20 @@ public ZapProcessor(List<Zap> zapList) {
 
     public boolean process(EntryStruct struct) throws IOException {
         String name = struct.name;
-        if (name.endsWith(".class"))
-            return !zap(name.substring(0, name.length() - 6));
-        return true;
+        String matchName = name.endsWith(".class") ?
+                name.substring(0, name.length() - 6) :
+                replaceResourceName(name);
+        return !zap(matchName);
+    }
+
+    private static final String RESOURCE_SUFFIX = "RESOURCE";
+
+    private static String replaceResourceName(String name) {
+        int slash = name.lastIndexOf('/');
+
+        String s = (slash < 0) ? RESOURCE_SUFFIX : name.substring(0, slash + 1) + RESOURCE_SUFFIX;
+        boolean absolute = s.startsWith("/");
+        return absolute ? s.substring(1) : s;
     }
 
     private boolean zap(String desc) {

diff --git a/jarjar/src/test/java/com/eed3si9n/jarjar/ZapProcessorTest.java b/jarjar/src/test/java/com/eed3si9n/jarjar/ZapProcessorTest.java
@@ -22,6 +22,12 @@ public void testZap() throws IOException {
 
     entryStruct.name = "com/example/Object.class";
     assertTrue(zapProcessor.process(entryStruct));
+
+    entryStruct.name = "org/file.txt";
+    assertFalse(zapProcessor.process(entryStruct));
+
+    entryStruct.name = "com/file.txt";
+    assertTrue(zapProcessor.process(entryStruct));
   }
 
   @Test