From b86e565077225c4c580598a9e7ead07fc4a1fddc Mon Sep 17 00:00:00 2001
From: Timerix22 <timerix11@gmail.com>
Date: Wed, 22 Mar 2023 14:22:25 +0600
Subject: [PATCH] ReplaceRestrictedChars

---
 DTLib.Dtsod/DTLib.Dtsod.csproj     |  4 ++--
 DTLib.Logging/DTLib.Logging.csproj |  4 ++--
 DTLib.Network/DTLib.Network.csproj |  4 ++--
 DTLib.Tests/DTLib.Tests.csproj     |  8 +++----
 DTLib/DTLib.csproj                 |  2 +-
 DTLib/Filesystem/Path.cs           | 35 +++++++++++++++++-------------
 6 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/DTLib.Dtsod/DTLib.Dtsod.csproj b/DTLib.Dtsod/DTLib.Dtsod.csproj
index 9cb539b..0ffde1d 100644
--- a/DTLib.Dtsod/DTLib.Dtsod.csproj
+++ b/DTLib.Dtsod/DTLib.Dtsod.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Dtsod</PackageId>
-        <Version>1.1.4</Version>
+        <Version>1.1.5</Version>
         <Authors>Timerix</Authors>
         <Description>Definitely not json</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -33,7 +33,7 @@
         <ProjectReference Include="..\DTLib\DTLib.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.1.5" />
+        <PackageReference Include="DTLib" Version="1.1.9" />
     </ItemGroup>
     
     <!--project files-->
diff --git a/DTLib.Logging/DTLib.Logging.csproj b/DTLib.Logging/DTLib.Logging.csproj
index 1d5c6a9..340fdde 100644
--- a/DTLib.Logging/DTLib.Logging.csproj
+++ b/DTLib.Logging/DTLib.Logging.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Logging</PackageId>
-        <Version>1.1.4</Version>
+        <Version>1.1.5</Version>
         <Authors>Timerix</Authors>
         <Description>Loggers with dependency injection</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -30,7 +30,7 @@
         <ProjectReference Include="..\DTLib.Ben.Demystifier\DTLib.Ben.Demystifier.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.1.5" />
+        <PackageReference Include="DTLib" Version="1.1.9" />
         <PackageReference Include="DTLib.Ben.Demystifier" Version="1.0.4" />
     </ItemGroup>
 </Project>
diff --git a/DTLib.Network/DTLib.Network.csproj b/DTLib.Network/DTLib.Network.csproj
index 846ce08..6200986 100644
--- a/DTLib.Network/DTLib.Network.csproj
+++ b/DTLib.Network/DTLib.Network.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Network</PackageId>
-        <Version>1.1.4</Version>
+        <Version>1.1.5</Version>
         <Authors>Timerix</Authors>
         <Description>Some sick network protocols</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -32,6 +32,6 @@
         <ProjectReference Include="..\DTLib.Dtsod\DTLib.Dtsod.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib.Dtsod" Version="1.1.4" />
+        <PackageReference Include="DTLib.Dtsod" Version="1.1.5" />
     </ItemGroup>
 </Project>
diff --git a/DTLib.Tests/DTLib.Tests.csproj b/DTLib.Tests/DTLib.Tests.csproj
index 2b0444f..ab97987 100644
--- a/DTLib.Tests/DTLib.Tests.csproj
+++ b/DTLib.Tests/DTLib.Tests.csproj
@@ -27,10 +27,10 @@
 		<ProjectReference Include="..\DTLib\DTLib.csproj" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-		<PackageReference Include="DTLib" Version="1.1.5" />
-		<PackageReference Include="DTLib.Dtsod" Version="1.1.4" />
-		<PackageReference Include="DTLib.Network" Version="1.1.4" />
-		<PackageReference Include="DTLib.Logging" Version="1.1.4" />
+		<PackageReference Include="DTLib" Version="1.1.9" />
+		<PackageReference Include="DTLib.Dtsod" Version="1.1.5" />
+		<PackageReference Include="DTLib.Network" Version="1.1.5" />
+		<PackageReference Include="DTLib.Logging" Version="1.1.5" />
 	</ItemGroup>
 
 	<!--project files-->
diff --git a/DTLib/DTLib.csproj b/DTLib/DTLib.csproj
index 445b909..0ba8f78 100644
--- a/DTLib/DTLib.csproj
+++ b/DTLib/DTLib.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<!--package info-->
 		<PackageId>DTLib</PackageId>
-		<Version>1.1.8</Version>
+		<Version>1.1.9</Version>
 		<Authors>Timerix</Authors>
 		<Description>Library for all my C# projects</Description>
 		<RepositoryType>GIT</RepositoryType>
diff --git a/DTLib/Filesystem/Path.cs b/DTLib/Filesystem/Path.cs
index e066c52..571489f 100644
--- a/DTLib/Filesystem/Path.cs
+++ b/DTLib/Filesystem/Path.cs
@@ -19,33 +19,38 @@ public static class Path
             throw new Exception($"path <{path}> uses <..>, that's not allowed");
     }
     
-    /// Replaces restricted characters in string
+    /// Replaces characters restricted in filesystem path
     public static IOPath ReplaceRestrictedChars(string str)
     {
         char[] r = str.ToCharArray();
-        
+        StringBuilder b = new(r.Length);
         for (int i = 0; i < str.Length; i++)
         {
-            switch (r[i])
+            char c = r[i];
+            switch (c)
             {
-                case '/': case '\\':
+                case '\n': case '\r':
                 case ':': case ';':
-                    r[i] = '-';
                     break;
-                case '\n': case '\r':  case '\'': 
-                case '"': case '`':
+                case '/': case '\\':
+                    b.Append('-');
                     break;
-                case ' ': case '&': case '{': case '}': 
-                case '<': case '>': case '*': case '?':
-                case '$': case '%': case '@': case '|':
-                // case '!':
-                // case '#':
-                    r[i] = '_';
+                case '<': case '>': 
+                case '?': case '|':
+                    b.Append('_');
+                    break; 
+                case '"':
+                    b.Append('\'');
+                    break;
+                case '*':
+                    b.Append('X');
+                    break;
+                default:
+                    b.Append(c);
                     break;
             }
         }
-
-        return new IOPath(r);
+        return new IOPath(b.ToString(), true);
     }
 
 #if  !USE_SPAN