From c1f066e8dede4a6bb5488e9df02467a31055e8bb Mon Sep 17 00:00:00 2001
From: Ma100Dev <33522543+Ma100Dev@users.noreply.github.com>
Date: Sun, 20 Nov 2022 17:14:44 +0200
Subject: [PATCH] Remove accents from chars before removing illegal ones

---
 .../com/shabinder/common/utils/Utils.kt       | 56 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
index 4a161569..ecc77a53 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
@@ -16,5 +16,59 @@ val globalJson by lazy {
  * Removing Illegal Chars from File Name
  * **/
 fun removeIllegalChars(fileName: String): String {
-    return fileName.replace("[^\\dA-Za-z0-9-_]".toRegex(), "_")
+    var newFileName = fileName
+
+    // Try to remove all accents first before removing illegal chars
+    newFileName = newFileName.replace("[ÁĂẮẶẰẲẴǍÂẤẬẦẨẪÄǞȦǠẠȀÀẢȂĀĄÅǺḀÃ]".toRegex(), "A")
+    newFileName = newFileName.replace("[áăắặằẳẵǎâấậầẩẫäǟȧǡạȁàảȃāąåǻḁã]".toRegex(), "a")
+    newFileName = newFileName.replace("[ḂḄḆ]".toRegex(), "B")
+    newFileName = newFileName.replace("[ḃḅḇ]".toRegex(), "b")
+    newFileName = newFileName.replace("[ĆČÇḈĈĊ]".toRegex(), "C")
+    newFileName = newFileName.replace("[ćčçḉĉċ]".toRegex(), "c")
+    newFileName = newFileName.replace("[ĎḐḒḊḌḎ]".toRegex(), "D")
+    newFileName = newFileName.replace("[ďḑḓḋḍḏ]".toRegex(), "d")
+    newFileName = newFileName.replace("[ÉĔĚȨḜÊẾỆỀỂỄḘËĖẸȄÈẺȆĒḖḔĘẼḚ]".toRegex(), "E")
+    newFileName = newFileName.replace("[éĕěȩḝêếệềểễḙëėẹȅèẻȇēḗḕęẽḛ]".toRegex(), "e")
+    newFileName = newFileName.replace("[Ḟ]".toRegex(), "F")
+    newFileName = newFileName.replace("[ḟ]".toRegex(), "f")
+    newFileName = newFileName.replace("[ǴĞǦĢĜĠḠ]".toRegex(), "G")
+    newFileName = newFileName.replace("[ǵğǧģĝġḡ]".toRegex(), "g")
+    newFileName = newFileName.replace("[ḪȞḨĤḦḢḤẖ]".toRegex(), "H")
+    newFileName = newFileName.replace("[ḫȟḩĥḧḣḥ]".toRegex(), "h")
+    newFileName = newFileName.replace("[ÍĬǏÎÏḮİịȉìỉȋīįĩḭ]".toRegex(), "I")
+    newFileName = newFileName.replace("[íĭǐîïḯỊȈÌỈȊĪĮĨḬ]".toRegex(), "i")
+    newFileName = newFileName.replace("[ǰĵ]".toRegex(), "J")
+    newFileName = newFileName.replace("[Ĵ]".toRegex(), "j")
+    newFileName = newFileName.replace("[ḰǨĶḲḴ]".toRegex(), "K")
+    newFileName = newFileName.replace("[ḱǩķḳḵ]".toRegex(), "k")
+    newFileName = newFileName.replace("[ĹĽĻḼḶḸḺ]".toRegex(), "L")
+    newFileName = newFileName.replace("[ĺľļḽḷḹḻ]".toRegex(), "l")
+    newFileName = newFileName.replace("[ḾṀṂ]".toRegex(), "M")
+    newFileName = newFileName.replace("[ḿṁṃ]".toRegex(), "m")
+    newFileName = newFileName.replace("[ŃŇŅṊṄṆǸṈÑ]".toRegex(), "N")
+    newFileName = newFileName.replace("[ńňņṋṅṇǹṉñ]".toRegex(), "n")
+    newFileName = newFileName.replace("[ÓŎǑÔỐỘỒỔỖÖȪȮȰỌŐȌÒỎƠỚỢỜỞỠȎŌṒṐǪǬÕṌṎȬØǾ]".toRegex(), "O")
+    newFileName = newFileName.replace("[óŏǒôốộồổỗöȫȯȱọőȍòỏơớợờởỡȏōṓṑǫǭõṍṏȭø]".toRegex(), "o")
+    newFileName = newFileName.replace("[ṔṖ]".toRegex(), "P")
+    newFileName = newFileName.replace("[ṕṗ]".toRegex(), "p")
+    newFileName = newFileName.replace("[ŔŘŖṘṚṜȐȒṞ]".toRegex(), "R")
+    newFileName = newFileName.replace("[ŕřŗṙṛṝȑȓṟ]".toRegex(), "r")
+    newFileName = newFileName.replace("[ŚṤŠṦŞŜȘṠṢṨ]".toRegex(), "S")
+    newFileName = newFileName.replace("[śṥšṧşŝșṡṣṩ]".toRegex(), "s")
+    newFileName = newFileName.replace("[ŤŢṰȚẗṫṭṯ]".toRegex(), "T")
+    newFileName = newFileName.replace("[ťţṱțṪṬṮ]".toRegex(), "t")
+    newFileName = newFileName.replace("[ÚŬǓÛṶÜǗǙǛǕṲỤŰȔÙỦƯỨỰỪỬỮȖŪṺŲŮŨṸṴ]".toRegex(), "U")
+    newFileName = newFileName.replace("[úŭǔûṷüǘǚǜǖṳụűȕùủưứựừửữȗūṻųůũṹṵ]".toRegex(), "u")
+    newFileName = newFileName.replace("[ṾṼ]".toRegex(), "V")
+    newFileName = newFileName.replace("[ṿṽ]".toRegex(), "v")
+    newFileName = newFileName.replace("[ẂŴẄẆẈẀẘ]".toRegex(), "W")
+    newFileName = newFileName.replace("[ẃŵẅẇẉẁ]".toRegex(), "w")
+    newFileName = newFileName.replace("[ẌẊ]".toRegex(), "X")
+    newFileName = newFileName.replace("[ẍẋ]".toRegex(), "x")
+    newFileName = newFileName.replace("[ÝŶŸẎỴỲỶȲẙỹ]".toRegex(), "Y")
+    newFileName = newFileName.replace("[ýŷÿẏỵỳỷȳỸ]".toRegex(), "y")
+    newFileName = newFileName.replace("[ŹŽẐŻẒẔ]".toRegex(), "Z")
+    newFileName = newFileName.replace("[źžẑżẓẕ]".toRegex(), "z")
+
+    return newFileName.replace("[^\\dA-Za-z0-9-_]".toRegex(), "_")
 }