AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Windream: fix NormalizePath

Browse Source
This commit is contained in:
Jonathan Jenne 2020-05-29 13:56:27 +02:00
parent 068f660451
commit f04c5ec4b0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules.Windream/Windream.vb
View File

@ -766,6 +766,12 @@ Public Class Windream
Public Function GetNormalizedPath(Path As String) As String Public Function GetNormalizedPath(Path As String) As String
Dim oNormalizedPath = GetCleanedPath(Path) Dim oNormalizedPath = GetCleanedPath(Path)
Try Try
' Convert any forward slashes / and double slashes \\ into backslashes \
' See: https://stackoverflow.com/questions/3144492/how-do-i-get-nets-path-combine-to-convert-forward-slashes-to-backslashes
If IsPathRooted(oNormalizedPath) Then
oNormalizedPath = GetFullPath(oNormalizedPath)
End If
' Remove Driveletter, eg. W:\ ' Remove Driveletter, eg. W:\
If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
_logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]") _logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]")
@ -775,13 +781,9 @@ Public Class Windream
' Remove Windream Base Path, eg. \\windream\objects\ ' Remove Windream Base Path, eg. \\windream\objects\
If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
_logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]") _logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]")
oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1) oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length)
End If End If
' Convert any forward slashes / and double slashes \\ into backslashes \
' See: https://stackoverflow.com/questions/3144492/how-do-i-get-nets-path-combine-to-convert-forward-slashes-to-backslashes
oNormalizedPath = GetFullPath(oNormalizedPath)
' Handle misconfigured drive-letter ' Handle misconfigured drive-letter
If oNormalizedPath.Contains(":") Then If oNormalizedPath.Contains(":") Then
_logger.Warn($"oNormalizedPath still contains a drive name!!") _logger.Warn($"oNormalizedPath still contains a drive name!!")