change HawkFile.CanonicalName to CanonicalFullPath, and add a new HawkFile.CanonicalName which returns the archive|member where CanonicalFullPath would be c:\path\to\archive|member
This commit is contained in:
parent
70b83e40ee
commit
90e5090e0e
|
@ -36,10 +36,15 @@ namespace BizHawk.MultiClient
|
|||
/// </summary>
|
||||
public bool IsBound { get { return boundStream != null; } }
|
||||
|
||||
/// <summary>
|
||||
/// returns the complete canonical full path ("c:\path\to\archive|member") of the bound file
|
||||
/// </summary>
|
||||
public string CanonicalFullPath { get { return MakeCanonicalName(rootPath,memberPath); } }
|
||||
|
||||
/// <summary>
|
||||
/// returns the complete canonical name ("archive|member") of the bound file
|
||||
/// </summary>
|
||||
public string CanonicalName { get { return MakeCanonicalName(rootPath,memberPath); } }
|
||||
public string CanonicalName { get { return MakeCanonicalName(Path.GetFileName(rootPath), memberPath); } }
|
||||
|
||||
/// <summary>
|
||||
/// returns the virtual name of the bound file (disregarding the archive)
|
||||
|
@ -168,7 +173,7 @@ namespace BizHawk.MultiClient
|
|||
extractor.ExtractFile(archiveIndex, boundStream);
|
||||
boundStream.Position = 0;
|
||||
memberPath = FixArchiveFilename(extractor.ArchiveFileNames[archiveIndex]); //TODO - maybe go through our own list of names? maybe not, its indexes dont match..
|
||||
Console.WriteLine("bound " + CanonicalName);
|
||||
Console.WriteLine("bound " + CanonicalFullPath);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
@ -189,7 +194,7 @@ namespace BizHawk.MultiClient
|
|||
void BindRoot()
|
||||
{
|
||||
boundStream = rootStream;
|
||||
Console.WriteLine("bound " + CanonicalName);
|
||||
Console.WriteLine("bound " + CanonicalFullPath);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -675,7 +675,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
Text = DisplayNameForSystem(game.System) + " - " + game.Name;
|
||||
ResetRewindBuffer();
|
||||
Global.Config.RecentRoms.Add(file.CanonicalName);
|
||||
Global.Config.RecentRoms.Add(file.CanonicalFullPath);
|
||||
if (File.Exists(game.SaveRamPath))
|
||||
LoadSaveRam();
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace BizHawk.MultiClient
|
|||
if (file.Extension == "SMD")
|
||||
RomData = DeInterleaveSMD(RomData);
|
||||
|
||||
var info = Database.GetGameInfo(RomData, file.Name);
|
||||
var info = Database.GetGameInfo(RomData, file.Name);
|
||||
name = info.Name;
|
||||
System = info.System;
|
||||
options = new List<string>(info.GetOptions());
|
||||
|
|
Loading…
Reference in New Issue