Merge pull request #388 from cclgroupltd/master

Attempt to get iTunesBackupInfo to work with new plugin format
abrignoni · Oct 27, 2022 · 9ba15aa · 9ba15aa
2 parents b361ce1 + 41934dd
commit 9ba15aa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/ileapp.py b/ileapp.py
@@ -86,11 +86,12 @@ def main():
 
         out_params = OutputParameters(output_path)
 
-        crunch_artifacts(list(loader.plugins), extracttype, input_path, out_params, 1, wrap_text)
+        crunch_artifacts(list(loader.plugins), extracttype, input_path, out_params, 1, wrap_text, loader)
 
 
 def crunch_artifacts(
-        plugins: typing.Sequence[plugin_loader.PluginSpec], extracttype, input_path, out_params, ratio, wrap_text):
+        plugins: typing.Sequence[plugin_loader.PluginSpec], extracttype, input_path, out_params, ratio, wrap_text,
+        loader: plugin_loader.PluginLoader):
     start = process_time()
     start_wall = perf_counter()
 
@@ -143,9 +144,10 @@ def crunch_artifacts(
         info_plist_path = os.path.join(input_path, 'Info.plist')
         if os.path.exists(info_plist_path):
             # process_artifact([info_plist_path], 'iTunesBackupInfo', 'Device Info', seeker, out_params.report_folder_base)
-            plugin.method([info_plist_path], out_params.report_folder_base, seeker, wrap_text)
+            #plugin.method([info_plist_path], out_params.report_folder_base, seeker, wrap_text)
+            loader["iTunesBackupInfo"].method([info_plist_path], out_params.report_folder_base, seeker, wrap_text)
             #del search_list['lastBuild'] # removing lastBuild as this takes its place
-            print([info_plist_path]) # TODO Remove special consideration for itunes? Merge into main search
+            print([info_plist_path])  # TODO Remove special consideration for itunes? Merge into main search
         else:
             logfunc('Info.plist not found for iTunes Backup!')
             log.write('Info.plist not found for iTunes Backup!')

diff --git a/ileappGUI.py b/ileappGUI.py
@@ -217,7 +217,7 @@ def pickModules():
             out_params = OutputParameters(output_folder)
             wrap_text = True
             crunch_successful = ileapp.crunch_artifacts(
-                search_list, extracttype, input_path, out_params, len(loader)/s_items, wrap_text)
+                search_list, extracttype, input_path, out_params, len(loader)/s_items, wrap_text, loader)
             if crunch_successful:
                 report_path = os.path.join(out_params.report_folder_base, 'index.html')
 

diff --git a/scripts/artifacts/lastBuild.py b/scripts/artifacts/lastBuild.py
@@ -74,5 +74,9 @@ def get_iTunesBackupInfo(files_found, report_folder, seeker, wrap_text):
     "lastbuild": (
         "IOS Build",
         ('*LastBuildInfo.plist'),
-        get_lastBuild)
-}
+        get_lastBuild),
+    "iTunesBackupInfo": (
+        "IOS Build (iTunes Backup)",
+        ('*LastBuildInfo.plist'),
+        get_iTunesBackupInfo)
+}