Skip to content

Support network locations #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janstaelensskyline merged 1 commit into from
Apr 8, 2024
Merged

Support network locations #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions FileSystem/PathCombine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,18 @@ public static string UniversalCombine(string[] paths, HashSet<char> invalidChars
}

List<string> nicePaths = new List<string>();
bool startsWithShare = false;

foreach (var path in paths)
{
var splitPath = path.Split(new[] { WindowsSeparator, LinuxSeparator }, StringSplitOptions.RemoveEmptyEntries);
string cleanPath = path;
if(path.StartsWith(WindowsSeparator+ WindowsSeparator))
{
cleanPath = path.TrimStart('\\');
startsWithShare = true;
}

var splitPath = cleanPath.Split(new[] { WindowsSeparator, LinuxSeparator }, StringSplitOptions.RemoveEmptyEntries);
nicePaths.AddRange(splitPath.Where(p => !String.IsNullOrWhiteSpace(p)));
}

Expand All @@ -36,7 +45,7 @@ public static string UniversalCombine(string[] paths, HashSet<char> invalidChars
{
separator = LinuxSeparator;
}
else if (nicePaths[0].EndsWith(":"))
else if (nicePaths[0].EndsWith(":") || startsWithShare)
{
separator = WindowsSeparator;
}
Expand All @@ -47,6 +56,11 @@ public static string UniversalCombine(string[] paths, HashSet<char> invalidChars

var result = String.Join(separator, nicePaths);

if (startsWithShare)
{
result = "\\\\" + result;
}

if (separator == LinuxSeparator && paths[0].StartsWith(LinuxSeparator))
{
// Linux paths need to start with a / only if we already had a /.
Expand Down
1 change: 1 addition & 0 deletions FileSystemTests/PathCombineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class PathCombineTests
[DataRow(new[] { "/github/", "FolderC/FolderD", "File.xml" }, "/github/FolderC/FolderD/File.xml")]
[DataRow(new[] { "/github", "FolderC/FolderD" }, "/github/FolderC/FolderD")]
[DataRow(new[] { "/github\\what?", "FolderC/FolderD" }, "/github/what?/FolderC/FolderD")]
[DataRow(new[] { "\\\\127.0.0.1\\c$", "skyline dataminer\\test.txt" }, "\\\\127.0.0.1\\c$\\skyline dataminer\\test.txt")]
public void UniversalCombineTests(string[] paths, string expectedResult)
{
var result = PathCombine.UniversalCombine(paths, _invalidCharacters);
Expand Down