Improve dup location and fix duplicate binary bug.

Dockerfile

@@ -27,7 +27,7 @@ RUN unzip ghidrathon/Ghidrathon-v4.0.0.zip -d /ghidra/Ghidra/Extensions
 
 WORKDIR /
 
-RUN git clone -b main https://github.com/edmcman/DIRTY # 09-23-24
+RUN git clone -b main https://github.com/edmcman/DIRTY # 09-25-24
 #ADD ./DIRTY /DIRTY
 
 RUN --mount=type=cache,target=/root/.cache pip install --upgrade -r /DIRTY/requirements.txt

main.py

@@ -24,14 +24,23 @@ def get_functions(file):
 
     with tempfile.TemporaryDirectory() as TEMP_DIR:
 
+        # First import the file
         o = subprocess.run(
-            f"/ghidra/support/analyzeHeadless {GHIDRA_PROJECT_DIR} {file_hash} -import {file} -postscript /home/user/app/scripts/dump_functions.py {TEMP_DIR}/funcs.json 2>&1",
+            f"/ghidra/support/analyzeHeadless {GHIDRA_PROJECT_DIR} {file_hash} -import {file}  2>&1",
             shell=True,
             capture_output=True,
             encoding="utf8"
             )
         if o.returncode != 0:
-            raise gr.Error(f"Unable to run Ghidra on {file}: {o.stdout}")
+            if not "Found conflicting program file in project:" in o.stdout:
+                raise gr.Error(f"Unable to run Ghidra on {file}: {o.stdout}")
+
+        o = subprocess.run(
+            f"/ghidra/support/analyzeHeadless {GHIDRA_PROJECT_DIR} {file_hash} -process -postscript /home/user/app/scripts/dump_functions.py {TEMP_DIR}/funcs.json 2>&1",
+            shell=True,
+            capture_output=True,
+            encoding="utf8"
+            )
 
         if not os.path.exists(f"{TEMP_DIR}/funcs.json"):
                 raise gr.Error(f"DIRTY Ghidra failed to produce output: {o.stdout}")