Skip to content

Resolved Exporting Slowdown #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Krowe-moh wants to merge 15 commits into
base: dev
Choose a base branch
from
Open

Resolved Exporting Slowdown #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6327f1b
Search for Shipping exe within Engine folder
Krowe-moh Apr 2, 2026
9f298c5
Prevent Export logs on Search menu extracts
Krowe-moh Apr 2, 2026
bb41727
Update SearchView.xaml
Chompster86 Feb 23, 2026
ee3af84
Update TabCommand.cs
Chompster86 Feb 23, 2026
879063c
Update Resources.xaml
Chompster86 Feb 23, 2026
f210601
Clear _waveSource and PlayedFile if last file was removed
ScrubN Dec 31, 2023
749790b
Stop playback if removed file was currently playing file
ScrubN Dec 31, 2023
cbc580c
Add 'X' hotkey for removing selected audio from the playlist
ScrubN Dec 31, 2023
d33dc95
Fixed Both in one
Krowe-moh Apr 4, 2026
d159aa4
Bump CUE4parse
Krowe-moh Apr 4, 2026
d8d8757
Merge remote-tracking branch 'upstream/dev' into ExportingFix
Krowe-moh Apr 8, 2026
bb160e7
Added 50 Entry Limit
Krowe-moh Apr 8, 2026
521fe89
Merge branch '4sval:dev' into ExportingFix
Krowe-moh May 18, 2026
40ebb17
New ItemDefs added recently
Krowe-moh May 18, 2026
b84ee3f
modified stuff in FN creator
Krowe-moh May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion FModel/Creator/Bases/FN/BaseIcon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,13 @@ public void ParseForReward(bool isUsingDisplayAsset)
Preview = Utils.GetBitmap(otherPreview);
else if (Object.TryGetValue(out UMaterialInstanceConstant materialInstancePreview, "EventCalloutImage"))
Preview = Utils.GetBitmap(materialInstancePreview);
else if (Object.TryGetValue(out FStructFallback brush, "IconBrush") && brush.TryGetValue(out UTexture2D res, "ResourceObject"))
else if (Object.TryGetValue(out FStructFallback brush, "IconBrush", "BuildingSymbolNormal") && brush.TryGetValue(out UTexture2D res, "ResourceObject"))
Preview = Utils.GetBitmap(res);
else if (Object.TryGetValue(out FStructFallback mission, "MissionIcons", "PopupWidgetData"))
{
if (mission.TryGetValue(out FStructFallback brushsize, "Brush_XL", "Brush_L", "Brush_M", "Brush_S", "Brush_XS", "Brush_XXS", "AvailableIcon", "UnavailableIcon") && brushsize.TryGetValue(out UTexture2D res2, "ResourceObject"))
Preview = Utils.GetBitmap(res2);
}
}

// text
Expand Down
6 changes: 6 additions & 0 deletions FModel/Creator/CreatorPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public bool TryConstructCreator([MaybeNullWhen(false)] out UCreator creator)
case "CosmeticShoesItemDefinition":
case "CosmeticCompanionItemDefinition":
case "CosmeticCompanionReactFXItemDefinition":
case "MagpieEntitlementRewardDefinition":
case "FortDeferredItemGrantDefinition":
case "BattleLabDeviceItemDefinition":
case "PiggybackDanceItemDefinition":
case "MyTownBuildingDefinitionData":
case "AthenaPickaxeItemDefinition":
case "AthenaGadgetItemDefinition":
case "AthenaGliderItemDefinition":
Expand All @@ -63,6 +68,7 @@ public bool TryConstructCreator([MaybeNullWhen(false)] out UCreator creator)
case "FortTokenType":
case "FortAbilityKit":
case "FortWorkerType":
case "FortMissionInfo":
case "RewardGraphToken":
case "JunoKnowledgeBundle":
case "FortBannerTokenType":
Expand Down
7 changes: 7 additions & 0 deletions FModel/Settings/UserSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,13 @@ public Hotkey AddAudio
set => SetProperty(ref _addAudio, value);
}

