update ui

4sval · Jul 29, 2024 · fabc064 · fabc064
1 parent 19c2eb9
commit fabc064
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -152,7 +152,7 @@
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="CSCore" Version="1.2.1.2" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
-    <PackageReference Include="EpicManifestParser" Version="2.3.0" />
+    <PackageReference Include="EpicManifestParser" Version="2.3.1" />
     <PackageReference Include="ImGui.NET" Version="1.90.8.1" />
     <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -847,7 +847,7 @@ public void ExtractAndScroll(CancellationToken cancellationToken, string fullPat
             case UAnimMontage when HasFlag(bulk, EBulkType.Animations):
             case UAnimComposite when HasFlag(bulk, EBulkType.Animations):
             {
-                SaveExport(export, HasFlag(bulk, EBulkType.Auto));
+                SaveExport(export, updateUi);
                 return true;
             }
             default:
@@ -893,29 +893,21 @@ private void SaveAndPlaySound(string fullPath, string ext, byte[] data)
         });
     }
 
-    private void SaveExport(UObject export, bool auto)
+    private void SaveExport(UObject export, bool updateUi = true)
     {
         var toSave = new Exporter(export, UserSettings.Default.ExportOptions);
-
-        string dir;
-        if (!auto)
-        {
-            var folderBrowser = new VistaFolderBrowserDialog();
-            if (folderBrowser.ShowDialog() == true)
-                dir = folderBrowser.SelectedPath;
-            else return;
-        }
-        else dir = UserSettings.Default.ModelDirectory;
-
-        var toSaveDirectory = new DirectoryInfo(dir);
+        var toSaveDirectory = new DirectoryInfo(UserSettings.Default.ModelDirectory);
         if (toSave.TryWriteToDir(toSaveDirectory, out var label, out var savedFilePath))
         {
             Log.Information("Successfully saved {FilePath}", savedFilePath);
-            FLogger.Append(ELog.Information, () =>
+            if (updateUi)
             {
-                FLogger.Text("Successfully saved ", Constants.WHITE);
-                FLogger.Link(label, savedFilePath, true);
-            });
+                FLogger.Append(ELog.Information, () =>
+                {
+                    FLogger.Text("Successfully saved ", Constants.WHITE);
+                    FLogger.Link(label, savedFilePath, true);
+                });
+            }
         }
         else
         {

diff --git a/FModel/ViewModels/Commands/RightClickMenuCommand.cs b/FModel/ViewModels/Commands/RightClickMenuCommand.cs
@@ -22,6 +22,7 @@ public override async void Execute(ApplicationViewModel contextViewModel, object
         var assetItems = ((IList) parameters[1]).Cast<AssetItem>().ToArray();
         if (!assetItems.Any()) return;
 
+        var updateUi = assetItems.Length > 1 ? EBulkType.Auto : EBulkType.None;
         await _threadWorkerView.Begin(cancellationToken =>
         {
             switch (trigger)
@@ -47,31 +48,31 @@ await _threadWorkerView.Begin(cancellationToken =>
                     {
                         Thread.Yield();
                         cancellationToken.ThrowIfCancellationRequested();
-                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Properties);
+                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Properties | updateUi);
                     }
                     break;
                 case "Assets_Save_Textures":
                     foreach (var asset in assetItems)
                     {
                         Thread.Yield();
                         cancellationToken.ThrowIfCancellationRequested();
-                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Textures);
+                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Textures | updateUi);
                     }
                     break;
                 case "Assets_Save_Models":
                     foreach (var asset in assetItems)
                     {
                         Thread.Yield();
                         cancellationToken.ThrowIfCancellationRequested();
-                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Meshes | EBulkType.Auto);
+                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Meshes | updateUi);
                     }
                     break;
                 case "Assets_Save_Animations":
                     foreach (var asset in assetItems)
                     {
                         Thread.Yield();
                         cancellationToken.ThrowIfCancellationRequested();
-                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Animations | EBulkType.Auto);
+                        contextViewModel.CUE4Parse.Extract(cancellationToken, asset.FullPath, false, EBulkType.Animations | updateUi);
                     }
                     break;
             }