[DEX] Adopt smali file name factory from JesusFreke/smali

Author: REAndroid

src/main/java/com/reandroid/dex/id/ClassId.java

@@ -502,12 +502,12 @@ public SmaliClass toSmali() {
 
     @Override
     public void append(SmaliWriter writer) throws IOException {
+        ClassData classData = getClassData();
         getClassTypeId().append(writer);
         getSuperClassId().append(writer);
         getSourceFileReference().append(writer);
         getInterfacesKey().appendInterfaces(writer);
         getAnnotation().appendClass(writer);
-        ClassData classData = getClassData();
         if (classData != null) {
             writer.newLine();
             classData.append(writer);

src/main/java/com/reandroid/dex/model/DexClass.java

@@ -45,7 +45,6 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.HashSet;
@@ -601,7 +600,6 @@ public int compareTo(DexClass dexClass) {
     }
     @Override
     public void append(SmaliWriter writer) throws IOException {
-        getClassData();
         getId().append(writer);
     }
 
@@ -647,11 +645,8 @@ public DexField parseInterfaces(SmaliReader reader) throws IOException {
         dexField.getDefinition().fromSmali(smaliField);
         return dexField;
     }
-    public void writeSmali(SmaliWriter writer, File dir) throws IOException {
-        File file = writer.getFileNameFactory().toFile(dir, getKey());
-        FileUtil.ensureParentDirectory(file);
-        FileWriter fileWriter = new FileWriter(file);
-        writer.setWriter(fileWriter);
+    public void writeSmali(SmaliWriter writer, File file) throws IOException {
+        writer.setWriter(file);
         append(writer);
         writer.close();
     }

src/main/java/com/reandroid/dex/model/DexDirectory.java

@@ -33,6 +33,7 @@
 import com.reandroid.dex.sections.SectionArray;
 import com.reandroid.dex.sections.SectionType;
 import com.reandroid.dex.smali.SmaliWriter;
+import com.reandroid.dex.smali.SmaliWriterSetting;
 import com.reandroid.utils.collection.ArrayCollection;
 import com.reandroid.utils.collection.CollectionUtil;
 import com.reandroid.utils.collection.EmptyList;
@@ -669,6 +670,12 @@ public void writeSmali(SmaliWriter writer, File root) throws IOException {
             dexFile.writeSmali(writer, root);
         }
     }
+    public void writeSmali(SmaliWriterSetting writerSetting, File root) throws IOException {
+        for (DexFile dexFile : this) {
+            File dir = new File(root, dexFile.buildSmaliDirectoryName());
+            dexFile.writeSmali(writerSetting, dir);
+        }
+    }
 
     @Override
     public String toString() {

src/main/java/com/reandroid/dex/model/DexFile.java

@@ -19,6 +19,7 @@
 import com.reandroid.dex.id.ClassId;
 import com.reandroid.dex.sections.*;
 import com.reandroid.dex.smali.SmaliWriter;
+import com.reandroid.dex.smali.SmaliWriterSetting;
 import com.reandroid.utils.CompareUtil;
 import com.reandroid.utils.ObjectsUtil;
 import com.reandroid.utils.collection.ArrayCollection;
@@ -293,14 +294,33 @@ public void writeSmali(SmaliWriter writer, File root) throws IOException {
             }
         } else {
             int size = size();
-            for(int i = 0; i < size; i++) {
+            for (int i = 0; i < size; i++) {
                 DexLayout dexLayout = getLayout(i);
                 String name = DexLayout.DIRECTORY_PREFIX + i;
                 File dir = new File(root, name);
                 dexLayout.writeSmali(writer, dir);
             }
         }
     }
+    public void writeSmali(SmaliWriterSetting writerSetting, File root) throws IOException {
+        requireNotClosed();
+        DexFileInfo fileInfo = DexFileInfo.fromDex(this);
+        fileInfo.saveToDirectory(root);
+        if (!isMultiLayout()) {
+            DexLayout first = getFirst();
+            if (first != null) {
+                first.writeSmali(writerSetting, root);
+            }
+        } else {
+            int size = size();
+            for (int i = 0; i < size; i++) {
+                DexLayout dexLayout = getLayout(i);
+                String name = DexLayout.DIRECTORY_PREFIX + i;
+                File dir = new File(root, name);
+                dexLayout.writeSmali(writerSetting, dir);
+            }
+        }
+    }
 
     private List<File> listSmaliLayouts(File dir) {
         File[] files = dir.listFiles();

src/main/java/com/reandroid/dex/model/DexLayout.java

@@ -25,8 +25,10 @@
 import com.reandroid.dex.key.Key;
 import com.reandroid.dex.key.TypeKey;
 import com.reandroid.dex.sections.*;
+import com.reandroid.dex.smali.SmaliFileNameFactory;
 import com.reandroid.dex.smali.SmaliReader;
 import com.reandroid.dex.smali.SmaliWriter;
+import com.reandroid.dex.smali.SmaliWriterSetting;
 import com.reandroid.dex.smali.model.SmaliClass;
 import com.reandroid.utils.ObjectsUtil;
 import com.reandroid.utils.collection.*;
@@ -330,9 +332,25 @@ public DexClass fromSmali(SmaliClass smaliClass) throws IOException {
         return create(classId);
     }
     public void writeSmali(SmaliWriter writer, File root) throws IOException {
-        Iterator<DexClass> iterator = getDexClasses();
+        SmaliFileNameFactory fileNameFactory = new SmaliFileNameFactory(root);
+        Iterator<ClassId> iterator = getItems(SectionType.CLASS_ID);
         while (iterator.hasNext()) {
-            iterator.next().writeSmali(writer, root);
+            ClassId classId = iterator.next();
+            File file = fileNameFactory.getUniqueFilenameForClass(classId.getKey());
+            writer.setWriter(file);
+            classId.append(writer);
+            writer.close();
+        }
+    }
+    public void writeSmali(SmaliWriterSetting writerSetting, File root) throws IOException {
+        SmaliFileNameFactory fileNameFactory = new SmaliFileNameFactory(root);
+        Iterator<ClassId> iterator = getItems(SectionType.CLASS_ID);
+        while (iterator.hasNext()) {
+            ClassId classId = iterator.next();
+            SmaliWriter writer = new SmaliWriter(writerSetting);
+            writer.setWriter(fileNameFactory.getUniqueFilenameForClass(classId.getKey()));
+            classId.append(writer);
+            writer.close();
         }
     }