private Hotkey _removeAudio = new(Key.X);
public Hotkey RemoveAudio
{
get => _removeAudio;
set => SetProperty(ref _removeAudio, value);
}

private Hotkey _playPauseAudio = new(Key.K);
public Hotkey PlayPauseAudio
{
Expand Down
38 changes: 38 additions & 0 deletions FModel/ViewModels/AudioPlayerViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,20 @@ public void Load()
});
}

public void Unload()
{
Application.Current.Dispatcher.Invoke(() =>
{
_waveSource = null;

PlayedFile = new AudioFile(-1, "No audio file");
Spectrum = null;

RaiseSourceEvent(ESourceEventType.Clearing);
ClearSoundOut();
});
}

public void AddToPlaylist(byte[] data, string filePath)
{
Application.Current.Dispatcher.Invoke(() =>
Expand Down Expand Up @@ -270,11 +284,30 @@ public void Remove()
if (_audioFiles.Count < 1) return;
Application.Current.Dispatcher.Invoke(() =>
{
var removedPlaying = false;
if (PlayedFile.Id == SelectedAudioFile.Id)
{
removedPlaying = true;
Stop();
}

_audioFiles.RemoveAt(SelectedAudioFile.Id);
for (var i = 0; i < _audioFiles.Count; i++)
{
_audioFiles[i].Id = i;
}

if (_audioFiles.Count < 1)
{
Unload();
return;
}

SelectedAudioFile = _audioFiles[SelectedAudioFile.Id];

if (!removedPlaying) return;
Load();
Play();
});
}

Expand Down Expand Up @@ -526,6 +559,11 @@ private void LoadSoundOut()
_soundOut.Volume = UserSettings.Default.AudioPlayerVolume / 100;
}

private void ClearSoundOut()
{
_soundOut = null;
}

private IEnumerable<MMDevice> EnumerateDevices()
{
using var deviceEnumerator = new MMDeviceEnumerator();
Expand Down
29 changes: 29 additions & 0 deletions FModel/ViewModels/Commands/RightClickMenuCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public override async void Execute(ApplicationViewModel contextViewModel, object
if (param.Length == 0) return;

var folders = param.OfType<TreeItem>().ToArray();
var searchMenu = param[0] is GameFile;
var assets = param
.Select(static item => item switch
{
Expand Down Expand Up @@ -138,6 +139,20 @@ await _threadWorkerView.Begin(cancellationToken =>
_ => (entry, bulk, update) => contextViewModel.CUE4Parse.Extract(cancellationToken, entry, false, bulk),
};

if (searchMenu)
{
var update = assets.Length > 1;
foreach (var entry in assets)
{
Thread.Yield();
cancellationToken.ThrowIfCancellationRequested();
fileAction(entry, bulktype, update);
}

if (assets.Length > 50) LogExport(contextViewModel, filetype);
return;
}

foreach (var group in assetsGroups)
{
var directory = group.Key;
Expand Down Expand Up @@ -190,4 +205,18 @@ private void LogExport(ApplicationViewModel contextViewModel, string directory,
Interlocked.Exchange(ref contextViewModel.CUE4Parse.ExportedCount, 0);
Interlocked.Exchange(ref contextViewModel.CUE4Parse.FailedExportCount, 0);
}

private void LogExport(ApplicationViewModel contextViewModel, string fileType)
{
if (contextViewModel.CUE4Parse.ExportedCount > 0)
{
FLogger.Append(ELog.Information, () =>
{
FLogger.Text($"Successfully exported {contextViewModel.CUE4Parse.ExportedCount} {fileType}, Failed to export {contextViewModel.CUE4Parse.FailedExportCount} {fileType} in other folders.", Constants.WHITE, true);
});
}

Interlocked.Exchange(ref contextViewModel.CUE4Parse.ExportedCount, 0);
Interlocked.Exchange(ref contextViewModel.CUE4Parse.FailedExportCount, 0);
}
}
20 changes: 19 additions & 1 deletion FModel/ViewModels/Commands/TabCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,15 @@ public override async void Execute(TabItem tabViewModel, object parameter)
case "Close_Other_Tabs":
_applicationView.CUE4Parse.TabControl.RemoveOtherTabs(tabViewModel);
break;
case "Assets_Show_Metadata":
_applicationView.CUE4Parse.ShowMetadata(tabViewModel.Entry);
break;
case "Find_References":
_applicationView.CUE4Parse.FindReferences(tabViewModel.Entry);
break;
case "Assets_Decompile":
_applicationView.CUE4Parse.Decompile(tabViewModel.Entry);
break;
case "Save_Data":
await _threadWorkerView.Begin(_ => _applicationView.CUE4Parse.ExportData(tabViewModel.Entry));
break;
Expand Down Expand Up @@ -77,9 +83,21 @@ await _threadWorkerView.Begin(cancellationToken =>
}.Show();
});
break;
case "Copy_Asset_Path":
case "File_Path":
Clipboard.SetText(tabViewModel.Entry.Path);
break;
case "File_Name":
Clipboard.SetText(tabViewModel.Entry.Name);
break;
case "Directory_Path":
Clipboard.SetText(tabViewModel.Entry.Directory);
break;
case "File_Path_No_Extension":
Clipboard.SetText(tabViewModel.Entry.PathWithoutExtension);
break;
case "File_Name_No_Extension":
Clipboard.SetText(tabViewModel.Entry.NameWithoutExtension);
break;
}
}
}
24 changes: 20 additions & 4 deletions FModel/ViewModels/GameSelectorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,27 @@ private bool TryDetectUeVersion(string gameDirectory, out EGame ueVersion, [Mayb
}
}

