Refactor: ghidra_script OverlayReduxSymbols Extract methods

Author: acemon33

tools/ghidra_scripts/OverlayReduxSymbols.java

@@ -1,6 +1,6 @@
 // Exports symbols to PCSX-Redux's symbols map including Overlays filtering
+//@author Nicolas "Pixel" Noble
 //@author acemon33
-//@category PSX
 
 import ghidra.app.script.GhidraScript;
 import ghidra.program.model.symbol.*;
@@ -12,15 +12,12 @@
 import java.net.http.HttpResponse;
 import java.util.*;
 
-public class OverlayReduxSymbols extends GhidraScript {
+public class PsxOverlayReduxSymbols extends GhidraScript {
 
     public void run() throws Exception {
-        MemoryBlock[] MemoryBlockList = state.getCurrentProgram().getMemory().getBlocks();
-        List<String> choices = new ArrayList();
-        for (int i = 0; i < MemoryBlockList.length; i++) { if (MemoryBlockList[i].isOverlay()) choices.add(MemoryBlockList[i].getName()); }
-        List<String> filterList = askChoices("Title", "Message", choices);
-        List<String> choiceList = new ArrayList();
-        for (String e : choices) { choiceList.add(e + "::"); choiceList.add(e + "__"); }
+        List<String> options = this.getMemoryBlockOptions();
+        List<String> filterList = askChoices("Title", "Message", options);
+        List<String> choiceList = this.getOptionList(options);
 
         List<String> symbols = new ArrayList<String>();
         SymbolTable st = state.getCurrentProgram().getSymbolTable();
@@ -31,15 +28,28 @@ public void run() throws Exception {
             String name = sym.getName(true);
 
             boolean hasFilter = true;
-            for (String s : filterList) { if (add.toString().contains(s)) { hasFilter = false; break; } }
+            for (String s : filterList) {
+                if (add.toString().contains(s)) {
+                    hasFilter = false;
+                    break;
+                }
+            }
             if (hasFilter)
             {
                 boolean isNext = false;
-                for (String s : choiceList) { if (add.toString().contains(s)) { isNext = true; break; } }
-                if (isNext) continue;
+                for (String s : choiceList) {
+                    if (add.toString().contains(s)) {
+                        isNext = true;
+                        break;
+                    }
+                }
+                if (isNext)
+                    continue;
             }
 
             symbols.add(String.format("%08x %s", add.getOffset(), name));
+            // symbols.add(String.format("%s %s", add, name));
+            // println(String.format("%s %s", add, name));
         }
 
         HttpClient client = HttpClient.newHttpClient();
@@ -50,6 +60,26 @@ public void run() throws Exception {
 
         client.send(request, HttpResponse.BodyHandlers.ofString());
 
+        // for (String address : symbols) println(address);
         println("size: " + symbols.size());
     }
+
+    private List<String> getMemoryBlockOptions() {
+        MemoryBlock[] MemoryBlockList = state.getCurrentProgram().getMemory().getBlocks();
+        List<String> options = new ArrayList();
+        for (int i = 0; i < MemoryBlockList.length; i++) {
+            if (MemoryBlockList[i].isOverlay())
+                options.add(MemoryBlockList[i].getName());
+        }
+        return options;
+    }
+
+    private List<String> getOptionList(List<String> options) {
+        List<String> resultList = new ArrayList();
+        for (String e : options) {
+            resultList.add(e + "::");
+            resultList.add(e + "__");
+            }
+        return resultList;
+    }
 }