Improve metadata first load performance (#46)
* fix: reduces the number of full metadata calls - speeding up imports #45 * chore(deps): update EmulatorJS
This commit is contained in:
@@ -267,7 +267,7 @@ namespace gaseous_server.Classes
|
|||||||
if (games.Length == 1)
|
if (games.Length == 1)
|
||||||
{
|
{
|
||||||
// exact match!
|
// exact match!
|
||||||
determinedGame = Metadata.Games.GetGame((long)games[0].Id, false, false);
|
determinedGame = Metadata.Games.GetGame((long)games[0].Id, false, false, false);
|
||||||
Logging.Log(Logging.LogType.Information, "Import Game", " IGDB game: " + determinedGame.Name);
|
Logging.Log(Logging.LogType.Information, "Import Game", " IGDB game: " + determinedGame.Name);
|
||||||
GameFound = true;
|
GameFound = true;
|
||||||
break;
|
break;
|
||||||
@@ -425,7 +425,7 @@ namespace gaseous_server.Classes
|
|||||||
|
|
||||||
// get metadata
|
// get metadata
|
||||||
IGDB.Models.Platform platform = gaseous_server.Classes.Metadata.Platforms.GetPlatform(rom.PlatformId);
|
IGDB.Models.Platform platform = gaseous_server.Classes.Metadata.Platforms.GetPlatform(rom.PlatformId);
|
||||||
IGDB.Models.Game game = gaseous_server.Classes.Metadata.Games.GetGame(rom.GameId, false, false);
|
IGDB.Models.Game game = gaseous_server.Classes.Metadata.Games.GetGame(rom.GameId, false, false, false);
|
||||||
|
|
||||||
// build path
|
// build path
|
||||||
string platformSlug = "Unknown Platform";
|
string platformSlug = "Unknown Platform";
|
||||||
|
@@ -21,7 +21,7 @@ namespace gaseous_server.Classes.Metadata
|
|||||||
Config.IGDB.Secret
|
Config.IGDB.Secret
|
||||||
);
|
);
|
||||||
|
|
||||||
public static Game? GetGame(long Id, bool followSubGames, bool forceRefresh)
|
public static Game? GetGame(long Id, bool getAllMetadata, bool followSubGames, bool forceRefresh)
|
||||||
{
|
{
|
||||||
if (Id == 0)
|
if (Id == 0)
|
||||||
{
|
{
|
||||||
@@ -45,14 +45,14 @@ namespace gaseous_server.Classes.Metadata
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Task<Game> RetVal = _GetGame(SearchUsing.id, Id, followSubGames, forceRefresh);
|
Task<Game> RetVal = _GetGame(SearchUsing.id, Id, getAllMetadata, followSubGames, forceRefresh);
|
||||||
return RetVal.Result;
|
return RetVal.Result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Game GetGame(string Slug, bool followSubGames, bool forceRefresh)
|
public static Game GetGame(string Slug, bool getAllMetadata, bool followSubGames, bool forceRefresh)
|
||||||
{
|
{
|
||||||
Task<Game> RetVal = _GetGame(SearchUsing.slug, Slug, followSubGames, forceRefresh);
|
Task<Game> RetVal = _GetGame(SearchUsing.slug, Slug, getAllMetadata, followSubGames, forceRefresh);
|
||||||
return RetVal.Result;
|
return RetVal.Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ namespace gaseous_server.Classes.Metadata
|
|||||||
return Storage.BuildCacheObject<Game>(new Game(), dataRow);
|
return Storage.BuildCacheObject<Game>(new Game(), dataRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<Game> _GetGame(SearchUsing searchUsing, object searchValue, bool followSubGames = false, bool forceRefresh = false)
|
private static async Task<Game> _GetGame(SearchUsing searchUsing, object searchValue, bool getAllMetadata = true, bool followSubGames = false, bool forceRefresh = false)
|
||||||
{
|
{
|
||||||
// check database first
|
// check database first
|
||||||
Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
|
Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
|
||||||
@@ -99,12 +99,12 @@ namespace gaseous_server.Classes.Metadata
|
|||||||
case Storage.CacheStatus.NotPresent:
|
case Storage.CacheStatus.NotPresent:
|
||||||
returnValue = await GetObjectFromServer(WhereClause);
|
returnValue = await GetObjectFromServer(WhereClause);
|
||||||
Storage.NewCacheValue(returnValue);
|
Storage.NewCacheValue(returnValue);
|
||||||
UpdateSubClasses(returnValue, followSubGames);
|
UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
|
||||||
return returnValue;
|
return returnValue;
|
||||||
case Storage.CacheStatus.Expired:
|
case Storage.CacheStatus.Expired:
|
||||||
returnValue = await GetObjectFromServer(WhereClause);
|
returnValue = await GetObjectFromServer(WhereClause);
|
||||||
Storage.NewCacheValue(returnValue, true);
|
Storage.NewCacheValue(returnValue, true);
|
||||||
UpdateSubClasses(returnValue, followSubGames);
|
UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
|
||||||
return returnValue;
|
return returnValue;
|
||||||
case Storage.CacheStatus.Current:
|
case Storage.CacheStatus.Current:
|
||||||
return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
|
return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
|
||||||
@@ -113,117 +113,120 @@ namespace gaseous_server.Classes.Metadata
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void UpdateSubClasses(Game Game, bool followSubGames)
|
private static void UpdateSubClasses(Game Game, bool getAllMetadata, bool followSubGames)
|
||||||
{
|
{
|
||||||
if (Game.AgeRatings != null)
|
|
||||||
{
|
|
||||||
foreach (long AgeRatingId in Game.AgeRatings.Ids)
|
|
||||||
{
|
|
||||||
AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.AlternativeNames != null)
|
|
||||||
{
|
|
||||||
foreach (long AlternativeNameId in Game.AlternativeNames.Ids)
|
|
||||||
{
|
|
||||||
AlternativeName GameAlternativeName = AlternativeNames.GetAlternativeNames(AlternativeNameId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Artworks != null)
|
|
||||||
{
|
|
||||||
foreach (long ArtworkId in Game.Artworks.Ids)
|
|
||||||
{
|
|
||||||
Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (followSubGames)
|
|
||||||
{
|
|
||||||
List<long> gamesToFetch = new List<long>();
|
|
||||||
if (Game.Bundles != null) { gamesToFetch.AddRange(Game.Bundles.Ids); }
|
|
||||||
if (Game.Dlcs != null) { gamesToFetch.AddRange(Game.Dlcs.Ids); }
|
|
||||||
if (Game.Expansions != null) { gamesToFetch.AddRange(Game.Expansions.Ids); }
|
|
||||||
if (Game.ParentGame != null) { gamesToFetch.Add((long)Game.ParentGame.Id); }
|
|
||||||
//if (Game.SimilarGames != null) { gamesToFetch.AddRange(Game.SimilarGames.Ids); }
|
|
||||||
if (Game.StandaloneExpansions != null) { gamesToFetch.AddRange(Game.StandaloneExpansions.Ids); }
|
|
||||||
if (Game.VersionParent != null) { gamesToFetch.Add((long)Game.VersionParent.Id); }
|
|
||||||
|
|
||||||
foreach (long gameId in gamesToFetch)
|
|
||||||
{
|
|
||||||
Game relatedGame = GetGame(gameId, false, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Collection != null)
|
|
||||||
{
|
|
||||||
Collection GameCollection = Collections.GetCollections(Game.Collection.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Cover != null)
|
if (Game.Cover != null)
|
||||||
{
|
{
|
||||||
Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Game.ExternalGames != null)
|
if (getAllMetadata == true)
|
||||||
{
|
{
|
||||||
foreach (long ExternalGameId in Game.ExternalGames.Ids)
|
if (Game.AgeRatings != null)
|
||||||
{
|
{
|
||||||
ExternalGame GameExternalGame = ExternalGames.GetExternalGames(ExternalGameId);
|
foreach (long AgeRatingId in Game.AgeRatings.Ids)
|
||||||
|
{
|
||||||
|
AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Franchise != null)
|
if (Game.AlternativeNames != null)
|
||||||
{
|
|
||||||
Franchise GameFranchise = Franchises.GetFranchises(Game.Franchise.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Franchises != null)
|
|
||||||
{
|
|
||||||
foreach (long FranchiseId in Game.Franchises.Ids)
|
|
||||||
{
|
{
|
||||||
Franchise GameFranchise = Franchises.GetFranchises(FranchiseId);
|
foreach (long AlternativeNameId in Game.AlternativeNames.Ids)
|
||||||
|
{
|
||||||
|
AlternativeName GameAlternativeName = AlternativeNames.GetAlternativeNames(AlternativeNameId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Genres != null)
|
if (Game.Artworks != null)
|
||||||
{
|
|
||||||
foreach (long GenreId in Game.Genres.Ids)
|
|
||||||
{
|
{
|
||||||
Genre GameGenre = Genres.GetGenres(GenreId);
|
foreach (long ArtworkId in Game.Artworks.Ids)
|
||||||
|
{
|
||||||
|
Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.InvolvedCompanies != null)
|
if (followSubGames)
|
||||||
{
|
|
||||||
foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
|
|
||||||
{
|
{
|
||||||
InvolvedCompany involvedCompany = InvolvedCompanies.GetInvolvedCompanies(involvedCompanyId);
|
List<long> gamesToFetch = new List<long>();
|
||||||
|
if (Game.Bundles != null) { gamesToFetch.AddRange(Game.Bundles.Ids); }
|
||||||
|
if (Game.Dlcs != null) { gamesToFetch.AddRange(Game.Dlcs.Ids); }
|
||||||
|
if (Game.Expansions != null) { gamesToFetch.AddRange(Game.Expansions.Ids); }
|
||||||
|
if (Game.ParentGame != null) { gamesToFetch.Add((long)Game.ParentGame.Id); }
|
||||||
|
//if (Game.SimilarGames != null) { gamesToFetch.AddRange(Game.SimilarGames.Ids); }
|
||||||
|
if (Game.StandaloneExpansions != null) { gamesToFetch.AddRange(Game.StandaloneExpansions.Ids); }
|
||||||
|
if (Game.VersionParent != null) { gamesToFetch.Add((long)Game.VersionParent.Id); }
|
||||||
|
|
||||||
|
foreach (long gameId in gamesToFetch)
|
||||||
|
{
|
||||||
|
Game relatedGame = GetGame(gameId, false, true, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Platforms != null)
|
if (Game.Collection != null)
|
||||||
{
|
|
||||||
foreach (long PlatformId in Game.Platforms.Ids)
|
|
||||||
{
|
{
|
||||||
Platform GamePlatform = Platforms.GetPlatform(PlatformId);
|
Collection GameCollection = Collections.GetCollections(Game.Collection.Id);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Screenshots != null)
|
if (Game.ExternalGames != null)
|
||||||
{
|
|
||||||
foreach (long ScreenshotId in Game.Screenshots.Ids)
|
|
||||||
{
|
{
|
||||||
Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
foreach (long ExternalGameId in Game.ExternalGames.Ids)
|
||||||
|
{
|
||||||
|
ExternalGame GameExternalGame = ExternalGames.GetExternalGames(ExternalGameId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (Game.Videos != null)
|
if (Game.Franchise != null)
|
||||||
{
|
|
||||||
foreach (long GameVideoId in Game.Videos.Ids)
|
|
||||||
{
|
{
|
||||||
GameVideo gameVideo = GamesVideos.GetGame_Videos(GameVideoId);
|
Franchise GameFranchise = Franchises.GetFranchises(Game.Franchise.Id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.Franchises != null)
|
||||||
|
{
|
||||||
|
foreach (long FranchiseId in Game.Franchises.Ids)
|
||||||
|
{
|
||||||
|
Franchise GameFranchise = Franchises.GetFranchises(FranchiseId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.Genres != null)
|
||||||
|
{
|
||||||
|
foreach (long GenreId in Game.Genres.Ids)
|
||||||
|
{
|
||||||
|
Genre GameGenre = Genres.GetGenres(GenreId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.InvolvedCompanies != null)
|
||||||
|
{
|
||||||
|
foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
|
||||||
|
{
|
||||||
|
InvolvedCompany involvedCompany = InvolvedCompanies.GetInvolvedCompanies(involvedCompanyId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.Platforms != null)
|
||||||
|
{
|
||||||
|
foreach (long PlatformId in Game.Platforms.Ids)
|
||||||
|
{
|
||||||
|
Platform GamePlatform = Platforms.GetPlatform(PlatformId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.Screenshots != null)
|
||||||
|
{
|
||||||
|
foreach (long ScreenshotId in Game.Screenshots.Ids)
|
||||||
|
{
|
||||||
|
Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Game.Videos != null)
|
||||||
|
{
|
||||||
|
foreach (long GameVideoId in Game.Videos.Ids)
|
||||||
|
{
|
||||||
|
GameVideo gameVideo = GamesVideos.GetGame_Videos(GameVideoId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,7 +17,7 @@ namespace gaseous_server.Classes
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for game " + dr["name"] + " (" + dr["id"] + ")");
|
Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for game " + dr["name"] + " (" + dr["id"] + ")");
|
||||||
Metadata.Games.GetGame((long)dr["id"], true, forceRefresh);
|
Metadata.Games.GetGame((long)dr["id"], true, true, forceRefresh);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
@@ -56,7 +56,7 @@ namespace gaseous_server.Classes
|
|||||||
IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId);
|
IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId);
|
||||||
|
|
||||||
// ensure metadata for gameid is present
|
// ensure metadata for gameid is present
|
||||||
IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
|
Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
|
||||||
string sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid WHERE Id = @id";
|
string sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid WHERE Id = @id";
|
||||||
|
@@ -136,7 +136,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, forceRefresh);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, forceRefresh, false, forceRefresh);
|
||||||
|
|
||||||
if (gameObject != null)
|
if (gameObject != null)
|
||||||
{
|
{
|
||||||
@@ -162,7 +162,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
if (gameObject.AlternativeNames != null)
|
if (gameObject.AlternativeNames != null)
|
||||||
{
|
{
|
||||||
@@ -193,7 +193,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
if (gameObject.AgeRatings != null)
|
if (gameObject.AgeRatings != null)
|
||||||
{
|
{
|
||||||
@@ -303,7 +303,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
List<Artwork> artworks = new List<Artwork>();
|
List<Artwork> artworks = new List<Artwork>();
|
||||||
if (gameObject.Artworks != null)
|
if (gameObject.Artworks != null)
|
||||||
@@ -332,7 +332,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -365,7 +365,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -420,7 +420,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
if (gameObject != null)
|
if (gameObject != null)
|
||||||
{
|
{
|
||||||
IGDB.Models.Cover coverObject = Covers.GetCover(gameObject.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
IGDB.Models.Cover coverObject = Covers.GetCover(gameObject.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
||||||
@@ -452,7 +452,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Cover.png");
|
string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Cover.png");
|
||||||
if (System.IO.File.Exists(coverFilePath)) {
|
if (System.IO.File.Exists(coverFilePath)) {
|
||||||
@@ -492,7 +492,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
if (gameObject != null)
|
if (gameObject != null)
|
||||||
{
|
{
|
||||||
List<IGDB.Models.Genre> genreObjects = new List<Genre>();
|
List<IGDB.Models.Genre> genreObjects = new List<Genre>();
|
||||||
@@ -528,7 +528,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
if (gameObject != null)
|
if (gameObject != null)
|
||||||
{
|
{
|
||||||
List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
|
List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
|
||||||
@@ -571,7 +571,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
if (gameObject != null)
|
if (gameObject != null)
|
||||||
{
|
{
|
||||||
List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
|
List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
|
||||||
@@ -611,7 +611,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
InvolvedCompany involvedCompany = Classes.Metadata.InvolvedCompanies.GetInvolvedCompanies(CompanyId);
|
InvolvedCompany involvedCompany = Classes.Metadata.InvolvedCompanies.GetInvolvedCompanies(CompanyId);
|
||||||
Company company = Classes.Metadata.Companies.GetCompanies(involvedCompany.Company.Id);
|
Company company = Classes.Metadata.Companies.GetCompanies(involvedCompany.Company.Id);
|
||||||
@@ -655,7 +655,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
List<Classes.Roms.GameRomItem> roms = Classes.Roms.GetRoms(GameId);
|
List<Classes.Roms.GameRomItem> roms = Classes.Roms.GetRoms(GameId);
|
||||||
|
|
||||||
@@ -676,7 +676,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
||||||
if (rom.GameId == GameId)
|
if (rom.GameId == GameId)
|
||||||
@@ -702,7 +702,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
||||||
if (rom.GameId == GameId)
|
if (rom.GameId == GameId)
|
||||||
@@ -729,7 +729,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
||||||
if (rom.GameId == GameId)
|
if (rom.GameId == GameId)
|
||||||
@@ -757,7 +757,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
||||||
if (rom.GameId != GameId)
|
if (rom.GameId != GameId)
|
||||||
@@ -792,7 +792,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
|
||||||
if (rom.GameId != GameId || rom.Name != FileName)
|
if (rom.GameId != GameId || rom.Name != FileName)
|
||||||
@@ -864,7 +864,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
List<Screenshot> screenshots = new List<Screenshot>();
|
List<Screenshot> screenshots = new List<Screenshot>();
|
||||||
if (gameObject.Screenshots != null)
|
if (gameObject.Screenshots != null)
|
||||||
@@ -893,7 +893,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
if (gameObject != null) {
|
if (gameObject != null) {
|
||||||
IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
||||||
if (screenshotObject != null)
|
if (screenshotObject != null)
|
||||||
@@ -924,7 +924,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
|
||||||
|
|
||||||
@@ -967,7 +967,7 @@ namespace gaseous_server.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
|
Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
|
||||||
|
|
||||||
List<GameVideo> videos = new List<GameVideo>();
|
List<GameVideo> videos = new List<GameVideo>();
|
||||||
if (gameObject.Videos != null)
|
if (gameObject.Videos != null)
|
||||||
|
@@ -114,7 +114,7 @@ app.MapControllers();
|
|||||||
Config.LibraryConfiguration.InitLibrary();
|
Config.LibraryConfiguration.InitLibrary();
|
||||||
|
|
||||||
// insert unknown platform and game if not present
|
// insert unknown platform and game if not present
|
||||||
gaseous_server.Classes.Metadata.Games.GetGame(0, false, false);
|
gaseous_server.Classes.Metadata.Games.GetGame(0, false, false, false);
|
||||||
gaseous_server.Classes.Metadata.Platforms.GetPlatform(0);
|
gaseous_server.Classes.Metadata.Platforms.GetPlatform(0);
|
||||||
|
|
||||||
// organise library
|
// organise library
|
||||||
|
@@ -121,6 +121,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Remove="Support\PlatformMap.json" />
|
<Content Remove="Support\PlatformMap.json" />
|
||||||
<Content Remove="wwwroot\pages\settings\" />
|
<Content Remove="wwwroot\pages\settings\" />
|
||||||
|
<Content Remove="wwwroot\scripts\jquery.lazy.plugins.min.js" />
|
||||||
|
<Content Remove="wwwroot\scripts\jquery.lazy.min.js" />
|
||||||
|
<Content Remove="wwwroot\pages\dialogs\romsdelete.html" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<EmbeddedResource Include="Support\PlatformMap.json" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'">
|
<EmbeddedResource Include="Support\PlatformMap.json" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'">
|
||||||
|
Reference in New Issue
Block a user