var crashReportClientExe = Path.Combine(projectDir, "..", "Engine", "Binaries", "Win64", "CrashReportClient.exe");
if (File.Exists(crashReportClientExe) && TryGetUeVersionFromExe(crashReportClientExe, out ueVersion))
var projectEngineBinariesDir = Path.Combine(projectDir, "..", "Engine", "Binaries", "Win64");

if (Directory.Exists(projectEngineBinariesDir))
{
Log.Information("Detected UE version {UeVersion} from \"{Exe}\"", ueVersion, crashReportClientExe);
return true;
var crashReportClientExe = Path.Combine(projectEngineBinariesDir, "CrashReportClient.exe");
if (File.Exists(crashReportClientExe) && TryGetUeVersionFromExe(crashReportClientExe, out ueVersion))
{
Log.Information("Detected UE version {UeVersion} from \"{Exe}\"", ueVersion, crashReportClientExe);
return true;
}
if (Directory.GetFiles(projectEngineBinariesDir, "*-Win64-Shipping.exe") is { Length: > 0 } shipping)
{
foreach (var exe in shipping)
{
if (TryGetUeVersionFromExe(exe, out ueVersion))
{
Log.Information("Detected UE version {UeVersion} from \"{Exe}\"", ueVersion, exe);
return true;
}
}
}
}

