From 5332119a637b52cbfd1b3fd87aff9d0e65c3de89 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Fri, 11 Jun 2021 12:42:00 +0200 Subject: [PATCH] Add non-ascii removal from option directories. --- Penumbra/Importer/TexToolsImport.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs index fe5f42ad..2bfaad50 100644 --- a/Penumbra/Importer/TexToolsImport.cs +++ b/Penumbra/Importer/TexToolsImport.cs @@ -272,7 +272,7 @@ namespace Penumbra.Importer foreach( var group in page.ModGroups.Where( group => group.GroupName != null && group.OptionList != null ) ) { - var groupFolder = new DirectoryInfo( Path.Combine( newModFolder.FullName, group.GroupName!.ReplaceInvalidPathSymbols() ) ); + var groupFolder = new DirectoryInfo( Path.Combine( newModFolder.FullName, group.GroupName!.ReplaceInvalidPathSymbols().RemoveNonAsciiSymbols( ) ) ); if( groupFolder.Exists ) { groupFolder = new DirectoryInfo( groupFolder.FullName + $" ({page.PageIndex})" ); @@ -281,7 +281,7 @@ namespace Penumbra.Importer foreach( var option in group.OptionList!.Where( option => option.Name != null && option.ModsJsons != null ) ) { - var optionFolder = new DirectoryInfo( Path.Combine( groupFolder.FullName, option.Name!.ReplaceInvalidPathSymbols() ) ); + var optionFolder = new DirectoryInfo( Path.Combine( groupFolder.FullName, option.Name!.ReplaceInvalidPathSymbols().RemoveNonAsciiSymbols() ) ); ExtractSimpleModList( optionFolder, option.ModsJsons!, modData ); } @@ -311,7 +311,7 @@ namespace Penumbra.Importer OptionDesc = string.IsNullOrEmpty( opt.Description ) ? "" : opt.Description!, OptionFiles = new Dictionary< RelPath, HashSet< GamePath > >(), }; - var optDir = new DirectoryInfo( Path.Combine( groupFolder.FullName, opt.Name!.ReplaceInvalidPathSymbols() ) ); + var optDir = new DirectoryInfo( Path.Combine( groupFolder.FullName, opt.Name!.ReplaceInvalidPathSymbols().RemoveNonAsciiSymbols() ) ); if( optDir.Exists ) { foreach( var file in optDir.EnumerateFiles( "*.*", SearchOption.AllDirectories ) )