sendnrw/gaseous-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regression - Fixed media group save state loading (#409)

Browse Source
This commit is contained in:
Michael Green
2024-09-01 11:37:07 +10:00
committed by GitHub
parent deef919d5b
commit 6185912151
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gaseous-server/Controllers/V1.1/StateManagerController.cs
View File

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Identity;
using System.Data; using System.Data;
using Asp.Versioning; using Asp.Versioning;
using System.IO.Compression; using System.IO.Compression;
using gaseous_server.Classes.Metadata;
namespace gaseous_server.Controllers.v1_1 namespace gaseous_server.Controllers.v1_1
{ {
@@ -256,7 +257,25 @@ namespace gaseous_server.Controllers.v1_1
else else
{ {
// get rom data // get rom data
string romName = "";
string romMd5 = "";
string romSha1 = "";
if (IsMediaGroup == false)
{
Roms.GameRomItem romItem = Roms.GetRom(RomId); Roms.GameRomItem romItem = Roms.GetRom(RomId);
romName = romItem.Name;
romMd5 = romItem.Md5;
romSha1 = romItem.Sha1;
}
else
{
RomMediaGroup.GameRomMediaGroupItem mediaGroupItem = RomMediaGroup.GetMediaGroup(RomId);
IGDB.Models.Game game = Games.GetGame(mediaGroupItem.GameId, false, false, false);
Classes.Common.hashObject hashObject = new Classes.Common.hashObject(Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, mediaGroupItem.Id.ToString() + ".zip"));
romName = game.Name;
romMd5 = hashObject.md5hash;
romSha1 = hashObject.sha1hash;
}
byte[] bytes; byte[] bytes;
if ((bool)data.Rows[0]["Zipped"] == false) if ((bool)data.Rows[0]["Zipped"] == false)
@@ -268,7 +287,7 @@ namespace gaseous_server.Controllers.v1_1
bytes = Common.Decompress((byte[])data.Rows[0]["State"]); bytes = Common.Decompress((byte[])data.Rows[0]["State"]);
} }
string contentType = ""; string contentType = "";
string filename = ((DateTime)data.Rows[0]["StateDateTime"]).ToString("yyyy-MM-ddTHH-mm-ss") + "-" + Path.GetFileNameWithoutExtension(romItem.Name); string filename = ((DateTime)data.Rows[0]["StateDateTime"]).ToString("yyyy-MM-ddTHH-mm-ss") + "-" + Path.GetFileNameWithoutExtension(romName);
if (StateOnly == true) if (StateOnly == true)
@@ -283,14 +302,14 @@ namespace gaseous_server.Controllers.v1_1
Dictionary<string, object> RomInfo = new Dictionary<string, object> Dictionary<string, object> RomInfo = new Dictionary<string, object>
{ {
{ "Name", romItem.Name }, { "Name", romName },
{ "StateDateTime", data.Rows[0]["StateDateTime"] }, { "StateDateTime", data.Rows[0]["StateDateTime"] },
{ "StateName", data.Rows[0]["Name"] } { "StateName", data.Rows[0]["Name"] }
}; };
if ((int)data.Rows[0]["IsMediaGroup"] == 0) if ((int)data.Rows[0]["IsMediaGroup"] == 0)
{ {
RomInfo.Add("MD5", romItem.Md5); RomInfo.Add("MD5", romMd5);
RomInfo.Add("SHA1", romItem.Sha1); RomInfo.Add("SHA1", romSha1);
RomInfo.Add("Type", "ROM"); RomInfo.Add("Type", "ROM");
} }
else else