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

Use correct file path property (see #2687) 

fixes adca19c30
This commit is contained in:
YoshiRulz 2021-11-09 21:10:42 +10:00
parent 56e22f34a5
commit 488b2954d6
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/BizHawk.Client.Common/movie/import/LsmvImport.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.Client.Common.movie.import
foreach (var item in zip.Entries) foreach (var item in zip.Entries)
{ {
if (item.Name == "authors") if (item.FullName == "authors")
{ {
using var stream = item.Open(); using var stream = item.Open();
string authors = Encoding.UTF8.GetString(stream.ReadAllBytes()); string authors = Encoding.UTF8.GetString(stream.ReadAllBytes());
@ -85,19 +85,19 @@ namespace BizHawk.Client.Common.movie.import
Result.Movie.HeaderEntries[HeaderKeys.Author] = authorList; Result.Movie.HeaderEntries[HeaderKeys.Author] = authorList;
} }
else if (item.Name == "coreversion") else if (item.FullName == "coreversion")
{ {
using var stream = item.Open(); using var stream = item.Open();
string coreVersion = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string coreVersion = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
Result.Movie.Comments.Add($"CoreOrigin {coreVersion}"); Result.Movie.Comments.Add($"CoreOrigin {coreVersion}");
} }
else if (item.Name == "gamename") else if (item.FullName == "gamename")
{ {
using var stream = item.Open(); using var stream = item.Open();
string gameName = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string gameName = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
Result.Movie.HeaderEntries[HeaderKeys.GameName] = gameName; Result.Movie.HeaderEntries[HeaderKeys.GameName] = gameName;
} }
else if (item.Name == "gametype") else if (item.FullName == "gametype")
{ {
using var stream = item.Open(); using var stream = item.Open();
string gametype = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string gametype = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
@ -122,7 +122,7 @@ namespace BizHawk.Client.Common.movie.import
bool pal = gametype == "snes_pal" || gametype == "sgb_pal"; bool pal = gametype == "snes_pal" || gametype == "sgb_pal";
Result.Movie.HeaderEntries[HeaderKeys.Pal] = pal.ToString(); Result.Movie.HeaderEntries[HeaderKeys.Pal] = pal.ToString();
} }
else if (item.Name == "input") else if (item.FullName == "input")
{ {
using var stream = item.Open(); using var stream = item.Open();
string input = Encoding.UTF8.GetString(stream.ReadAllBytes()); string input = Encoding.UTF8.GetString(stream.ReadAllBytes());
@ -156,7 +156,7 @@ namespace BizHawk.Client.Common.movie.import
} }
} }
} }
else if (item.Name.StartsWith("moviesram.")) else if (item.FullName.StartsWith("moviesram."))
{ {
using var stream = item.Open(); using var stream = item.Open();
byte[] movieSram = stream.ReadAllBytes(); byte[] movieSram = stream.ReadAllBytes();
@ -167,7 +167,7 @@ namespace BizHawk.Client.Common.movie.import
return; return;
} }
} }
else if (item.Name == "port1") else if (item.FullName == "port1")
{ {
using var stream = item.Open(); using var stream = item.Open();
string port1 = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string port1 = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
@ -175,7 +175,7 @@ namespace BizHawk.Client.Common.movie.import
ss.LeftPort = LibsnesControllerDeck.ControllerType.Gamepad; ss.LeftPort = LibsnesControllerDeck.ControllerType.Gamepad;
_deck = new LibsnesControllerDeck(ss); _deck = new LibsnesControllerDeck(ss);
} }
else if (item.Name == "port2") else if (item.FullName == "port2")
{ {
using var stream = item.Open(); using var stream = item.Open();
string port2 = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string port2 = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
@ -183,13 +183,13 @@ namespace BizHawk.Client.Common.movie.import
ss.RightPort = LibsnesControllerDeck.ControllerType.Gamepad; ss.RightPort = LibsnesControllerDeck.ControllerType.Gamepad;
_deck = new LibsnesControllerDeck(ss); _deck = new LibsnesControllerDeck(ss);
} }
else if (item.Name == "projectid") else if (item.FullName == "projectid")
{ {
using var stream = item.Open(); using var stream = item.Open();
string projectId = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string projectId = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
Result.Movie.HeaderEntries["ProjectID"] = projectId; Result.Movie.HeaderEntries["ProjectID"] = projectId;
} }
else if (item.Name == "rerecords") else if (item.FullName == "rerecords")
{ {
using var stream = item.Open(); using var stream = item.Open();
string rerecords = Encoding.UTF8.GetString(stream.ReadAllBytes()); string rerecords = Encoding.UTF8.GetString(stream.ReadAllBytes());
@ -207,20 +207,20 @@ namespace BizHawk.Client.Common.movie.import
Result.Movie.Rerecords = (ulong)rerecordCount; Result.Movie.Rerecords = (ulong)rerecordCount;
} }
else if (item.Name.EndsWith(".sha256")) else if (item.FullName.EndsWith(".sha256"))
{ {
using var stream = item.Open(); using var stream = item.Open();
string rom = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string rom = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
int pos = item.Name.LastIndexOf(".sha256"); int pos = item.FullName.LastIndexOf(".sha256");
string name = item.Name.Substring(0, pos); string name = item.FullName.Substring(0, pos);
Result.Movie.HeaderEntries[$"SHA256_{name}"] = rom; Result.Movie.HeaderEntries[$"SHA256_{name}"] = rom;
} }
else if (item.Name == "savestate") else if (item.FullName == "savestate")
{ {
Result.Errors.Add("Movies that begin with a savestate are not supported."); Result.Errors.Add("Movies that begin with a savestate are not supported.");
return; return;
} }
else if (item.Name == "subtitles") else if (item.FullName == "subtitles")
{ {
using var stream = item.Open(); using var stream = item.Open();
string subtitles = Encoding.UTF8.GetString(stream.ReadAllBytes()); string subtitles = Encoding.UTF8.GetString(stream.ReadAllBytes());
@ -237,19 +237,19 @@ namespace BizHawk.Client.Common.movie.import
} }
} }
} }
else if (item.Name == "starttime.second") else if (item.FullName == "starttime.second")
{ {
using var stream = item.Open(); using var stream = item.Open();
string startSecond = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string startSecond = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
Result.Movie.HeaderEntries["StartSecond"] = startSecond; Result.Movie.HeaderEntries["StartSecond"] = startSecond;
} }
else if (item.Name == "starttime.subsecond") else if (item.FullName == "starttime.subsecond")
{ {
using var stream = item.Open(); using var stream = item.Open();
string startSubSecond = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string startSubSecond = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();
Result.Movie.HeaderEntries["StartSubSecond"] = startSubSecond; Result.Movie.HeaderEntries["StartSubSecond"] = startSubSecond;
} }
else if (item.Name == "systemid") else if (item.FullName == "systemid")
{ {
using var stream = item.Open(); using var stream = item.Open();
string systemId = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim(); string systemId = Encoding.UTF8.GetString(stream.ReadAllBytes()).Trim();

2
src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
View File

@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
XElement templateRoot; XElement templateRoot;
using (var zfTemplate = new ZipArchive(new FileStream(templatePath, FileMode.Open, FileAccess.Read), ZipArchiveMode.Read)) using (var zfTemplate = new ZipArchive(new FileStream(templatePath, FileMode.Open, FileAccess.Read), ZipArchiveMode.Read))
{ {
var entry = zfTemplate.Entries.Single(e => e.Name == "Song.xml"); var entry = zfTemplate.Entries.Single(entry => entry.FullName == "Song.xml");
using var stream = entry.Open(); using var stream = entry.Open();
templateRoot = XElement.Load(stream); templateRoot = XElement.Load(stream);
} }