From 850cbb29730318821aa39aafeb6d848004665ea6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 2 Aug 2021 11:56:45 +0200 Subject: [PATCH] Language: RemoveInvalidCharacters catches exceptions --- Modules.Language/Utils.vb | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Modules.Language/Utils.vb b/Modules.Language/Utils.vb index ccc2582a..f84276f5 100644 --- a/Modules.Language/Utils.vb +++ b/Modules.Language/Utils.vb @@ -124,26 +124,30 @@ Public Class Utils Public Shared Function RemoveInvalidCharacters(pString As String) As String Dim oResult = pString - ' Remove all Unicode above Codepoint U+10000 - oResult = Regex.Replace(oResult, InvalidChars.UnicodeSurrogates, String.Empty) + Try + ' Remove all Unicode above Codepoint U+10000 + oResult = Regex.Replace(oResult, InvalidChars.UnicodeSurrogates, String.Empty) - ' Remove all Emojis (Version 13) - oResult = Regex.Replace(oResult, InvalidChars.Emojis, String.Empty) + ' Remove all Emojis (Version 13) + oResult = Regex.Replace(oResult, InvalidChars.Emojis, String.Empty) - ' Remove Invalid filename characters - oResult = Regex.Replace(oResult, InvalidChars.Filenames, String.Empty) + ' Remove Invalid filename characters + oResult = Regex.Replace(oResult, InvalidChars.Filenames, String.Empty) - ' Remove Invalid filename characters - oResult = Regex.Replace(oResult, InvalidChars.Paths, String.Empty) + ' Remove Invalid filename characters + oResult = Regex.Replace(oResult, InvalidChars.Paths, String.Empty) - ' Remove Uneccessary characters - oResult = Regex.Replace(oResult, "\s{2,}", " ") - oResult = Regex.Replace(oResult, "\.{2,}", ".") + ' Remove Uneccessary characters + oResult = Regex.Replace(oResult, "\s{2,}", " ") + oResult = Regex.Replace(oResult, "\.{2,}", ".") - ' Remove excess space chars - oResult = oResult.Trim() + ' Remove excess space chars + oResult = oResult.Trim() - Return oResult + Return oResult + Catch ex As Exception + Return oResult + End Try End Function '''