dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-05 11:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: remove validation for relative path while adding submodule (#1339)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-21 09:27:02 +08:00
parent d304c50e7f
commit 71b90a82b6
No known key found for this signature in database
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/ViewModels/AddSubmodule.cs
View file

@ -15,12 +15,10 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _url, value, true); set => SetProperty(ref _url, value, true);
} }
[Required(ErrorMessage = "Reletive path is required!!!")]
[CustomValidation(typeof(AddSubmodule), nameof(ValidateRelativePath))]
public string RelativePath public string RelativePath
{ {
get => _relativePath; get => _relativePath;
set => SetProperty(ref _relativePath, value, true); set => SetProperty(ref _relativePath, value);
} }
public bool Recursive public bool Recursive
@ -49,22 +47,6 @@ namespace SourceGit.ViewModels
return new ValidationResult("Missing validation context"); return new ValidationResult("Missing validation context");
} }
public static ValidationResult ValidateRelativePath(string path, ValidationContext ctx)
{
if (ctx.ObjectInstance is AddSubmodule asm)
{
if (!path.StartsWith("./", StringComparison.Ordinal))
return new ValidationResult("Path must be relative to this repository!");
if (Path.Exists(Path.GetFullPath(path, asm._repo.FullPath)))
return new ValidationResult("Give path is exists already!");
return ValidationResult.Success;
}
return new ValidationResult("Missing validation context");
}
public override Task<bool> Sure() public override Task<bool> Sure()
{ {
_repo.SetWatcherEnabled(false); _repo.SetWatcherEnabled(false);
@ -73,9 +55,20 @@ namespace SourceGit.ViewModels
var log = _repo.CreateLog("Add Submodule"); var log = _repo.CreateLog("Add Submodule");
Use(log); Use(log);
var relativePath = _relativePath;
if (string.IsNullOrEmpty(relativePath))
{
if (_url.EndsWith("/.git", StringComparison.Ordinal))
relativePath = Path.GetFileName(Path.GetDirectoryName(_url));
else if (_url.EndsWith(".git", StringComparison.Ordinal))
relativePath = Path.GetFileNameWithoutExtension(_url);
else
relativePath = Path.GetFileName(_url);
}
return Task.Run(() => return Task.Run(() =>
{ {
var succ = new Commands.Submodule(_repo.FullPath).Use(log).Add(_url, _relativePath, Recursive); var succ = new Commands.Submodule(_repo.FullPath).Use(log).Add(_url, relativePath, Recursive);
log.Complete(); log.Complete();
CallUIThread(() => _repo.SetWatcherEnabled(true)); CallUIThread(() => _repo.SetWatcherEnabled(true));