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

Client.Common.PathManager (unix): fixes to trymakerelative - Paths dialog now functions as it should #8

This commit is contained in:
Asnivor 2019-01-22 13:56:57 +00:00
parent 519e114721
commit dccaa2b878
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
BizHawk.Client.Common/PathManager.cs
View File

@ -407,9 +407,24 @@ namespace BizHawk.Client.Common
GetGlobalBasePathAbsolute() :
MakeAbsolutePath(GetPlatformBase(system), system);
if (IsSubfolder(parentPath, absolutePath))
if (!BizHawk.Common.PlatformLinkedLibSingleton.RunningOnUnix)
{
return absolutePath.Replace(parentPath, ".");
if (IsSubfolder(parentPath, absolutePath))
{
return absolutePath.Replace(parentPath, ".");
}
}
else
{
// weird kludges for linux systems
if (IsSubfolder(parentPath, absolutePath))
{
return absolutePath.Replace(parentPath.TrimEnd('.'), "./");
}
else if (parentPath.TrimEnd('.') == absolutePath + "/")
{
return ".";
}
}
return absolutePath;
@ -448,23 +463,30 @@ namespace BizHawk.Client.Common
}
else
{
// more weird linux stuff
var parentUri = new Uri(parentPath.TrimEnd('.'));
var childUri = new DirectoryInfo(childPath).Parent;
while (childUri != null)
try
{
var ch = new Uri(childUri.FullName).AbsolutePath.TrimEnd('/');
var pr = parentUri.AbsolutePath.TrimEnd('/');
if (ch == pr)
while (childUri != null)
{
return true;
var ch = new Uri(childUri.FullName).AbsolutePath.TrimEnd('/');
var pr = parentUri.AbsolutePath.TrimEnd('/');
if (ch == pr)
{
return true;
}
childUri = childUri.Parent;
}
childUri = childUri.Parent;
return false;
}
catch
{
return false;
}
return false;
}
}