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

WIP

Browse Source
This commit is contained in:
Michael Green
2024-12-19 09:15:01 +11:00
parent a859d873e6
commit c724d927bb
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gaseous-server/Classes/FileSignature.cs
View File

@@ -2,7 +2,7 @@ using System.Collections.Concurrent;
using System.IO.Compression; using System.IO.Compression;
using System.Net; using System.Net;
using gaseous_server.Classes.Metadata; using gaseous_server.Classes.Metadata;
using HasheousClient.Models; using gaseous_server.Models;
using HasheousClient.Models.Metadata.IGDB; using HasheousClient.Models.Metadata.IGDB;
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using NuGet.Common; using NuGet.Common;
@@ -199,7 +199,7 @@ namespace gaseous_server.Classes
else else
{ {
determinedPlatform = Metadata.Platforms.GetPlatform((long)library.DefaultPlatformId); determinedPlatform = Metadata.Platforms.GetPlatform((long)library.DefaultPlatformId);
discoveredSignature.MetadataSources.AddPlatform((long)determinedPlatform.Id, determinedPlatform.Name, MetadataSources.None); discoveredSignature.MetadataSources.AddPlatform((long)determinedPlatform.Id, determinedPlatform.Name, HasheousClient.Models.MetadataSources.None);
} }
return discoveredSignature; return discoveredSignature;
@@ -308,10 +308,10 @@ namespace gaseous_server.Classes
{ {
HasheousClient.Hasheous hasheous = new HasheousClient.Hasheous(); HasheousClient.Hasheous hasheous = new HasheousClient.Hasheous();
Console.WriteLine(HasheousClient.WebApp.HttpHelper.BaseUri); Console.WriteLine(HasheousClient.WebApp.HttpHelper.BaseUri);
LookupItemModel? HasheousResult = null; HasheousClient.Models.LookupItemModel? HasheousResult = null;
try try
{ {
HasheousResult = hasheous.RetrieveFromHasheous(new HashLookupModel HasheousResult = hasheous.RetrieveFromHasheous(new HasheousClient.Models.HashLookupModel
{ {
MD5 = hash.md5hash, MD5 = hash.md5hash,
SHA1 = hash.sha1hash SHA1 = hash.sha1hash
@@ -334,10 +334,14 @@ namespace gaseous_server.Classes
{ {
foreach (HasheousClient.Models.MetadataItem metadataResult in HasheousResult.Platform.metadata) foreach (HasheousClient.Models.MetadataItem metadataResult in HasheousResult.Platform.metadata)
{ {
if (metadataResult.Id.Length > 0) // only IGDB metadata is supported
if (metadataResult.Source == HasheousClient.Models.MetadataSources.IGDB)
{ {
Platform hasheousPlatform = Platforms.GetPlatform(metadataResult.Id); if (metadataResult.Id.Length > 0)
signature.MetadataSources.AddPlatform((long)hasheousPlatform.Id, hasheousPlatform.Name, metadataResult.Source); {
Platform hasheousPlatform = Platforms.GetPlatform(metadataResult.Id);
signature.MetadataSources.AddPlatform((long)hasheousPlatform.Id, hasheousPlatform.Name, metadataResult.Source);
}
} }
} }
} }
@@ -350,10 +354,14 @@ namespace gaseous_server.Classes
{ {
foreach (HasheousClient.Models.MetadataItem metadataResult in HasheousResult.Metadata) foreach (HasheousClient.Models.MetadataItem metadataResult in HasheousResult.Metadata)
{ {
if (metadataResult.Id.Length > 0) // only IGDB metadata is supported
if (metadataResult.Source == HasheousClient.Models.MetadataSources.IGDB)
{ {
Game hasheousGame = Games.GetGame(MetadataSources.IGDB, metadataResult.Id); if (metadataResult.Id.Length > 0)
signature.MetadataSources.AddGame((long)hasheousGame.Id, hasheousGame.Name, metadataResult.Source); {
gaseous_server.Models.Game hasheousGame = Games.GetGame(HasheousClient.Models.MetadataSources.IGDB, metadataResult.Id);
signature.MetadataSources.AddGame((long)hasheousGame.Id, hasheousGame.Name, metadataResult.Source);
}
} }
} }
} }

19
gaseous-server/Classes/MetadataManagement.cs
View File

@@ -9,6 +9,8 @@ namespace gaseous_server.Classes
{ {
public class MetadataManagement : QueueItemStatus public class MetadataManagement : QueueItemStatus
{ {
private static bool Processing = false;
/// <summary> /// <summary>
/// Creates a new metadata map, if one with the same platformId and name does not already exist. /// Creates a new metadata map, if one with the same platformId and name does not already exist.
/// </summary> /// </summary>
@@ -23,6 +25,16 @@ namespace gaseous_server.Classes
/// </returns> /// </returns>
public static MetadataMap? NewMetadataMap(long platformId, string name) public static MetadataMap? NewMetadataMap(long platformId, string name)
{ {
if (Processing == true)
{
// loop until processing = false
while (Processing == true)
{
System.Threading.Thread.Sleep(500);
}
}
Processing = true;
Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
string sql = ""; string sql = "";
Dictionary<string, object> dbDict = new Dictionary<string, object>() Dictionary<string, object> dbDict = new Dictionary<string, object>()
@@ -36,6 +48,7 @@ namespace gaseous_server.Classes
MetadataMap? existingMetadataMap = GetMetadataMap(platformId, name); MetadataMap? existingMetadataMap = GetMetadataMap(platformId, name);
if (existingMetadataMap != null) if (existingMetadataMap != null)
{ {
Processing = false;
return existingMetadataMap; return existingMetadataMap;
} }
@@ -62,7 +75,9 @@ namespace gaseous_server.Classes
AddMetadataMapItem(metadataMapId, HasheousClient.Models.MetadataSources.None, gameId, true); AddMetadataMapItem(metadataMapId, HasheousClient.Models.MetadataSources.None, gameId, true);
// return the new metadata map // return the new metadata map
return GetMetadataMap(metadataMapId); MetadataMap RetVal = GetMetadataMap(metadataMapId);
Processing = false;
return RetVal;
} }
/// <summary> /// <summary>
@@ -129,7 +144,7 @@ namespace gaseous_server.Classes
Dictionary<string, object> dbDict = new Dictionary<string, object>() Dictionary<string, object> dbDict = new Dictionary<string, object>()
{ {
{ "@platformId", platformId }, { "@platformId", platformId },
{ "@name", name } { "@name", name.Trim() }
}; };
DataTable dt = new DataTable(); DataTable dt = new DataTable();

2
gaseous-server/Controllers/V1.1/GamesController.cs
View File

@@ -550,7 +550,7 @@ FROM
LEFT JOIN LEFT JOIN
Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId
LEFT JOIN LEFT JOIN
Favourites ON Game.Id = Favourites.GameId AND Favourites.UserId = @userid " + whereClause + " " + havingClause + " " + orderByClause; Favourites ON Game.MetadataMapId = Favourites.GameId AND Favourites.UserId = @userid " + whereClause + " " + havingClause + " " + orderByClause;
List<Games.MinimalGameItem> RetVal = new List<Games.MinimalGameItem>(); List<Games.MinimalGameItem> RetVal = new List<Games.MinimalGameItem>();
DataTable dbResponse = db.ExecuteCMD(sql, whereParams, new Database.DatabaseMemoryCacheOptions(CacheEnabled: true, ExpirationSeconds: 60)); DataTable dbResponse = db.ExecuteCMD(sql, whereParams, new Database.DatabaseMemoryCacheOptions(CacheEnabled: true, ExpirationSeconds: 60));

2
gaseous-server/gaseous-server.csproj
View File

@@ -20,7 +20,7 @@
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" /> <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="gaseous-signature-parser" Version="2.3.0" /> <PackageReference Include="gaseous-signature-parser" Version="2.3.0" />
<PackageReference Include="gaseous.IGDB" Version="1.0.2" /> <PackageReference Include="gaseous.IGDB" Version="1.0.2" />
<PackageReference Include="hasheous-client" Version="1.2.0" /> <PackageReference Include="hasheous-client" Version="1.2.1" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.8.0" /> <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="13.8.0" />
<PackageReference Include="sharpcompress" Version="0.37.2" /> <PackageReference Include="sharpcompress" Version="0.37.2" />
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.2.24" /> <PackageReference Include="Squid-Box.SevenZipSharp" Version="1.6.2.24" />

4
gaseous-server/wwwroot/scripts/gamesformating.js
View File

@@ -405,8 +405,6 @@ function renderGameIcon(gameObject, showTitle, showRatings, showClassification,
showFavourite = true; showFavourite = true;
} }
console.log(gameObject);
let classes = getViewModeClasses(listView); let classes = getViewModeClasses(listView);
let gameBox = document.createElement('div'); let gameBox = document.createElement('div');
@@ -532,7 +530,7 @@ function renderGameIcon(gameObject, showTitle, showRatings, showClassification,
gameObject.isFavourite = true; gameObject.isFavourite = true;
} }
fetch('/api/v1.1/Games/' + gameObject.metaDataMapId + '/favourite?favourite=' + gameObject.isFavourite, { fetch('/api/v1.1/Games/' + gameObject.metadataMapId + '/favourite?favourite=' + gameObject.isFavourite, {
method: 'POST' method: 'POST'
}).then(response => { }).then(response => {
if (response.ok) { if (response.ok) {

6
gaseous-server/wwwroot/scripts/uploadrom.js
View File

@@ -124,11 +124,11 @@ class UploadRom {
uploadedItem.romId = response.romid; uploadedItem.romId = response.romid;
if (response.game) { if (response.game) {
uploadedItem.gameId = response.game.id; uploadedItem.gameId = response.game.metadataMapId;
uploadedItem.gameName = response.game.name; uploadedItem.gameName = response.game.name;
if (response.game.cover != null) { if (response.game.cover != null) {
if (response.game.cover.id != null) { if (response.game.cover != null) {
uploadedItem.coverId = response.game.cover.id; uploadedItem.coverId = response.game.cover;
} }
} }
} }