Improved multifile support

Author: overmet15

Localizations/en_US.json

@@ -115,7 +115,7 @@
     "menu_export_selected_type": "Export all Files of Selected Type",
     "menu_file": "File",
     "menu_file_exit": "Exit",
-    "menu_file_open_file": "Open File",
+    "menu_file_open_file": "Open File(s)",
     "menu_file_open_folder": "Open Folder",
     "menu_file_reset": "Reset",
     "menu_language": "Language",

Localizations/ru.json

@@ -112,7 +112,7 @@
     "menu_export_selected_type": "Экспортировать Файлы Выбранного Типа",
     "menu_file": "Файл",
     "menu_file_exit": "Выйти",
-    "menu_file_open_file": "Открыть файл",
+    "menu_file_open_file": "Открыть файл(ы)",
     "menu_file_open_folder": "Открыть папку",
     "menu_file_reset": "Сбросить",
     "menu_language": "Язык",

Source/AssetRipper.GUI/MainWindow.ViewModel.cs

@@ -175,32 +175,44 @@ public void OnFileDropped(DragEventArgs e)
 
 		private void DoLoadArchives(string[]? filesDropped)
 		{
-			if (!Directory.Exists("temp"))
-			{
-				Directory.CreateDirectory("temp");
-			}
-
-			string path = "temp/ZIP_COMBINE_" + DateTime.Now.ToString("yyyyMMddHHmm");
-
 			if (filesDropped == null || filesDropped.Length < 1)
 			{
 				return;
 			}
 
-			try
+			new Thread(() =>
 			{
-				foreach(string v in filesDropped)
+				string path = "temp/ZIP_COMBINE_" + DateTime.Now.ToString("yyyyMMddHHmm");
+
+				try
 				{
-					Logger.Log(LogType.Info, LogCategory.Import, $"Unzipping '{v}'");
-					ZipFile.ExtractToDirectory(v, path, true);
-				}
+					foreach (string v in filesDropped)
+					{
+						Logger.Log(LogType.Info, LogCategory.Import, $"Decompressing '{v}'");
 
-				DoLoad([path]);
-			}
-			catch (Exception ex)
+						if (!File.Exists(v))
+						{
+							Logger.Log(LogType.Error, LogCategory.Import, $"File '{v}' does not exist.");
+							throw new Exception($"File '{v}' does not exist. Have you tried importing multiple folders?");
+						}
+
+						LoadingText = "Decompressing " + v;
+
+						ZipFile.ExtractToDirectory(v, path, true);
+					}
+
+					DoLoad([path]);
+				}
+				catch (Exception ex)
+				{
+					LoadingText = string.Empty;
+					this.ShowPopup($"Exception on combining archives: {ex.Message}", MainWindow.Instance.LocalizationManager["error"]);
+				}
+			})
 			{
-				this.ShowPopup($"Exception on combining archives: {ex.Message}", MainWindow.Instance.LocalizationManager["error"]);
-			}
+				IsBackground = true,
+				Name = "Background Decompressing Thread"
+			}.Start();
 		}
 
 		private void DoLoad(string[]? filesDropped)
@@ -210,13 +222,20 @@ private void DoLoad(string[]? filesDropped)
 				return;
 			}
 
+			// multi zip support
+			if (filesDropped.Length > 1)
+			{
+				DoLoadArchives(filesDropped);
+				return;
+			}
+
+			string gamePath = filesDropped[0];
+
 			_ripper.ResetData();
 			SelectedAsset?.Dispose();
 			SelectedAsset = null;
 			_assetContainer = null;
 
-			string gamePath = filesDropped[0];
-
 			HasFile = true;
 			HasLoaded = false;
 			Dispatcher.UIThread.Post(() => AssetFiles.Clear(), DispatcherPriority.Send);
@@ -435,22 +454,6 @@ public async void ShowOpenFileDialog()
 			}
 		}
 
-		//Called from UI
-		public async void ShowOpenFileDialogZipArchives()
-		{
-			FilePickerOpenOptions options = new() { AllowMultiple = true };
-			IReadOnlyList<IStorageFile> fileList = await MainWindow.Instance.StorageProvider.OpenFilePickerAsync(options);
-
-			string[] result = fileList.Select(f => f.Path.LocalPath)
-				.Where(s => !string.IsNullOrEmpty(s))
-				.ToArray();
-
-			if (result.Length > 0)
-			{
-				DoLoadArchives(result);
-			}
-		}
-
 		//Called from UI
 		public async void ShowOpenFolderDialog()
 		{

Source/AssetRipper.GUI/MainWindow.axaml

@@ -39,7 +39,7 @@
                 <!--File Menu-->
                 <MenuItem Header="{i18n:Localize menu_file}">
 
-                    <!--File->Open File-->
+                    <!--File->Open File(s)-->
                     <MenuItem Header="{i18n:Localize menu_file_open_file}" Command="{Binding ShowOpenFileDialog}">
                         <MenuItem.IsEnabled>
                             <MultiBinding Converter="{x:Static BoolConverters.And}">
@@ -65,19 +65,6 @@
                         </MenuItem.IsEnabled>
                     </MenuItem>
 
-					<!--File->Import Multiple (Zip Archives)-->
-					<MenuItem Header="Import Multiple (Zip Archives)" Command="{Binding ShowOpenFileDialogZipArchives}">
-						<MenuItem.IsEnabled>
-							<MultiBinding Converter="{x:Static BoolConverters.And}">
-								<Binding Path="!IsExporting" />
-								<MultiBinding Converter="{x:Static BoolConverters.Or}">
-									<Binding Path="!HasFile" />
-									<Binding Path="HasLoaded" />
-								</MultiBinding>
-							</MultiBinding>
-						</MenuItem.IsEnabled>
-					</MenuItem>
-
 
 					<MenuItem Header="{i18n:Localize menu_file_reset}" Command="{Binding Reset}">
                         <MenuItem.IsEnabled>

Source/AssetRipper.GUI/MainWindow.axaml.cs

@@ -33,6 +33,8 @@ public MainWindow()
 #endif
 
 			AddHandler(DragDrop.DropEvent, (sender, args) => VM.OnFileDropped(args));
+
+			VM.ShaderExportMode = Export.UnityProjects.Configuration.ShaderExportMode.Decompile;
 		}
 
 		protected override void OnDataContextChanged(EventArgs e)

build-and-run.cmd

@@ -0,0 +1 @@
+dotnet build