admin/GeekDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复路径可能为空导致创建相对路径报错的问题

Browse Source
This commit is contained in:
liufei
2022-06-14 09:48:13 +08:00
parent d44cc90100
commit 896dc26f11
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Util/FileUtil.cs
View File

@@ -159,21 +159,7 @@ namespace GeekDesk.Util
public static string MakeRelativePath(string fromPath, string toPath) public static string MakeRelativePath(string fromPath, string toPath)
{ {
//if (string.IsNullOrEmpty(fromPath)) throw new ArgumentNullException("fromPath"); if (string.IsNullOrEmpty(toPath) || string.IsNullOrEmpty(fromPath)) return null;
//if (string.IsNullOrEmpty(toPath)) throw new ArgumentNullException("toPath");
//Uri fromUri = new Uri(fromPath);
//Uri toUri = new Uri(toPath);
//if (fromUri.Scheme != toUri.Scheme) { return toPath; } // path can't be made relative.
//Uri relativeUri = fromUri.MakeRelativeUri(toUri);
//string relativePath = Uri.UnescapeDataString(relativeUri.ToString());
//if (toUri.Scheme.Equals("file", StringComparison.InvariantCultureIgnoreCase))
//{
// relativePath = relativePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
//}
Uri file = new Uri(@toPath); Uri file = new Uri(@toPath);
// Must end in a slash to indicate folder // Must end in a slash to indicate folder
Uri folder = new Uri(@fromPath); Uri folder = new Uri(@fromPath);