ueVersion = EGame.GAME_UE4_LATEST;
Expand Down
2 changes: 1 addition & 1 deletion FModel/ViewModels/TabControlViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ private void SaveCheck(string path, string fileName, bool updateUi)
{
Interlocked.Increment(ref ApplicationService.ApplicationView.CUE4Parse.ExportedCount);
Log.Information("{FileName} successfully saved", fileName);
if (updateUi)
if (updateUi && ApplicationService.ApplicationView.CUE4Parse.ExportedCount < 50)
{
FLogger.Append(ELog.Information, () =>
{
Expand Down
2 changes: 2 additions & 0 deletions FModel/Views/AudioPlayer.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ private void OnPreviewKeyDown(object sender, KeyEventArgs e)
_applicationView.AudioPlayer.Previous();
else if (UserSettings.Default.NextAudio.IsTriggered(e.Key))
_applicationView.AudioPlayer.Next();
else if (UserSettings.Default.RemoveAudio.IsTriggered(e.Key))
_applicationView.AudioPlayer.Remove();
}

private void OnAudioFileMouseDoubleClick(object sender, MouseButtonEventArgs e)
Expand Down
5 changes: 3 additions & 2 deletions FModel/Views/Resources/Controls/Aup/SourceEventArgs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ namespace FModel.Views.Resources.Controls.Aup;

public enum ESourceEventType
{
Loading
Loading,
Clearing
}

public class SourceEventArgs : EventArgs
Expand All @@ -15,4 +16,4 @@ public SourceEventArgs(ESourceEventType e)
{
Event = e;
}
}
}
61 changes: 60 additions & 1 deletion FModel/Views/Resources/Resources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,26 @@
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Show Metadata" Command="{Binding TabCommand}" CommandParameter="Assets_Show_Metadata">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource InfoIcon}" />
</Canvas>
</Viewbox>
</MenuItem.Icon>
<MenuItem.IsEnabled>
<Binding Path="PlacementTarget.SelectedItems" RelativeSource="{RelativeSource AncestorType=ContextMenu}">
<Binding.Converter>
<converters:AnyItemMeetsConditionConverter>
<converters:AnyItemMeetsConditionConverter.Conditions>
<converters:ItemIsUePackageCondition />
</converters:AnyItemMeetsConditionConverter.Conditions>
</converters:AnyItemMeetsConditionConverter>
</Binding.Converter>
</Binding>
</MenuItem.IsEnabled>
</MenuItem>
<MenuItem Header="Find References" Command="{Binding TabCommand}" CommandParameter="Find_References">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
Expand All @@ -931,6 +951,35 @@
</Binding>
</MenuItem.IsEnabled>
</MenuItem>
<MenuItem Header="Decompile Blueprint" Command="{Binding TabCommand}" CommandParameter="Assets_Decompile">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource CppIcon}" />
</Canvas>
</Viewbox>
</MenuItem.Icon>
<MenuItem.Style>
<Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
<Style.Triggers>
<DataTrigger Binding="{Binding ShowDecompileOption, Source={x:Static settings:UserSettings.Default}}" Value="False">
<Setter Property="Visibility" Value="Collapsed" />
</DataTrigger>
</Style.Triggers>
</Style>
</MenuItem.Style>
<MenuItem.IsEnabled>
<Binding Path="PlacementTarget.SelectedItems" RelativeSource="{RelativeSource AncestorType=ContextMenu}">
<Binding.Converter>
<converters:AnyItemMeetsConditionConverter>
<converters:AnyItemMeetsConditionConverter.Conditions>
<converters:ItemActionCondition Action="Code" />
</converters:AnyItemMeetsConditionConverter.Conditions>
</converters:AnyItemMeetsConditionConverter>
</Binding.Converter>
</Binding>
</MenuItem.IsEnabled>
</MenuItem>
<Separator />
<MenuItem Command="{Binding TabCommand}" CommandParameter="Save_Data">
<MenuItem.Header>
Expand Down Expand Up @@ -1010,14 +1059,24 @@
</Viewbox>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Copy Package Path" Command="{Binding TabCommand}" CommandParameter="Copy_Asset_Path">
<MenuItem Header="Copy">
<MenuItem.Icon>
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource CopyIcon}" />
</Canvas>
</Viewbox>
</MenuItem.Icon>
<MenuItem Header="Package Path" Command="{Binding TabCommand}" CommandParameter="File_Path">
</MenuItem>
<MenuItem Header="Package Name" Command="{Binding TabCommand}" CommandParameter="File_Name">
</MenuItem>
<MenuItem Header="Directory Path" Command="{Binding TabCommand}" CommandParameter="Directory_Path">
</MenuItem>
<MenuItem Header="Package Path w/o Extension" Command="{Binding TabCommand}" CommandParameter="File_Path_No_Extension">
</MenuItem>
<MenuItem Header="Package Name w/o Extension" Command="{Binding TabCommand}" CommandParameter="File_Name_No_Extension">
</MenuItem>
</MenuItem>
</ContextMenu>
</Setter.Value>
Expand Down
Loading