Compare commits
2 Commits
068f660451
...
e61f85c4cc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e61f85c4cc | ||
|
|
f04c5ec4b0 |
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.0.0.6")>
|
||||
<Assembly: AssemblyVersion("1.0.0.7")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
|
||||
@@ -766,6 +766,12 @@ Public Class Windream
|
||||
Public Function GetNormalizedPath(Path As String) As String
|
||||
Dim oNormalizedPath = GetCleanedPath(Path)
|
||||
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:\
|
||||
If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
|
||||
_logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]")
|
||||
@@ -775,13 +781,9 @@ Public Class Windream
|
||||
' Remove Windream Base Path, eg. \\windream\objects\
|
||||
If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
|
||||
_logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]")
|
||||
oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1)
|
||||
oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length)
|
||||
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
|
||||
If oNormalizedPath.Contains(":") Then
|
||||
_logger.Warn($"oNormalizedPath still contains a drive name!!")
|
||||
|
||||
Reference in New Issue
Block a user