ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Unix implementation of GetRelativePath; expand on docs

This commit is contained in:
YoshiRulz 2021-01-31 10:02:45 +10:00
parent 20b93d4690
commit 6858a36552
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
View File

@ -213,7 +213,7 @@ namespace BizHawk.Client.EmuHawk
new XElement("LoadAssets",
names.Select(n => new XElement(
"Asset",
new XAttribute("FileName", OSTailoredCode.IsUnixHost ? PathExtensions.GetRelativePath(n, basePath) : PathExtensions.GetRelativePath(basePath, n))
new XAttribute("FileName", PathExtensions.GetRelativePath(basePath, n))
))
)
);

13
src/BizHawk.Common/Extensions/PathExtensions.cs
View File

@ -50,11 +50,15 @@ namespace BizHawk.Common.PathExtensions
/// <exception cref="ArgumentException">running on Windows host, and unmanaged call failed</exception>
/// <exception cref="FileNotFoundException">running on Windows host, and either path is not a regular file or directory</exception>
/// <remarks>Algorithm for Windows taken from https://stackoverflow.com/a/485516/7467292</remarks>
/// <remarks>
/// always returns a relative path, even if it means going up first<br/>
/// algorithm for Windows taken from https://stackoverflow.com/a/485516/7467292<br/>
/// the parameter names seem backwards, but those are the names used in the Win32 API we're calling
/// </remarks>
public static string? GetRelativePath(string? fromPath, string? toPath)
{
if (fromPath == null || toPath == null) return null;
if (OSTailoredCode.IsUnixHost) return fromPath.MakeRelativeTo(toPath);
if (OSTailoredCode.IsUnixHost) return toPath.MakeRelativeTo(fromPath);
//TODO merge this with the Windows implementation in MakeRelativeTo
static FileAttributes GetPathAttribute(string path1)
@ -87,7 +91,10 @@ namespace BizHawk.Common.PathExtensions
public static string MakeProgramRelativePath(this string path) => Path.Combine(PathUtils.ExeDirectoryPath, path);
/// <returns>the relative path which is equivalent to <paramref name="absolutePath"/> when the CWD is <paramref name="basePath"/>, or <see langword="null"/> if either path is <see langword="null"/></returns>
/// <remarks>returned string omits trailing slash; implementation calls <see cref="IsSubfolderOf"/> for you</remarks>
/// <remarks>
/// only returns a relative path if <paramref name="absolutePath"/> is a child of <paramref name="basePath"/> (uses <see cref="IsSubfolderOf"/>), otherwise returns <paramref name="absolutePath"/><br/>
/// returned string omits trailing slash
/// </remarks>
public static string? MakeRelativeTo(this string? absolutePath, string? basePath)
{
if (absolutePath == null || basePath == null) return null;