Skip to content

Match CLI descriptors by path boundaries #147

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

Open
dajiaohuang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Match CLI descriptors by path boundaries #147

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: 14 additions & 4 deletions src/CLI/RodelCommit/CommitService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ public static string RemoveMarkdownCodeBlockDelimiters(string input)
return default;
}

var currentDirectory = Environment.CurrentDirectory;
var currentDirectory = Path.GetFullPath(Environment.CurrentDirectory);
(string? name, string? desc) bestMatch = default;
var bestMatchLength = -1;
foreach (var file in files)
{
var lines = await File.ReadAllLinesAsync(file);
Expand All @@ -462,14 +464,22 @@ public static string RemoveMarkdownCodeBlockDelimiters(string input)
continue;
}

if (currentDirectory.Contains(firstLine!) || firstLine!.Contains(currentDirectory))
var descriptorDirectory = Path.GetFullPath(firstLine);
var relativePath = Path.GetRelativePath(descriptorDirectory, currentDirectory);
var isSameOrChildDirectory = relativePath == "."
|| (!Path.IsPathRooted(relativePath)
&& relativePath != ".."
&& !relativePath.StartsWith($"..{Path.DirectorySeparatorChar}", StringComparison.Ordinal)
&& !relativePath.StartsWith($"..{Path.AltDirectorySeparatorChar}", StringComparison.Ordinal));
if (isSameOrChildDirectory && descriptorDirectory.Length > bestMatchLength)
{
var otherContent = string.Join('\n', lines.Skip(1).Where(p => !string.IsNullOrWhiteSpace(p)).ToList());
return (Path.GetFileNameWithoutExtension(file), otherContent.Trim());
bestMatch = (Path.GetFileNameWithoutExtension(file), otherContent.Trim());
bestMatchLength = descriptorDirectory.Length;
}
}

return default;
return bestMatch;
}

private static async Task<string> GetDiffAsync()
Expand Down