Add missing indexes (#238)

* Add missing index

* Check of indexes

README.MD

@@ -1,6 +1,6 @@
 # Gaseous Server
 
-This is the server for the Gaseous system. It offers ROM and title management, as well as some basic in browser emulation of those ROM's.
+This is the server for the Gaseous system. It offers ROM and title management, as well as some basic in browser emulation of those ROMs.
 
 ## Warning
 

gaseous-server/Classes/Auth/Models/SecurityProfileViewModel.cs

@@ -5,13 +5,13 @@ namespace Authentication
     public class SecurityProfileViewModel
     {
         public AgeRestrictionItem AgeRestrictionPolicy { get; set; } = new AgeRestrictionItem{ 
-            MaximumAgeRestriction = gaseous_server.Classes.Metadata.AgeRatings.AgeGroups.AgeRestrictionGroupings.Adult,
+            MaximumAgeRestriction = gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings.Adult,
             IncludeUnrated = true 
         };
 
         public class AgeRestrictionItem
         {
-            public gaseous_server.Classes.Metadata.AgeRatings.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction { get; set; }
+            public gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction { get; set; }
             public bool IncludeUnrated { get; set; }
         }
     }

gaseous-server/Classes/Collections.cs

@@ -10,6 +10,7 @@ using gaseous_server.Controllers;
 using gaseous_server.Models;
 using IGDB.Models;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Newtonsoft.Json;
 
 namespace gaseous_server.Classes
@@ -219,8 +220,11 @@ namespace gaseous_server.Classes
                 }
             } else {
                 // get all platforms to pull from
-                Dictionary<string, object> FilterDict = Filters.Filter(AgeRatings.AgeGroups.AgeRestrictionGroupings.Adult, true);
-                platforms.AddRange((List<Filters.FilterPlatform>)FilterDict["platforms"]);
+                Dictionary<string, List<Filters.FilterItem>> FilterDict = Filters.Filter(AgeGroups.AgeRestrictionGroupings.Adult, true);
+                List<Classes.Filters.FilterItem> filteredPlatforms = (List<Classes.Filters.FilterItem>)FilterDict["platforms"];
+                foreach (Filters.FilterItem filterItem in filteredPlatforms) {
+                    platforms.Add(Platforms.GetPlatform(filterItem.Id));
+                }
             }
 
             // build collection
@@ -495,7 +499,7 @@ namespace gaseous_server.Classes
                                     if (File.Exists(gameRomItem.Path))
                                     {
                                         Logging.Log(Logging.LogType.Information, "Collections", "Copying ROM: " + gameRomItem.Name);
-                                        File.Copy(gameRomItem.Path, Path.Combine(ZipGamePath, gameRomItem.Name));
+                                        File.Copy(gameRomItem.Path, Path.Combine(ZipGamePath, gameRomItem.Name), true);
                                     }
                                 }
                             }

gaseous-server/Classes/Common.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Collections.Concurrent;
 using System.Security.Cryptography;
 
 namespace gaseous_server.Classes
@@ -111,5 +111,29 @@ namespace gaseous_server.Classes
 					.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
 		}
     }
-}
 
+	/// <summary>
+    /// Provides a way to set contextual data that flows with the call and 
+    /// async context of a test or invocation.
+    /// </summary>
+    public static class CallContext
+    {
+        static ConcurrentDictionary<string, AsyncLocal<object>> state = new ConcurrentDictionary<string, AsyncLocal<object>>();
+
+        /// <summary>
+        /// Stores a given object and associates it with the specified name.
+        /// </summary>
+        /// <param name="name">The name with which to associate the new item in the call context.</param>
+        /// <param name="data">The object to store in the call context.</param>
+        public static void SetData(string name, object data) =>
+            state.GetOrAdd(name, _ => new AsyncLocal<object>()).Value = data;
+
+        /// <summary>
+        /// Retrieves an object with the specified name from the <see cref="CallContext"/>.
+        /// </summary>
+        /// <param name="name">The name of the item in the call context.</param>
+        /// <returns>The object in the call context associated with the specified name, or <see langword="null"/> if not found.</returns>
+        public static object GetData(string name) =>
+            state.TryGetValue(name, out AsyncLocal<object> data) ? data.Value : null;
+    }
+}

gaseous-server/Classes/Config.cs

@@ -2,6 +2,7 @@
 using System.Data;
 using Newtonsoft.Json;
 using IGDB.Models;
+using gaseous_server.Classes.Metadata;
 
 namespace gaseous_server.Classes
 {
@@ -57,6 +58,14 @@ namespace gaseous_server.Classes
             }
         }
 
+        public static ConfigFile.MetadataAPI MetadataConfiguration
+        {
+            get
+            {
+                return _config.MetadataConfiguration;
+            }
+        }
+
         public static ConfigFile.IGDB IGDB
         {
             get
@@ -247,6 +256,8 @@ namespace gaseous_server.Classes
             [JsonIgnore]
             public Library LibraryConfiguration = new Library();
 
+            public MetadataAPI MetadataConfiguration = new MetadataAPI();
+
             public IGDB IGDBConfiguration = new IGDB();
 
             public Logging LoggingConfiguration = new Logging();
@@ -460,6 +471,26 @@ namespace gaseous_server.Classes
                 }
             }
 
+            public class MetadataAPI
+            {
+                private static Communications.MetadataSources _Source
+                {
+                    get
+                    {
+                        if (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("metadatasource")))
+                        {
+                            return (Communications.MetadataSources)Enum.Parse(typeof(Communications.MetadataSources), Environment.GetEnvironmentVariable("metadatasource"));
+                        }
+                        else
+                        {
+                            return Communications.MetadataSources.IGDB;
+                        }
+                    }
+                }
+
+                public Communications.MetadataSources Source = _Source;
+            }
+
             public class IGDB
             {
                 private static string _DefaultIGDBClientId

gaseous-server/Classes/Database.cs

@@ -106,13 +106,15 @@ namespace gaseous_server.Classes
 									int SchemaVer = (int)SchemaVersion.Rows[0][0];
                                     Logging.Log(Logging.LogType.Information, "Database", "Schema version is " + SchemaVer);
                                     if (SchemaVer < i)
+									{
+										try
 										{
 											// run pre-upgrade code
 											DatabaseMigration.PreUpgradeScript(i, _ConnectorType);
 											
 											// apply schema!
 											Logging.Log(Logging.LogType.Information, "Database", "Updating schema to version " + i);
-                                        ExecuteCMD(dbScript, dbDict);
+											ExecuteCMD(dbScript, dbDict, 180);
 
 											sql = "UPDATE schema_version SET schema_version=@schemaver";
 											dbDict = new Dictionary<string, object>();
@@ -122,6 +124,12 @@ namespace gaseous_server.Classes
 											// run post-upgrade code
 											DatabaseMigration.PostUpgradeScript(i, _ConnectorType);
 										}
+										catch (Exception ex)
+										{
+											Logging.Log(Logging.LogType.Critical, "Database", "Schema upgrade failed! Unable to continue.", ex);
+											System.Environment.Exit(1);
+										}
+									}
 								}
 							}
 						}

gaseous-server/Classes/Filters.cs

@@ -7,101 +7,98 @@ namespace gaseous_server.Classes
 {
     public class Filters
     {
-        public static Dictionary<string, object> Filter(Metadata.AgeRatings.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction, bool IncludeUnrated)
+        public static Dictionary<string, List<FilterItem>> Filter(Metadata.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction, bool IncludeUnrated)
         {
             Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
-            Dictionary<string, object> FilterSet = new Dictionary<string, object>();
+            Dictionary<string, List<FilterItem>> FilterSet = new Dictionary<string, List<FilterItem>>();
 
             // platforms
-            List<FilterPlatform> platforms = new List<FilterPlatform>();
+            List<FilterItem> platforms = new List<FilterItem>();
             
-            string ageRestriction_Platform = "Game.AgeGroupId <= " + (int)MaximumAgeRestriction;
+            string ageRestriction_Platform = "AgeGroup.AgeGroupId <= " + (int)MaximumAgeRestriction;
             string ageRestriction_Generic = "view_Games.AgeGroupId <= " + (int)MaximumAgeRestriction;
             if (IncludeUnrated == true)
             {
-                ageRestriction_Platform += " OR Game.AgeGroupId IS NULL";
+                ageRestriction_Platform += " OR AgeGroup.AgeGroupId IS NULL";
                 ageRestriction_Generic += " OR view_Games.AgeGroupId IS NULL";
             }
 
-            string sql = "SELECT DISTINCT Platform.Id, Platform.Abbreviation, Platform.AlternativeName, Platform.`Name`, Platform.PlatformLogo, (SELECT COUNT(*) AS GameCount FROM (SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Games_Roms.PlatformId, view_Games.AgeGroupId FROM Games_Roms LEFT JOIN view_Games ON view_Games.Id = Games_Roms.GameId) Game WHERE Game.PlatformId = Platform.Id AND (" + ageRestriction_Platform + ")) AS GameCount FROM Platform LEFT JOIN Relation_Game_Platforms ON Relation_Game_Platforms.PlatformsId = Platform.Id LEFT JOIN view_Games ON view_Games.Id = Relation_Game_Platforms.GameId HAVING GameCount > 0 ORDER BY Platform.`Name`;";
+            string sql = "SELECT Platform.Id, Platform.`Name`, COUNT(Game.Id) AS GameCount FROM (SELECT DISTINCT Game.Id, Games_Roms.PlatformId, COUNT(Games_Roms.Id) AS RomCount FROM Game LEFT JOIN AgeGroup ON Game.Id = AgeGroup.GameId LEFT JOIN Games_Roms ON Game.Id = Games_Roms.GameId WHERE (" + ageRestriction_Platform + ") GROUP BY Game.Id , Games_Roms.PlatformId HAVING RomCount > 0) Game JOIN Platform ON Game.PlatformId = Platform.Id GROUP BY Platform.`Name`;";
             
             DataTable dbResponse = db.ExecuteCMD(sql);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterPlatform platformItem = new FilterPlatform(Classes.Metadata.Platforms.GetPlatform((long)dr["id"]));
-                platformItem.GameCount = (int)(long)dr["GameCount"];
+                FilterItem platformItem = new FilterItem(dr);
                 platforms.Add(platformItem);
 
             }
             FilterSet.Add("platforms", platforms);
 
             // genres
-            List<FilterGenre> genres = new List<FilterGenre>();
-            dbResponse = GetGenericFilterItem(db, "Genre", ageRestriction_Generic);
+            List<FilterItem> genres = new List<FilterItem>();
+            dbResponse = GetGenericFilterItem(db, "Genre", ageRestriction_Platform);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterGenre genreItem = new FilterGenre(Classes.Metadata.Genres.GetGenres((long)dr["id"]));
-                genreItem.GameCount = (int)(long)dr["GameCount"];
+                FilterItem genreItem = new FilterItem(dr);
                 genres.Add(genreItem);
             }
             FilterSet.Add("genres", genres);
 
             // game modes
-            List<FilterGameMode> gameModes = new List<FilterGameMode>();
-            dbResponse = GetGenericFilterItem(db, "GameMode", ageRestriction_Generic);
+            List<FilterItem> gameModes = new List<FilterItem>();
+            dbResponse = GetGenericFilterItem(db, "GameMode", ageRestriction_Platform);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterGameMode gameModeItem = new FilterGameMode(Classes.Metadata.GameModes.GetGame_Modes((long)dr["id"]));
-                gameModeItem.GameCount = (int)(long)dr["GameCount"];
+                FilterItem gameModeItem = new FilterItem(dr);
                 gameModes.Add(gameModeItem);
             }
             FilterSet.Add("gamemodes", gameModes);
 
             // player perspectives
-            List<FilterPlayerPerspective> playerPerspectives = new List<FilterPlayerPerspective>();
-            dbResponse = GetGenericFilterItem(db, "PlayerPerspective", ageRestriction_Generic);
+            List<FilterItem> playerPerspectives = new List<FilterItem>();
+            dbResponse = GetGenericFilterItem(db, "PlayerPerspective", ageRestriction_Platform);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterPlayerPerspective playerPerspectiveItem = new FilterPlayerPerspective(Classes.Metadata.PlayerPerspectives.GetGame_PlayerPerspectives((long)dr["id"]));
-                playerPerspectiveItem.GameCount = (int)(long)dr["GameCount"];
+                FilterItem playerPerspectiveItem = new FilterItem(dr);
                 playerPerspectives.Add(playerPerspectiveItem);
             }
             FilterSet.Add("playerperspectives", playerPerspectives);
 
             // themes
-            List<FilterTheme> themes = new List<FilterTheme>();
-            dbResponse = GetGenericFilterItem(db, "Theme", ageRestriction_Generic);
+            List<FilterItem> themes = new List<FilterItem>();
+            dbResponse = GetGenericFilterItem(db, "Theme", ageRestriction_Platform);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterTheme themeItem = new FilterTheme(Classes.Metadata.Themes.GetGame_Themes((long)dr["id"]));
-                themeItem.GameCount = (int)(long)dr["GameCount"];
+                FilterItem themeItem = new FilterItem(dr);
                 themes.Add(themeItem);
             }
             FilterSet.Add("themes", themes);
 
             // age groups
-            List<FilterAgeGrouping> agegroupings = new List<FilterAgeGrouping>();
-            sql = "SELECT view_Games.Id, view_Games.AgeGroupId, COUNT(view_Games.Id) AS GameCount FROM view_Games WHERE (" + ageRestriction_Generic + ") GROUP BY view_Games.AgeGroupId ORDER BY view_Games.AgeGroupId DESC;";
+            List<FilterItem> agegroupings = new List<FilterItem>();
+            sql = "SELECT Game.AgeGroupId, COUNT(Game.Id) AS GameCount FROM (SELECT DISTINCT Game.Id, AgeGroup.AgeGroupId, COUNT(Games_Roms.Id) AS RomCount FROM Game LEFT JOIN AgeGroup ON Game.Id = AgeGroup.GameId LEFT JOIN Games_Roms ON Game.Id = Games_Roms.GameId WHERE (" + ageRestriction_Platform + ") GROUP BY Game.Id HAVING RomCount > 0) Game GROUP BY Game.AgeGroupId ORDER BY Game.AgeGroupId DESC";
             dbResponse = db.ExecuteCMD(sql);
 
             foreach (DataRow dr in dbResponse.Rows)
             {
-                FilterAgeGrouping filterAgeGrouping = new FilterAgeGrouping();
+                FilterItem filterAgeGrouping = new FilterItem();
                 if (dr["AgeGroupId"] == DBNull.Value)
                 {
-                    filterAgeGrouping.Id = (long)AgeRatings.AgeGroups.AgeRestrictionGroupings.Unclassified;
-                    filterAgeGrouping.AgeGroup = AgeRatings.AgeGroups.AgeRestrictionGroupings.Unclassified;
+                    filterAgeGrouping.Id = (int)(long)AgeGroups.AgeRestrictionGroupings.Unclassified;
+                    filterAgeGrouping.Name = AgeGroups.AgeRestrictionGroupings.Unclassified.ToString();
                 }
                 else
                 {
-                    filterAgeGrouping.Id = (long)(AgeRatings.AgeGroups.AgeRestrictionGroupings)dr["AgeGroupId"];
-                    filterAgeGrouping.AgeGroup = (AgeRatings.AgeGroups.AgeRestrictionGroupings)dr["AgeGroupId"];
+                    int ageGroupLong = (int)dr["AgeGroupId"];
+                    AgeGroups.AgeRestrictionGroupings ageGroup = (AgeGroups.AgeRestrictionGroupings)ageGroupLong;
+                    filterAgeGrouping.Id = ageGroupLong;
+                    filterAgeGrouping.Name = ageGroup.ToString();
                 }
                 filterAgeGrouping.GameCount = (int)(long)dr["GameCount"];
                 agegroupings.Add(filterAgeGrouping);
@@ -111,113 +108,34 @@ namespace gaseous_server.Classes
             return FilterSet;
         }
 
-        private static DataTable GetGenericFilterItem(Database db, string Name, string AgeRestriction_Generic)
+        private static DataTable GetGenericFilterItem(Database db, string Name, string AgeRestriction)
         {
-            string sql = "SELECT DISTINCT <ITEMNAME>.Id, <ITEMNAME>.`Name`, COUNT(view_Games.Id) AS GameCount FROM <ITEMNAME> LEFT JOIN Relation_Game_<ITEMNAME>s ON Relation_Game_<ITEMNAME>s.<ITEMNAME>sId = <ITEMNAME>.Id LEFT JOIN view_Games ON view_Games.Id = Relation_Game_<ITEMNAME>s.GameId WHERE (" + AgeRestriction_Generic + ") GROUP BY <ITEMNAME>.Id ORDER BY <ITEMNAME>.`Name`;";
+            //string sql = "SELECT DISTINCT <ITEMNAME>.Id, <ITEMNAME>.`Name`, COUNT(view_Games.Id) AS GameCount FROM <ITEMNAME> LEFT JOIN Relation_Game_<ITEMNAME>s ON Relation_Game_<ITEMNAME>s.<ITEMNAME>sId = <ITEMNAME>.Id LEFT JOIN view_Games ON view_Games.Id = Relation_Game_<ITEMNAME>s.GameId WHERE (" + AgeRestriction_Generic + ") GROUP BY <ITEMNAME>.Id HAVING GameCount > 0 ORDER BY <ITEMNAME>.`Name`;";
+
+            string sql = "SELECT <ITEMNAME>.Id, <ITEMNAME>.`Name`, COUNT(Game.Id) AS GameCount FROM (SELECT DISTINCT Game.Id, AgeGroup.AgeGroupId, COUNT(Games_Roms.Id) AS RomCount FROM Game LEFT JOIN AgeGroup ON Game.Id = AgeGroup.GameId LEFT JOIN Games_Roms ON Game.Id = Games_Roms.GameId WHERE (" + AgeRestriction + ") GROUP BY Game.Id HAVING RomCount > 0) Game JOIN Relation_Game_<ITEMNAME>s ON Game.Id = Relation_Game_<ITEMNAME>s.GameId JOIN <ITEMNAME> ON Relation_Game_<ITEMNAME>s.<ITEMNAME>sId = <ITEMNAME>.Id GROUP BY <ITEMNAME>.`Name` ORDER BY <ITEMNAME>.`Name`;";
             sql = sql.Replace("<ITEMNAME>", Name);
             DataTable dbResponse = db.ExecuteCMD(sql);
 
             return dbResponse;
         }
 
-        public class FilterPlatform : IGDB.Models.Platform
+        public class FilterItem
         {
-            public FilterPlatform(Platform obj)
+            public FilterItem()
             {
-                var properties = obj.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(obj));
-                    }
-                }
+
             }
 
-            public int GameCount { get; set; }
+            public FilterItem(DataRow dr)
+            {
+                this.Id = (long)dr["Id"];
+                this.Name = (string)dr["Name"];
+                this.GameCount = (int)(long)dr["GameCount"];
             }
 
-        public class FilterGenre : IGDB.Models.Genre
-        {
-            public FilterGenre(Genre obj)
-            {
-                var properties = obj.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(obj));
-                    }
-                }
-            }
-
-            public int GameCount { get; set; }
-        }
-
-        public class FilterGameMode : IGDB.Models.GameMode
-        {
-            public FilterGameMode(GameMode obj)
-            {
-                var properties = obj.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(obj));
-                    }
-                }
-            }
-
-            public int GameCount { get; set; }
-        }
-
-        public class FilterPlayerPerspective : IGDB.Models.PlayerPerspective
-        {
-            public FilterPlayerPerspective(PlayerPerspective obj)
-            {
-                var properties = obj.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(obj));
-                    }
-                }
-            }
-
-            public int GameCount { get; set; }
-        }
-
-        public class FilterTheme : IGDB.Models.Theme
-        {
-            public FilterTheme(Theme obj)
-            {
-                var properties = obj.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(obj));
-                    }
-                }
-            }
-
-            public int GameCount { get; set; }
-        }
-
-        public class FilterAgeGrouping
-        {
             public long Id { get; set; }
 
-            public AgeRatings.AgeGroups.AgeRestrictionGroupings AgeGroup { get ; set; }
-
-            public string Name
-            {
-                get
-                {
-                    return this.AgeGroup.ToString();
-                }
-            }
+            public string Name { get; set; }
 
             public int GameCount { get; set; }
         }

gaseous-server/Classes/ImportGames.cs

@@ -1,17 +1,19 @@
 using System;
 using System.Data;
 using System.IO.Compression;
+using System.Security.Authentication;
 using System.Security.Policy;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using gaseous_server.Classes.Metadata;
 using IGDB.Models;
 using NuGet.Common;
+using NuGet.LibraryModel;
 using static gaseous_server.Classes.Metadata.Games;
 
 namespace gaseous_server.Classes
 {
-	public class ImportGames
+	public class ImportGames : QueueItemStatus
 	{
 		public ImportGames(string ImportPath)
 		{
@@ -21,9 +23,15 @@ namespace gaseous_server.Classes
                 string[] importContents_Directories = Directory.GetDirectories(ImportPath);
 
 				// import files first
+                int importCount = 1;
 				foreach (string importContent in importContents_Files) {
+                    SetStatus(importCount, importContents_Files.Length, "Importing file: " + importContent);
+
 					ImportGame.ImportGameFile(importContent, null);
+
+                    importCount += 1;
 				}
+                ClearStatus();
 
                 // import sub directories
                 foreach (string importDir in importContents_Directories) {
@@ -40,7 +48,7 @@ namespace gaseous_server.Classes
 
 	}
 
-	public class ImportGame
+	public class ImportGame : QueueItemStatus
 	{
         public static void ImportGameFile(string GameFileImportPath, IGDB.Models.Platform? OverridePlatform)
 		{
@@ -600,7 +608,7 @@ namespace gaseous_server.Classes
             }
         }
 
-        public static void LibraryScan()
+        public void LibraryScan()
         {
             foreach (GameLibrary.LibraryItem library in GameLibrary.GetLibraries)
             {
@@ -645,8 +653,10 @@ namespace gaseous_server.Classes
                 // search for files in the library that aren't in the database
                 Logging.Log(Logging.LogType.Information, "Library Scan", "Looking for orphaned library files to add");
                 string[] LibraryFiles = Directory.GetFiles(library.Path, "*.*", SearchOption.AllDirectories);
+                int StatusCount = 0;
                 foreach (string LibraryFile in LibraryFiles)
                 {
+                    SetStatus(StatusCount, LibraryFiles.Length, "Processing file " + LibraryFile);
                     if (!Common.SkippableFiles.Contains<string>(Path.GetFileName(LibraryFile), StringComparer.OrdinalIgnoreCase))
                     {
                         Common.hashObject LibraryFileHash = new Common.hashObject(LibraryFile);
@@ -680,6 +690,8 @@ namespace gaseous_server.Classes
                             IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(sig.Flags.IGDBPlatformId);
 
                             IGDB.Models.Game determinedGame = new Game();
+                            try
+                            {
                                 if (determinedPlatform == null)
                                 {
                                     if (library.DefaultPlatformId == 0)
@@ -700,14 +712,22 @@ namespace gaseous_server.Classes
 
                                 StoreROM(library, hash, determinedGame, determinedPlatform, sig, LibraryFile);
                             }
+                            catch (Exception ex)
+                            {
+                                Logging.Log(Logging.LogType.Warning, "Library Scan", " An error occurred while matching orphaned file: " + LibraryFile + ". Skipping.", ex);
                             }
                         }
+                    }
+                    StatusCount += 1;
+                }
+                ClearStatus();
 
                 sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
                 dtRoms = db.ExecuteCMD(sql, dbDict);
 
                 // check all roms to see if their local file still exists
                 Logging.Log(Logging.LogType.Information, "Library Scan", "Checking library files exist on disk");
+                StatusCount = 0;
                 if (dtRoms.Rows.Count > 0)
                 {
                     for (var i = 0; i < dtRoms.Rows.Count; i++)
@@ -716,6 +736,7 @@ namespace gaseous_server.Classes
                         string romPath = (string)dtRoms.Rows[i]["Path"];
                         gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType romMetadataSource = (gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType)(int)dtRoms.Rows[i]["MetadataSource"];
 
+                        SetStatus(StatusCount, dtRoms.Rows.Count, "Processing file " + romPath);
                         Logging.Log(Logging.LogType.Information, "Library Scan", " Processing ROM at path " + romPath);
 
                         if (File.Exists(romPath))
@@ -739,6 +760,8 @@ namespace gaseous_server.Classes
                             deleteDict.Add("libraryid", library.Id);
                             db.ExecuteCMD(deleteSql, deleteDict);
                         }
+
+                        StatusCount += 1;
                     }
                 }
 
@@ -746,7 +769,7 @@ namespace gaseous_server.Classes
             }
         }
 
-        public static void Rematcher(bool ForceExecute = false)
+        public void Rematcher(bool ForceExecute = false)
         {
             // rescan all titles with an unknown platform or title and see if we can get a match
             Logging.Log(Logging.LogType.Information, "Rematch Scan", "Rematch scan starting");
@@ -764,8 +787,11 @@ namespace gaseous_server.Classes
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("lastmatchattemptdate", DateTime.UtcNow.AddDays(-7));
             DataTable data = db.ExecuteCMD(sql, dbDict);
+            int StatusCount = -0;
             foreach (DataRow row in data.Rows)
             {
+                SetStatus(StatusCount, data.Rows.Count, "Running rematcher");
+
                 // get library
                 GameLibrary.LibraryItem library = GameLibrary.GetLibrary((int)row["LibraryId"]);
 
@@ -800,9 +826,13 @@ namespace gaseous_server.Classes
                 dbLastAttemptDict.Add("id", romId);
                 dbLastAttemptDict.Add("lastmatchattemptdate", DateTime.UtcNow);
                 db.ExecuteCMD(attemptSql, dbLastAttemptDict);
+
+                StatusCount += 1;
             }
+            ClearStatus();
 
             Logging.Log(Logging.LogType.Information, "Rematch Scan", "Rematch scan completed");
+            ClearStatus();
         }
     }
 }

gaseous-server/Classes/Logging.cs

@@ -75,8 +75,59 @@ namespace gaseous_server.Classes
                         LogToDisk(logItem, TraceOutput, null);
                     }
 
+                    string correlationId;
+                    try
+                    {
+                        if (CallContext.GetData("CorrelationId").ToString() == null)
+                        {
+                            correlationId = "";
+                        }
+                        else
+                        {
+                            correlationId = CallContext.GetData("CorrelationId").ToString();
+                        }
+                    }
+                    catch
+                    {
+                        correlationId = "";
+                    }
+
+                    string callingProcess;
+                    try
+                    {
+                        if (CallContext.GetData("CallingProcess").ToString() == null)
+                        {
+                            callingProcess = "";
+                        }
+                        else
+                        {
+                            callingProcess = CallContext.GetData("CallingProcess").ToString();
+                        }
+                    }
+                    catch
+                    {
+                        callingProcess = "";
+                    }
+
+                    string callingUser;
+                    try
+                    {
+                        if (CallContext.GetData("CallingUser").ToString() == null)
+                        {
+                            callingUser = "";
+                        }
+                        else
+                        {
+                            callingUser = CallContext.GetData("CallingUser").ToString();
+                        }
+                    }
+                    catch
+                    {
+                        callingUser = "";
+                    }
+
                     Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                    string sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate; INSERT INTO ServerLogs (EventTime, EventType, Process, Message, Exception) VALUES (@EventTime, @EventType, @Process, @Message, @Exception);";
+                    string sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate; INSERT INTO ServerLogs (EventTime, EventType, Process, Message, Exception, CorrelationId, CallingProcess, CallingUser) VALUES (@EventTime, @EventType, @Process, @Message, @Exception, @correlationid, @callingprocess, @callinguser);";
                     Dictionary<string, object> dbDict = new Dictionary<string, object>();
                     dbDict.Add("EventRententionDate", DateTime.UtcNow.AddDays(Config.LoggingConfiguration.LogRetention * -1));
                     dbDict.Add("EventTime", logItem.EventTime);
@@ -84,6 +135,9 @@ namespace gaseous_server.Classes
                     dbDict.Add("Process", logItem.Process);
                     dbDict.Add("Message", logItem.Message);
                     dbDict.Add("Exception", Common.ReturnValueIfNull(logItem.ExceptionValue, "").ToString());
+                    dbDict.Add("correlationid", correlationId);
+                    dbDict.Add("callingprocess", callingProcess);
+                    dbDict.Add("callinguser", callingUser);
 
                     try
                     {
@@ -184,6 +238,33 @@ namespace gaseous_server.Classes
                 }
             }
 
+            if (model.CorrelationId != null)
+            {
+                if (model.CorrelationId.Length > 0)
+                {
+                    dbDict.Add("correlationId", model.CorrelationId);
+                    whereClauses.Add("CorrelationId = @correlationId");
+                }
+            }
+
+            if (model.CallingProcess != null)
+            {
+                if (model.CallingProcess.Length > 0)
+                {
+                    dbDict.Add("callingProcess", model.CallingProcess);
+                    whereClauses.Add("CallingProcess = @callingProcess");
+                }
+            }
+
+            if (model.CallingUser != null)
+            {
+                if (model.CallingUser.Length > 0)
+                {
+                    dbDict.Add("callingUser", model.CallingUser);
+                    whereClauses.Add("CallingUser = @callingUser");
+                }
+            }
+
             // compile WHERE clause
             string whereClause = "";
             if (whereClauses.Count > 0)
@@ -198,7 +279,8 @@ namespace gaseous_server.Classes
                 {
                     whereClause = "WHERE " + whereClause;
                 }
-                sql = "SELECT * FROM ServerLogs " + whereClause + " ORDER BY Id DESC LIMIT @PageSize OFFSET @PageNumber;";
+                
+                sql = "SELECT ServerLogs.Id, ServerLogs.EventTime, ServerLogs.EventType, ServerLogs.`Process`, ServerLogs.Message, ServerLogs.Exception, ServerLogs.CorrelationId, ServerLogs.CallingProcess, Users.Email FROM ServerLogs LEFT JOIN Users ON ServerLogs.CallingUser = Users.Id " + whereClause + " ORDER BY ServerLogs.Id DESC LIMIT @PageSize OFFSET @PageNumber;";
             }
             else
             {
@@ -206,7 +288,8 @@ namespace gaseous_server.Classes
                 {
                     whereClause = "AND " + whereClause;
                 }
-                sql = "SELECT * FROM ServerLogs WHERE Id < @StartIndex " + whereClause + " ORDER BY Id DESC LIMIT @PageSize OFFSET @PageNumber;";
+                
+                sql = "SELECT ServerLogs.Id, ServerLogs.EventTime, ServerLogs.EventType, ServerLogs.`Process`, ServerLogs.Message, ServerLogs.Exception, ServerLogs.CorrelationId, ServerLogs.CallingProcess, Users.Email FROM ServerLogs LEFT JOIN Users ON ServerLogs.CallingUser = Users.Id  WHERE ServerLogs.Id < @StartIndex " + whereClause + " ORDER BY ServerLogs.Id DESC LIMIT @PageSize OFFSET @PageNumber;";
             }
             DataTable dataTable = db.ExecuteCMD(sql, dbDict);
 
@@ -220,7 +303,10 @@ namespace gaseous_server.Classes
                     EventType = (LogType)row["EventType"],
                     Process = (string)row["Process"],
                     Message = (string)row["Message"],
-                    ExceptionValue = (string)row["Exception"]
+                    ExceptionValue = (string)row["Exception"],
+                    CorrelationId = (string)Common.ReturnValueIfNull(row["CorrelationId"], ""),
+                    CallingProcess = (string)Common.ReturnValueIfNull(row["CallingProcess"], ""),
+                    CallingUser = (string)Common.ReturnValueIfNull(row["Email"], "")
                 };
 
                 logs.Add(log);
@@ -243,6 +329,9 @@ namespace gaseous_server.Classes
             public DateTime EventTime { get; set; }
             public LogType? EventType { get; set; }
             public string Process { get; set; } = "";
+            public string CorrelationId { get; set; } = "";
+            public string? CallingProcess { get; set; } = "";
+            public string? CallingUser { get; set; } = "";
             private string _Message = "";
             public string Message
             {
@@ -267,6 +356,9 @@ namespace gaseous_server.Classes
             public DateTime? StartDateTime { get; set; }
             public DateTime? EndDateTime { get; set; }
             public string? SearchText { get; set; }
+            public string? CorrelationId { get; set; }
+            public string? CallingProcess { get; set; }
+            public string? CallingUser { get; set; }
         }
     }
 }

gaseous-server/Classes/Maintenance.cs

@@ -5,11 +5,11 @@ using Microsoft.VisualStudio.Web.CodeGeneration;
 
 namespace gaseous_server.Classes
 {
-	public class Maintenance
+	public class Maintenance : QueueItemStatus
     {
         const int MaxFileAge = 30;
 
-        public static void RunMaintenance()
+        public void RunMaintenance()
         {
             // delete files and directories older than 7 days in PathsToClean
             List<string> PathsToClean = new List<string>();
@@ -49,8 +49,11 @@ namespace gaseous_server.Classes
             string sql = "SHOW TABLES;";
             DataTable tables = db.ExecuteCMD(sql);
 
+            int StatusCounter = 1;
             foreach (DataRow row in tables.Rows)
             {
+                SetStatus(StatusCounter, tables.Rows.Count, "Optimising table " + row[0].ToString());
+
                 sql = "OPTIMIZE TABLE " + row[0].ToString();
                 DataTable response = db.ExecuteCMD(sql);
                 foreach (DataRow responseRow in response.Rows)
@@ -60,9 +63,12 @@ namespace gaseous_server.Classes
                     {
                         retVal += responseRow.ItemArray[i] + "; ";
                     }
-                    Logging.Log(Logging.LogType.Information, "Maintenance", "Optimise table " + row[0].ToString() + ": " + retVal);
-                }
-            }
+                    Logging.Log(Logging.LogType.Information, "Maintenance", "(" + StatusCounter + "/" + tables.Rows.Count + "): Optimise table " + row[0].ToString() + ": " + retVal);
+                }
+
+                StatusCounter += 1;
+            }
+            ClearStatus();
         }
     }
 }

gaseous-server/Classes/Metadata/AgeGroups.cs

@@ -0,0 +1,304 @@
+using System;
+using System.Reflection;
+using System.Text.Json.Serialization;
+using IGDB;
+using IGDB.Models;
+using Microsoft.CodeAnalysis.Classification;
+
+namespace gaseous_server.Classes.Metadata
+{
+    public class AgeGroups
+    {
+        public AgeGroups()
+        {
+
+        }
+
+        public static AgeGroup? GetAgeGroup(Game? game)
+        {
+            if (game == null)
+            {
+                return null;
+            }
+            else
+            {
+                Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
+                cacheStatus = Storage.GetCacheStatus("AgeGroup", (long)game.Id);
+
+                AgeGroup? RetVal = new AgeGroup();
+
+                switch (cacheStatus)
+                {
+                    case Storage.CacheStatus.NotPresent:
+                        RetVal = _GetAgeGroup(game);
+                        Storage.NewCacheValue(RetVal, false);
+                        break;
+
+                    case Storage.CacheStatus.Expired:
+                        RetVal = _GetAgeGroup(game);
+                        Storage.NewCacheValue(RetVal, true);
+                        break;
+
+                    case Storage.CacheStatus.Current:
+                        RetVal = Storage.GetCacheValue<AgeGroup>(RetVal, "Id", game.Id);
+                        break;
+
+                    default:
+                        throw new Exception("How did you get here?");
+                }
+                
+                return RetVal;
+            }
+        }
+
+        public static AgeGroup? _GetAgeGroup(Game game)
+        {
+            // compile the maximum age group for the given game
+            if (game != null)
+            {
+                if (game.AgeRatings != null)
+                {
+                    if (game.AgeRatings.Ids != null)
+                    {
+                        // collect ratings values from metadata
+                        List<AgeRating> ageRatings = new List<AgeRating>();
+                        foreach (long ratingId in game.AgeRatings.Ids)
+                        {
+                            AgeRating? rating = AgeRatings.GetAgeRatings(ratingId);
+                            if (rating != null)
+                            {
+                                ageRatings.Add(rating);
+                            }
+                        }
+
+                        // compile the ratings values into the ratings groups
+                        AgeRestrictionGroupings highestAgeGroup = AgeRestrictionGroupings.Unclassified;
+                        foreach (AgeRating ageRating in ageRatings)
+                        {
+                            foreach (KeyValuePair<AgeRestrictionGroupings, AgeGroupItem> ageGroupItem in AgeGroupingsFlat)
+                            {
+                                
+                                PropertyInfo[] groupProps = typeof(AgeGroupItem).GetProperties();
+                                foreach (PropertyInfo property in groupProps)
+                                {
+                                    if (RatingsBoards.Contains(property.Name))
+                                    {
+                                        List<AgeRatingTitle> ratingBoard = (List<AgeRatingTitle>)property.GetValue(ageGroupItem.Value);
+                                        foreach (AgeRatingTitle ratingTitle in ratingBoard)
+                                        {
+                                            if (ageRating.Rating == ratingTitle)
+                                            {
+                                                if (highestAgeGroup < ageGroupItem.Key)
+                                                {
+                                                    highestAgeGroup = ageGroupItem.Key;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        
+                        // return the compiled ratings group
+                        AgeGroup ageGroup = new AgeGroup();
+                        ageGroup.Id = game.Id;
+                        ageGroup.GameId = game.Id;
+                        if (highestAgeGroup == 0)
+                        {
+                            ageGroup.AgeGroupId = null;
+                        }
+                        else
+                        {
+                            ageGroup.AgeGroupId = highestAgeGroup;
+                        }
+                        
+                        return ageGroup;
+                    }
+                    else
+                    {
+                        AgeGroup ageGroup = new AgeGroup();
+                        ageGroup.Id = game.Id;
+                        ageGroup.GameId = game.Id;
+                        ageGroup.AgeGroupId = null;
+                        
+                        return ageGroup;
+                    }
+                }
+                else
+                {
+                    AgeGroup ageGroup = new AgeGroup();
+                    ageGroup.Id = game.Id;
+                    ageGroup.GameId = game.Id;
+                    ageGroup.AgeGroupId = null;
+                    
+                    return ageGroup;
+                }
+            }
+            
+            return null;
+        }
+
+        public class AgeGroup
+        {
+            public long? Id { get; set; }
+            public long? GameId { get; set; }
+            public AgeRestrictionGroupings? AgeGroupId { get; set; }
+        }
+
+        public static Dictionary<AgeRestrictionGroupings, List<AgeGroupItem>> AgeGroupings
+        {
+            get
+            {
+                return new Dictionary<AgeRestrictionGroupings, List<AgeGroupItem>>{
+                    { 
+                        AgeRestrictionGroupings.Adult, new List<AgeGroupItem>{ Adult_Item, Mature_Item, Teen_Item, Child_Item } 
+                    },
+                    {
+                        AgeRestrictionGroupings.Mature, new List<AgeGroupItem>{ Mature_Item, Teen_Item, Child_Item }
+                    },
+                    {
+                        AgeRestrictionGroupings.Teen, new List<AgeGroupItem>{ Teen_Item, Child_Item }
+                    },
+                    { 
+                        AgeRestrictionGroupings.Child, new List<AgeGroupItem>{ Child_Item }
+                    }
+                };
+            }
+        }
+
+        public static Dictionary<AgeRestrictionGroupings, AgeGroupItem> AgeGroupingsFlat
+        {
+            get
+            {
+                return new Dictionary<AgeRestrictionGroupings, AgeGroupItem>{
+                    {
+                        AgeRestrictionGroupings.Adult, Adult_Item
+                    },
+                    {
+                        AgeRestrictionGroupings.Mature, Mature_Item
+                    },
+                    {
+                        AgeRestrictionGroupings.Teen, Teen_Item
+                    },
+                    {
+                        AgeRestrictionGroupings.Child, Child_Item
+                    }
+                };
+            }
+        }
+
+        public enum AgeRestrictionGroupings
+        {
+            Adult = 4,
+            Mature = 3,
+            Teen = 2,
+            Child = 1,
+            Unclassified = 0
+        }
+
+        public static List<string> RatingsBoards
+        {
+            get
+            {
+                List<string> boards = new List<string>{
+                    "ACB", "CERO", "CLASS_IND", "ESRB", "GRAC", "PEGI", "USK"
+                };
+
+                return boards;
+            }
+        }
+
+        readonly static AgeGroupItem Adult_Item = new AgeGroupItem{
+            ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_R18, AgeRatingTitle.ACB_RC },
+            CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_Z },
+            CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Eighteen },
+            ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.RP, AgeRatingTitle.AO },
+            GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Eighteen },
+            PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Eighteen},
+            USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_18}
+        };
+
+        readonly static AgeGroupItem Mature_Item = new AgeGroupItem{
+            ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_M, AgeRatingTitle.ACB_MA15 },
+            CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_C, AgeRatingTitle.CERO_D },
+            CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Sixteen },
+            ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.M },
+            GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Fifteen },
+            PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Sixteen},
+            USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_16}
+        };
+
+        readonly static AgeGroupItem Teen_Item = new AgeGroupItem{
+            ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_PG },
+            CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_B },
+            CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Twelve, AgeRatingTitle.CLASS_IND_Fourteen },
+            ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.T },
+            GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Twelve },
+            PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Twelve},
+            USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_12}
+        };
+
+        readonly static AgeGroupItem Child_Item = new AgeGroupItem{
+            ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_G },
+            CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_A },
+            CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_L, AgeRatingTitle.CLASS_IND_Ten },
+            ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.E, AgeRatingTitle.E10 },
+            GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_All },
+            PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Three, AgeRatingTitle.Seven},
+            USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_0, AgeRatingTitle.USK_6}
+        };
+
+        public class AgeGroupItem
+        {
+            public List<IGDB.Models.AgeRatingTitle> ACB { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> CERO { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> CLASS_IND { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> ESRB { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> GRAC { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> PEGI { get; set; }
+            public List<IGDB.Models.AgeRatingTitle> USK { get; set; }
+
+            [JsonIgnore]
+            [Newtonsoft.Json.JsonIgnore]
+            public List<long> AgeGroupItemValues
+            {
+                get
+                {
+                    List<long> values = new List<long>();
+                    {
+                        foreach (AgeRatingTitle ageRatingTitle in ACB)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in CERO)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in CLASS_IND)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in ESRB)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in GRAC)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in PEGI)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                        foreach (AgeRatingTitle ageRatingTitle in USK)
+                        {
+                            values.Add((long)ageRatingTitle);
+                        }
+                    }
+
+                    return values;
+                }
+            }
+        }
+    }
+}

gaseous-server/Classes/Metadata/AgeRating.cs

@@ -15,12 +15,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static AgeRating? GetAgeRatings(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -117,7 +111,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AgeRating> GetObjectFromServer(string WhereClause)
         {
             // get AgeRatings metadata
-            var results = await igdb.QueryAsync<AgeRating>(IGDBClient.Endpoints.AgeRating, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<AgeRating>(IGDBClient.Endpoints.AgeRating, fieldList, WhereClause);
             var result = results.First();
 
             return result;
@@ -191,158 +186,6 @@ namespace gaseous_server.Classes.Metadata
                 }
             }
         }
-
-        public class AgeGroups
-        {
-            public AgeGroups()
-            {
-
-            }
-
-            public static Dictionary<AgeRestrictionGroupings, List<AgeGroupItem>> AgeGroupings
-            {
-                get
-                {
-                    return new Dictionary<AgeRestrictionGroupings, List<AgeGroupItem>>{
-                        { 
-                            AgeRestrictionGroupings.Adult, new List<AgeGroupItem>{ Adult_Item, Mature_Item, Teen_Item, Child_Item } 
-                        },
-                        {
-                            AgeRestrictionGroupings.Mature, new List<AgeGroupItem>{ Mature_Item, Teen_Item, Child_Item }
-                        },
-                        {
-                            AgeRestrictionGroupings.Teen, new List<AgeGroupItem>{ Teen_Item, Child_Item }
-                        },
-                        { 
-                            AgeRestrictionGroupings.Child, new List<AgeGroupItem>{ Child_Item }
-                        }
-                    };
-                }
-            }
-
-            public static Dictionary<AgeRestrictionGroupings, AgeGroupItem> AgeGroupingsFlat
-            {
-                get
-                {
-                    return new Dictionary<AgeRestrictionGroupings, AgeGroupItem>{
-                        {
-                            AgeRestrictionGroupings.Adult, Adult_Item
-                        },
-                        {
-                            AgeRestrictionGroupings.Mature, Mature_Item
-                        },
-                        {
-                            AgeRestrictionGroupings.Teen, Teen_Item
-                        },
-                        {
-                            AgeRestrictionGroupings.Child, Child_Item
-                        }
-                    };
-                }
-            }
-
-            public enum AgeRestrictionGroupings
-            {
-                Adult = 4,
-                Mature = 3,
-                Teen = 2,
-                Child = 1,
-                Unclassified = 0
-            }
-
-            readonly static AgeGroupItem Adult_Item = new AgeGroupItem{
-                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_R18, AgeRatingTitle.ACB_RC },
-                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_Z },
-                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Eighteen },
-                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.RP, AgeRatingTitle.AO },
-                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Eighteen },
-                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Eighteen},
-                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_18}
-            };
-
-            readonly static AgeGroupItem Mature_Item = new AgeGroupItem{
-                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_M, AgeRatingTitle.ACB_MA15 },
-                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_C, AgeRatingTitle.CERO_D },
-                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Sixteen },
-                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.M },
-                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Fifteen },
-                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Sixteen},
-                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_16}
-            };
-
-            readonly static AgeGroupItem Teen_Item = new AgeGroupItem{
-                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_PG },
-                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_B },
-                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Twelve, AgeRatingTitle.CLASS_IND_Fourteen },
-                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.T },
-                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Twelve },
-                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Twelve},
-                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_12}
-            };
-
-            readonly static AgeGroupItem Child_Item = new AgeGroupItem{
-                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_G },
-                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_A },
-                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_L, AgeRatingTitle.CLASS_IND_Ten },
-                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.E, AgeRatingTitle.E10 },
-                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_All },
-                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Three, AgeRatingTitle.Seven},
-                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_0, AgeRatingTitle.USK_6}
-            };
-
-            public class AgeGroupItem
-            {
-                public List<IGDB.Models.AgeRatingTitle> ACB { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> CERO { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> CLASS_IND { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> ESRB { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> GRAC { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> PEGI { get; set; }
-                public List<IGDB.Models.AgeRatingTitle> USK { get; set; }
-
-                [JsonIgnore]
-                [Newtonsoft.Json.JsonIgnore]
-                public List<long> AgeGroupItemValues
-                {
-                    get
-                    {
-                        List<long> values = new List<long>();
-                        {
-                            foreach (AgeRatingTitle ageRatingTitle in ACB)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in CERO)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in CLASS_IND)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in ESRB)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in GRAC)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in PEGI)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                            foreach (AgeRatingTitle ageRatingTitle in USK)
-                            {
-                                values.Add((long)ageRatingTitle);
-                            }
-                        }
-
-                        return values;
-                    }
-                }
-            }
-        }
 	}
 }
 

gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static AgeRatingContentDescription? GetAgeRatingContentDescriptions(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AgeRatingContentDescription> GetObjectFromServer(string WhereClause)
         {
             // get AgeRatingContentDescriptionContentDescriptions metadata
-            var results = await igdb.QueryAsync<AgeRatingContentDescription>(IGDBClient.Endpoints.AgeRatingContentDescriptions, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<AgeRatingContentDescription>(IGDBClient.Endpoints.AgeRatingContentDescriptions, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/AlternativeNames.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static AlternativeName? GetAlternativeNames(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AlternativeName> GetObjectFromServer(string WhereClause)
         {
             // get AlternativeNames metadata
-            var results = await igdb.QueryAsync<AlternativeName>(IGDBClient.Endpoints.AlternativeNames, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<AlternativeName>(IGDBClient.Endpoints.AlternativeNames, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Artworks.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Artwork? GetArtwork(long? Id, string LogoPath)
         {
             if ((Id == 0) || (Id == null))
@@ -113,7 +107,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Artwork> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get Artwork metadata
-            var results = await igdb.QueryAsync<Artwork>(IGDBClient.Endpoints.Artworks, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Artwork>(IGDBClient.Endpoints.Artworks, fieldList, WhereClause);
             var result = results.First();
 
             //GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb, result.ImageId);

gaseous-server/Classes/Metadata/Collections.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Collection? GetCollections(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Collection> GetObjectFromServer(string WhereClause)
         {
             // get Collections metadata
-            var results = await igdb.QueryAsync<Collection>(IGDBClient.Endpoints.Collections, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Collection>(IGDBClient.Endpoints.Collections, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Communications.cs

@@ -0,0 +1,238 @@
+using System.Net;
+using IGDB;
+using RestEase;
+
+namespace gaseous_server.Classes.Metadata
+{
+    /// <summary>
+    /// Handles all metadata API communications
+    /// </summary>
+    public class Communications
+    {
+        private static IGDBClient igdb = new IGDBClient(
+                    // Found in Twitch Developer portal for your app
+                    Config.IGDB.ClientId,
+                    Config.IGDB.Secret
+                );
+
+        /// <summary>
+        /// Configure metadata API communications
+        /// </summary>
+        public static MetadataSources MetadataSource
+        {
+            get
+            {
+                return _MetadataSource;
+            }
+            set
+            {
+                _MetadataSource = value;
+
+                switch (value)
+                {
+                    case MetadataSources.IGDB:
+                        // set rate limiter avoidance values
+                        RateLimitAvoidanceWait = 1500;
+                        RateLimitAvoidanceThreshold = 3;
+                        RateLimitAvoidancePeriod = 1;
+
+                        // set rate limiter recovery values
+                        RateLimitRecoveryWaitTime = 10000;
+
+                        break;
+                    default:
+                        // leave all values at default
+                        break;
+                }
+            }
+        }
+        private static MetadataSources _MetadataSource = MetadataSources.None;
+
+        // rate limit avoidance - what can we do to ensure that rate limiting is avoided?
+        // these values affect all communications
+
+        /// <summary>
+        /// How long to wait to avoid hitting an API rate limiter
+        /// </summary>
+        private static int RateLimitAvoidanceWait = 2000;
+
+        /// <summary>
+        /// How many API calls in the period are allowed before we start introducing a wait
+        /// </summary>
+        private static int RateLimitAvoidanceThreshold = 80;
+
+        /// <summary>
+        /// A counter of API calls since the beginning of the period
+        /// </summary>
+        private static int RateLimitAvoidanceCallCount = 0;
+
+        /// <summary>
+        /// How large the period (in seconds) to measure API call counts against
+        /// </summary>
+        private static int RateLimitAvoidancePeriod = 60;
+
+        /// <summary>
+        /// The start of the rate limit avoidance period
+        /// </summary>
+        private static DateTime RateLimitAvoidanceStartTime = DateTime.UtcNow;
+
+        /// <summary>
+        /// Used to determine if we're already in rate limit avoidance mode - always query "InRateLimitAvoidanceMode"
+        /// for up to date mode status.
+        /// This bool is used to track status changes and should not be relied upon for current status.
+        /// </summary>
+        private static bool InRateLimitAvoidanceModeStatus = false;
+
+        /// <summary>
+        /// Determine if we're in rate limit avoidance mode.
+        /// </summary>
+        private static bool InRateLimitAvoidanceMode
+        {
+            get
+            {
+                if (RateLimitAvoidanceStartTime.AddSeconds(RateLimitAvoidancePeriod) <= DateTime.UtcNow)
+                {
+                    // avoidance period has expired - reset
+                    RateLimitAvoidanceCallCount = 0;
+                    RateLimitAvoidanceStartTime = DateTime.UtcNow;
+
+                    return false;
+                }
+                else
+                {
+                    // we're in the avoidance period
+                    if (RateLimitAvoidanceCallCount > RateLimitAvoidanceThreshold)
+                    {
+                        // the number of call counts indicates we should throttle things a bit
+                        if (InRateLimitAvoidanceModeStatus == false)
+                        {
+                            Logging.Log(Logging.LogType.Information, "API Connection", "Entered rate limit avoidance period, API calls will be throttled by " + RateLimitAvoidanceWait + " milliseconds.");
+                            InRateLimitAvoidanceModeStatus = true;
+                        }
+                        return true;
+                    }
+                    else
+                    {
+                        // still in full speed mode - no throttle required
+                        if (InRateLimitAvoidanceModeStatus == true)
+                        {
+                            Logging.Log(Logging.LogType.Information, "API Connection", "Exited rate limit avoidance period, API call rate is returned to full speed.");
+                            InRateLimitAvoidanceModeStatus = false;
+                        }
+                        return false;
+                    }
+                }
+            }
+        }
+
+        // rate limit handling - how long to wait to allow the server to recover and try again
+        // these values affect ALL communications if a 429 response code is received
+
+        /// <summary>
+        /// How long to wait (in milliseconds) if a 429 status code is received before trying again
+        /// </summary>
+        private static int RateLimitRecoveryWaitTime = 10000;
+
+        /// <summary>
+        /// The time when normal communications can attempt to be resumed
+        /// </summary>
+        private static DateTime RateLimitResumeTime = DateTime.UtcNow.AddMinutes(5 * -1);
+
+        // rate limit retry - how many times to retry before aborting
+        private int RetryAttempts = 0;
+        private int RetryAttemptsMax = 3;
+
+        /// <summary>
+        /// Supported metadata sources
+        /// </summary>
+        public enum MetadataSources
+        {
+            /// <summary>
+            /// None - always returns null for metadata requests - should not really be using this source
+            /// </summary>
+            None,
+
+            /// <summary>
+            /// IGDB - queries the IGDB service for metadata
+            /// </summary>
+            IGDB
+        }
+
+        /// <summary>
+        /// Request data from the metadata API
+        /// </summary>
+        /// <typeparam name="T">Type of object to return</typeparam>
+        /// <param name="Endpoint">API endpoint segment to use</param>
+        /// <param name="Fields">Fields to request from the API</param>
+        /// <param name="Query">Selection criteria for data to request</param>
+        /// <returns></returns>
+        public async Task<T[]?> APIComm<T>(string Endpoint, string Fields, string Query)
+        {
+            switch (_MetadataSource)
+            {
+                case MetadataSources.None:
+                    return null;
+                case MetadataSources.IGDB:
+                    return await IGDBAPI<T>(Endpoint, Fields, Query);
+                default:
+                    return null;
+            }
+        }
+
+        private async Task<T[]> IGDBAPI<T>(string Endpoint, string Fields, string Query)
+        {
+            Logging.Log(Logging.LogType.Debug, "API Connection", "Accessing API for endpoint: " + Endpoint);
+
+            if (RateLimitResumeTime > DateTime.UtcNow)
+            {
+                Logging.Log(Logging.LogType.Information, "API Connection", "IGDB rate limit hit. Pausing API communications until " + RateLimitResumeTime.ToString() + ". Attempt " + RetryAttempts + " of " + RetryAttemptsMax + " retries.");
+                Thread.Sleep(RateLimitRecoveryWaitTime);
+            }
+
+            try
+            {   
+                if (InRateLimitAvoidanceMode == true)
+                {
+                    // sleep for a moment to help avoid hitting the rate limiter
+                    Thread.Sleep(RateLimitAvoidanceWait);
+                }
+
+                // perform the actual API call
+                var results = await igdb.QueryAsync<T>(Endpoint, query: Fields + " " + Query + ";");
+
+                // increment rate limiter avoidance call count
+                RateLimitAvoidanceCallCount += 1;
+                
+                return results;
+            }
+            catch (ApiException apiEx)
+            {
+                switch (apiEx.StatusCode)
+                {
+                    case HttpStatusCode.TooManyRequests:
+                        if (RetryAttempts >= RetryAttemptsMax)
+                        {
+                            Logging.Log(Logging.LogType.Warning, "API Connection", "IGDB rate limiter attempts expired. Aborting.", apiEx);
+                            throw;
+                        }
+                        else
+                        {
+                            Logging.Log(Logging.LogType.Information, "API Connection", "IGDB API rate limit hit while accessing endpoint " + Endpoint, apiEx);
+                            
+                            RetryAttempts += 1;
+
+                            return await IGDBAPI<T>(Endpoint, Fields, Query);
+                        }
+                    default:
+                        Logging.Log(Logging.LogType.Warning, "API Connection", "Exception when accessing endpoint " + Endpoint, apiEx);
+                        throw;
+                }
+            }
+            catch(Exception ex)
+            {
+                Logging.Log(Logging.LogType.Warning, "API Connection", "Exception when accessing endpoint " + Endpoint, ex);
+                throw;
+            }
+        }
+    }
+}

gaseous-server/Classes/Metadata/Company.cs

@@ -12,12 +12,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Company? GetCompanies(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -111,7 +105,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Company> GetObjectFromServer(string WhereClause)
         {
             // get Companies metadata
-            var results = await igdb.QueryAsync<Company>(IGDBClient.Endpoints.Companies, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Company>(IGDBClient.Endpoints.Companies, fieldList, WhereClause);
             if (results.Length > 0)
             {
                 var result = results.First();

gaseous-server/Classes/Metadata/CompanyLogos.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static CompanyLogo? GetCompanyLogo(long? Id, string LogoPath)
         {
             if ((Id == 0) || (Id == null))
@@ -118,7 +112,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<CompanyLogo?> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get CompanyLogo metadata
-            var results = await igdb.QueryAsync<CompanyLogo>(IGDBClient.Endpoints.CompanyLogos, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<CompanyLogo>(IGDBClient.Endpoints.CompanyLogos, fieldList, WhereClause);
             if (results.Length > 0)
             {
                 var result = results.First();

gaseous-server/Classes/Metadata/Covers.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Cover? GetCover(long? Id, string LogoPath)
         {
             if ((Id == 0) || (Id == null))
@@ -113,7 +107,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Cover> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get Cover metadata
-            var results = await igdb.QueryAsync<Cover>(IGDBClient.Endpoints.Covers, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Cover>(IGDBClient.Endpoints.Covers, fieldList, WhereClause);
             var result = results.First();
 
             //GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb, result.ImageId);

gaseous-server/Classes/Metadata/ExternalGames.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static ExternalGame? GetExternalGames(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -106,7 +100,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<ExternalGame?> GetObjectFromServer(string WhereClause)
         {
             // get ExternalGames metadata
-            var results = await igdb.QueryAsync<ExternalGame>(IGDBClient.Endpoints.ExternalGames, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<ExternalGame>(IGDBClient.Endpoints.ExternalGames, fieldList, WhereClause);
             if (results.Length > 0)
             {
                 var result = results.First();

gaseous-server/Classes/Metadata/Franchises.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Franchise? GetFranchises(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Franchise> GetObjectFromServer(string WhereClause)
         {
             // get FranchiseContentDescriptions metadata
-            var results = await igdb.QueryAsync<Franchise>(IGDBClient.Endpoints.Franchies, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Franchise>(IGDBClient.Endpoints.Franchies, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/GameModes.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static GameMode? GetGame_Modes(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<GameMode> GetObjectFromServer(string WhereClause)
         {
             // get Game_Modes metadata
-            var results = await igdb.QueryAsync<GameMode>(IGDBClient.Endpoints.GameModes, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<GameMode>(IGDBClient.Endpoints.GameModes, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/GameVideos.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static GameVideo? GetGame_Videos(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<GameVideo> GetObjectFromServer(string WhereClause)
         {
             // get Game_Videos metadata
-            var results = await igdb.QueryAsync<GameVideo>(IGDBClient.Endpoints.GameVideos, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<GameVideo>(IGDBClient.Endpoints.GameVideos, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Games.cs

@@ -20,12 +20,6 @@ namespace gaseous_server.Classes.Metadata
             {}
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Game? GetGame(long Id, bool getAllMetadata, bool followSubGames, bool forceRefresh)
         {
             if (Id == 0)
@@ -120,7 +114,9 @@ namespace gaseous_server.Classes.Metadata
                     }
                     return returnValue;
                 case Storage.CacheStatus.Current:
-                    return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
+                    returnValue = Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
+                    UpdateSubClasses(returnValue, false, false);
+                    return returnValue;
                 default:
                     throw new Exception("How did you get here?");
             }
@@ -130,9 +126,16 @@ namespace gaseous_server.Classes.Metadata
         {
             // required metadata
             if (Game.Cover != null)
+            {
+                try
                 {
                     Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
                 }
+                catch (Exception ex)
+                {
+                    Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch cover artwork.", ex);
+                }
+            }
 
             if (Game.Genres != null)
             {
@@ -181,6 +184,7 @@ namespace gaseous_server.Classes.Metadata
                     AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
                 }
             }
+            AgeGroups.GetAgeGroup(Game);
 
             if (Game.ReleaseDates != null)
             {
@@ -204,9 +208,16 @@ namespace gaseous_server.Classes.Metadata
                 if (Game.Artworks != null)
                 {
                     foreach (long ArtworkId in Game.Artworks.Ids)
+                    {
+                        try
                         {
                             Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
                         }
+                        catch (Exception ex)
+                        {
+                            Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch artwork id: " + ArtworkId, ex);
+                        }
+                    }
                 }
 
                 if (followSubGames)
@@ -271,9 +282,16 @@ namespace gaseous_server.Classes.Metadata
                 if (Game.Screenshots != null)
                 {
                     foreach (long ScreenshotId in Game.Screenshots.Ids)
+                    {
+                        try
                         {
                         Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
                         }
+                        catch (Exception ex)
+                        {
+                            Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch screenshot id: " + ScreenshotId, ex);
+                        }
+                    }
                 }
 
                 if (Game.Videos != null)
@@ -295,42 +313,178 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Game> GetObjectFromServer(string WhereClause)
         {
             // get Game metadata
-            var results = await igdb.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Game>(IGDBClient.Endpoints.Games, fieldList, WhereClause);
             var result = results.First();
 
+            // add artificial unknown platform mapping
+            List<long> platformIds = new List<long>();
+            platformIds.Add(0);
+            if (result.Platforms != null)
+            {
+                if (result.Platforms.Ids != null)
+                {
+                    platformIds.AddRange(result.Platforms.Ids.ToList());
+                }
+            }
+            result.Platforms = new IdentitiesOrValues<Platform>(
+                ids: platformIds.ToArray<long>()
+            );
+
+            // get cover art from parent if this has no cover
+            if (result.Cover == null)
+            {
+                if (result.ParentGame != null)
+                {
+                    if (result.ParentGame.Id != null)
+                    {
+                        Logging.Log(Logging.LogType.Information, "Game Metadata", "Game has no cover art, fetching cover art from parent game");
+                        Game parentGame = GetGame((long)result.ParentGame.Id, false, false, false);
+                        result.Cover = parentGame.Cover;
+                    }
+                }
+            }
+
+            // get missing metadata from parent if this is a port
+            if (result.Category == Category.Port)
+                {
+                if (result.Summary == null)
+                {
+                    if (result.ParentGame != null)
+                    {
+                        if (result.ParentGame.Id != null)
+                        {
+                            Logging.Log(Logging.LogType.Information, "Game Metadata", "Game has no summary, fetching summary from parent game");
+                            Game parentGame = GetGame((long)result.ParentGame.Id, false, false, false);
+                            result.Summary = parentGame.Summary;
+                        }
+                    }
+                }
+            }
+
             return result;
         }
         
+        public static void AssignAllGamesToPlatformIdZero()
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM Game;";
+            DataTable gamesTable = db.ExecuteCMD(sql);
+            foreach (DataRow gameRow in gamesTable.Rows)
+            {
+                sql = "DELETE FROM Relation_Game_Platforms WHERE PlatformsId = 0 AND GameId = @Id; INSERT INTO Relation_Game_Platforms (GameId, PlatformsId) VALUES (@Id, 0);";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("Id", (long)gameRow["Id"]);
+                db.ExecuteCMD(sql, dbDict);
+            }
+        }
+
+        private static bool AllowNoPlatformSearch = false;
+
         public static Game[] SearchForGame(string SearchString, long PlatformId, SearchType searchType)
         {
-            Task<Game[]> games = _SearchForGame(SearchString, PlatformId, searchType);
+            // search local first
+            Logging.Log(Logging.LogType.Information, "Game Search", "Attempting local search of type '" + searchType.ToString() + "' for " + SearchString);
+            Task<Game[]> games = _SearchForGameDatabase(SearchString, PlatformId, searchType);
+            if (games.Result.Length == 0)
+            {
+                // fall back to online search
+                Logging.Log(Logging.LogType.Information, "Game Search", "Falling back to remote search of type '" + searchType.ToString() + "' for " + SearchString);
+                games = _SearchForGameRemote(SearchString, PlatformId, searchType);
+            }
             return games.Result;
         }
 
-        private static async Task<Game[]> _SearchForGame(string SearchString, long PlatformId, SearchType searchType)
+        private static async Task<Game[]> _SearchForGameDatabase(string SearchString, long PlatformId, SearchType searchType)
         {
-            string searchBody = "";
-            searchBody += "fields id,name,slug,platforms,summary; ";
+            string whereClause = "";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+
+            bool allowSearch = true;
             switch (searchType)
             {
                 case SearchType.searchNoPlatform:
-                    searchBody += "search \"" + SearchString + "\"; ";
+                    whereClause = "MATCH(`Name`) AGAINST (@gamename)";
+                    dbDict.Add("platformid", PlatformId);
+                    dbDict.Add("gamename", SearchString);
+
+                    allowSearch = AllowNoPlatformSearch;
                     break;
                 case SearchType.search:
-                    searchBody += "search \"" + SearchString + "\"; ";
-                    searchBody += "where platforms = (" + PlatformId + ");";
+                    whereClause = "PlatformsId = @platformid AND MATCH(`Name`) AGAINST (@gamename)";
+                    dbDict.Add("platformid", PlatformId);
+                    dbDict.Add("gamename", SearchString);
                     break;
                 case SearchType.wherefuzzy:
-                    searchBody += "where platforms = (" + PlatformId + ") & name ~ *\"" + SearchString + "\"*;";
+                    whereClause = "PlatformsId = @platformid AND `Name` LIKE @gamename";
+                    dbDict.Add("platformid", PlatformId);
+                    dbDict.Add("gamename", "%" + SearchString + "%");
                     break;
                 case SearchType.where:
-                    searchBody += "where platforms = (" + PlatformId + ") & name ~ \"" + SearchString + "\";";
+                    whereClause = "PlatformsId = @platformid AND `Name` = @gamename";
+                    dbDict.Add("platformid", PlatformId);
+                    dbDict.Add("gamename", SearchString);
+                    break;
+            }
+
+            string sql = "SELECT Game.Id, Game.`Name`, Game.Slug, Relation_Game_Platforms.PlatformsId AS PlatformsId, Game.Summary FROM gaseous.Game JOIN Relation_Game_Platforms ON Game.Id = Relation_Game_Platforms.GameId WHERE " + whereClause + ";";
+            
+
+            // get Game metadata
+            Game[]? results = new Game[0];
+            if (allowSearch == true)
+            {
+                List<Game> searchResults = new List<Game>();
+                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                DataTable data = db.ExecuteCMD(sql, dbDict);
+                foreach (DataRow row in data.Rows)
+                {
+                    Game game = new Game{
+                        Id = (long)row["Id"],
+                        Name = (string)row["Name"],
+                        Slug = (string)row["Slug"],
+                        Summary = (string)row["Summary"]
+                    };
+                    searchResults.Add(game);
+                }
+
+                results = searchResults.ToArray();
+            }
+
+            return results;
+        }
+
+        private static async Task<Game[]> _SearchForGameRemote(string SearchString, long PlatformId, SearchType searchType)
+        {
+            string searchBody = "";
+            string searchFields = "fields id,name,slug,platforms,summary; ";
+            bool allowSearch = true;
+            switch (searchType)
+            {
+                case SearchType.searchNoPlatform:
+                    searchBody = "search \"" + SearchString + "\"; ";
+
+                    allowSearch = AllowNoPlatformSearch;
+                    break;
+                case SearchType.search:
+                    searchBody = "search \"" + SearchString + "\"; where platforms = (" + PlatformId + ");";
+                    break;
+                case SearchType.wherefuzzy:
+                    searchBody = "where platforms = (" + PlatformId + ") & name ~ *\"" + SearchString + "\"*;";
+                    break;
+                case SearchType.where:
+                    searchBody = "where platforms = (" + PlatformId + ") & name ~ \"" + SearchString + "\";";
                     break;
             }
             
 
             // get Game metadata
-            var results = await igdb.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: searchBody);
+            Communications comms = new Communications();
+            Game[]? results = new Game[0];
+            if (allowSearch == true)
+            {
+                results = await comms.APIComm<Game>(IGDBClient.Endpoints.Games, searchFields, searchBody);
+            }
 
             return results;
         }
@@ -353,6 +507,7 @@ namespace gaseous_server.Classes.Metadata
                 this.TotalRatingCount = gameObject.TotalRatingCount;
                 this.Cover = gameObject.Cover;
                 this.Artworks = gameObject.Artworks;
+                this.FirstReleaseDate = gameObject.FirstReleaseDate;
 
                 // compile age ratings
                 this.AgeRatings = new List<AgeRating>();
@@ -373,6 +528,7 @@ namespace gaseous_server.Classes.Metadata
             public string Name { get; set; }
             public double? TotalRating { get; set; }
             public int? TotalRatingCount { get; set; }
+            public DateTimeOffset? FirstReleaseDate { get; set; }
             public IGDB.IdentityOrValue<IGDB.Models.Cover> Cover { get; set; }
             public IGDB.IdentitiesOrValues<IGDB.Models.Artwork> Artworks { get; set; }
             public List<IGDB.Models.AgeRating> AgeRatings { get; set; }

gaseous-server/Classes/Metadata/Genres.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Genre? GetGenres(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Genre> GetObjectFromServer(string WhereClause)
         {
             // get Genres metadata
-            var results = await igdb.QueryAsync<Genre>(IGDBClient.Endpoints.Genres, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Genre>(IGDBClient.Endpoints.Genres, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/InvolvedCompany.cs

@@ -12,12 +12,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static InvolvedCompany? GetInvolvedCompanies(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -113,7 +107,8 @@ namespace gaseous_server.Classes.Metadata
             // get InvolvedCompanies metadata
             try
             {
-                var results = await igdb.QueryAsync<InvolvedCompany>(IGDBClient.Endpoints.InvolvedCompanies, query: fieldList + " " + WhereClause + ";");
+                Communications comms = new Communications();
+            var results = await comms.APIComm<InvolvedCompany>(IGDBClient.Endpoints.InvolvedCompanies, fieldList, WhereClause);
                 var result = results.First();
 
                 return result;

gaseous-server/Classes/Metadata/MultiplayerModes.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static MultiplayerMode? GetGame_MultiplayerModes(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<MultiplayerMode> GetObjectFromServer(string WhereClause)
         {
             // get Game_MultiplayerModes metadata
-            var results = await igdb.QueryAsync<MultiplayerMode>(IGDBClient.Endpoints.MultiplayerModes, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<MultiplayerMode>(IGDBClient.Endpoints.MultiplayerModes, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/PlatformLogos.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static PlatformLogo? GetPlatformLogo(long? Id, string LogoPath)
         {
             if ((Id == 0) || (Id == null))
@@ -118,7 +112,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<PlatformLogo?> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get PlatformLogo metadata
-            var results = await igdb.QueryAsync<PlatformLogo>(IGDBClient.Endpoints.PlatformLogos, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<PlatformLogo>(IGDBClient.Endpoints.PlatformLogos, fieldList, WhereClause);
             if (results.Length > 0)
             {
                 var result = results.First();

gaseous-server/Classes/Metadata/PlatformVersions.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
 		{
 		}
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static PlatformVersion? GetPlatformVersion(long Id, Platform ParentPlatform)
         {
             if (Id == 0)
@@ -113,7 +107,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<PlatformVersion?> GetObjectFromServer(string WhereClause)
         {
             // get PlatformVersion metadata
-            var results = await igdb.QueryAsync<PlatformVersion>(IGDBClient.Endpoints.PlatformVersions, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<PlatformVersion>(IGDBClient.Endpoints.PlatformVersions, fieldList, WhereClause);
             if (results.Length > 0)
             {
                 var result = results.First();

gaseous-server/Classes/Metadata/Platforms.cs

@@ -15,12 +15,6 @@ namespace gaseous_server.Classes.Metadata
 
 		}
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Platform? GetPlatform(long Id, bool forceRefresh = false)
 		{
             if (Id == 0)
@@ -168,11 +162,26 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Platform> GetObjectFromServer(string WhereClause)
         {
             // get platform metadata
-            var results = await igdb.QueryAsync<Platform>(IGDBClient.Endpoints.Platforms, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Platform>(IGDBClient.Endpoints.Platforms, fieldList, WhereClause);
             var result = results.First();
 
             return result;
         }
+
+        public static void AssignAllPlatformsToGameIdZero()
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM Platform;";
+            DataTable platformsTable = db.ExecuteCMD(sql);
+            foreach (DataRow platformRow in platformsTable.Rows)
+            {
+                sql = "DELETE FROM Relation_Game_Platforms WHERE GameId = 0 AND PlatformsId = @Id; INSERT INTO Relation_Game_Platforms (GameId, PlatformsId) VALUES (0, @Id);";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("Id", (long)platformRow["Id"]);
+                db.ExecuteCMD(sql, dbDict);
+            }
+        }
     }
 }
 

gaseous-server/Classes/Metadata/PlayerPerspectives.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static PlayerPerspective? GetGame_PlayerPerspectives(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -105,7 +99,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<PlayerPerspective> GetObjectFromServer(string WhereClause)
         {
             // get Game_PlayerPerspectives metadata
-            var results = await igdb.QueryAsync<PlayerPerspective>(IGDBClient.Endpoints.PlayerPerspectives, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<PlayerPerspective>(IGDBClient.Endpoints.PlayerPerspectives, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/ReleaseDates.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static ReleaseDate? GetReleaseDates(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -103,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<ReleaseDate> GetObjectFromServer(string WhereClause)
         {
             // get ReleaseDates metadata
-            var results = await igdb.QueryAsync<ReleaseDate>(IGDBClient.Endpoints.ReleaseDates, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<ReleaseDate>(IGDBClient.Endpoints.ReleaseDates, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Screenshots.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Screenshot? GetScreenshot(long? Id, string LogoPath)
         {
             if ((Id == 0) || (Id == null))
@@ -114,7 +108,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Screenshot> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get Screenshot metadata
-            var results = await igdb.QueryAsync<Screenshot>(IGDBClient.Endpoints.Screenshots, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Screenshot>(IGDBClient.Endpoints.Screenshots, fieldList, WhereClause);
             var result = results.First();
 
             //GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb, result.ImageId);

gaseous-server/Classes/Metadata/Storage.cs

@@ -16,33 +16,15 @@ namespace gaseous_server.Classes.Metadata
 			Expired
 		}
 
-        private static Dictionary<string, MemoryCacheObject> ObjectCache = new Dictionary<string, MemoryCacheObject>();
-
 		public static CacheStatus GetCacheStatus(string Endpoint, string Slug)
-		{
-            CacheClean();
-            if (ObjectCache.ContainsKey(Endpoint + Slug))
-            {
-                return CacheStatus.Current;
-            }
-            else
 		{
             return _GetCacheStatus(Endpoint, "slug", Slug);
 		}
-		}
 
         public static CacheStatus GetCacheStatus(string Endpoint, long Id)
         {
-            CacheClean();
-            if (ObjectCache.ContainsKey(Endpoint + Id))
-            {
-                return CacheStatus.Current;
-            }
-            else
-			{
             return _GetCacheStatus(Endpoint, "id", Id);
         }
-        }
 
         public static CacheStatus GetCacheStatus(DataRow Row)
         {
@@ -185,21 +167,6 @@ namespace gaseous_server.Classes.Metadata
 		{
             string Endpoint = EndpointType.GetType().Name;
 
-            if (ObjectCache.ContainsKey(Endpoint + SearchValue))
-            {
-                MemoryCacheObject cacheObject = ObjectCache[Endpoint + SearchValue];
-                if (cacheObject.ExpiryTime < DateTime.UtcNow)
-                {
-                    // object has expired, remove it
-                    ObjectCache.Remove(Endpoint + SearchValue);
-                }
-                else
-                {
-                    // object is valid, return it
-                    return (T)cacheObject.Object;
-                }
-            }
-
             Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             string sql = "SELECT * FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField;
@@ -218,19 +185,7 @@ namespace gaseous_server.Classes.Metadata
             {
 				DataRow dataRow = dt.Rows[0];
                 object returnObject = BuildCacheObject<T>(EndpointType, dataRow);
-                try {
-                    if (!ObjectCache.ContainsKey(Endpoint + SearchValue))
-                    {
-                        ObjectCache.Add(Endpoint + SearchValue, new MemoryCacheObject{
-                            Object = returnObject
-                        });
-                    }
-                }
-                catch
-                {
-                    // unable add item to cache
-                    ObjectCache.Clear();
-                }
+                
                 return (T)returnObject;
             }
         }
@@ -414,6 +369,15 @@ namespace gaseous_server.Classes.Metadata
                                 case "[igdb.models.startdatecategory":
                                     property.SetValue(EndpointType, (StartDateCategory)dataRow[property.Name]);
                                     break;
+                                case "[igdb.models.releasedateregion":
+                                    property.SetValue(EndpointType, (ReleaseDateRegion)dataRow[property.Name]);
+                                    break;
+                                case "[igdb.models.releasedatecategory":
+                                    property.SetValue(EndpointType, (ReleaseDateCategory)dataRow[property.Name]);
+                                    break;
+                                case "[gaseous_server.classes.metadata.agegroups+agerestrictiongroupings":
+                                    property.SetValue(EndpointType, (AgeGroups.AgeRestrictionGroupings)dataRow[property.Name]);
+                                    break;
                                 default:
                                     property.SetValue(EndpointType, dataRow[property.Name]);
                                     break;
@@ -464,29 +428,6 @@ namespace gaseous_server.Classes.Metadata
             }
         }
 
-        private static void CacheClean()
-        {
-            try
-            {
-                if (ObjectCache == null)
-                {
-                    ObjectCache = new Dictionary<string, MemoryCacheObject>();
-                }
-                Dictionary<string, MemoryCacheObject> workCache = ObjectCache;
-                foreach (KeyValuePair<string, MemoryCacheObject> objectCache in workCache)
-                {
-                    if (objectCache.Value.ExpiryTime < DateTime.UtcNow)
-                    {
-                        ObjectCache.Remove(objectCache.Key);
-                    }
-                }
-            }
-            catch
-            {
-                ObjectCache = new Dictionary<string, MemoryCacheObject>();
-            }
-        }
-
         private class MemoryCacheObject
         {
             public object Object { get; set; }

gaseous-server/Classes/Metadata/Themes.cs

@@ -13,12 +13,6 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
         public static Theme? GetGame_Themes(long? Id)
         {
             if ((Id == 0) || (Id == null))
@@ -105,7 +99,8 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Theme> GetObjectFromServer(string WhereClause)
         {
             // get Game_Themes metadata
-            var results = await igdb.QueryAsync<Theme>(IGDBClient.Endpoints.Themes, query: fieldList + " " + WhereClause + ";");
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Theme>(IGDBClient.Endpoints.Themes, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/MetadataManagement.cs

@@ -4,30 +4,39 @@ using gaseous_server.Models;
 
 namespace gaseous_server.Classes
 {
-	public class MetadataManagement
+	public class MetadataManagement : QueueItemStatus
 	{
-		public static void RefreshMetadata(bool forceRefresh = false)
+		public void RefreshMetadata(bool forceRefresh = false)
 		{
             Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "";
 			DataTable dt = new DataTable();
 			
+			// disabling forceRefresh
+			forceRefresh = false;
+
 			// update platforms
 			sql = "SELECT Id, `Name` FROM Platform;";
 			dt = db.ExecuteCMD(sql);
 
+			int StatusCounter = 1;
 			foreach (DataRow dr in dt.Rows)
 			{
+				SetStatus(StatusCounter, dt.Rows.Count, "Refreshing metadata for platform " + dr["name"]);
+
 				try
 				{
-					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for platform " + dr["name"] + " (" + dr["id"] + ")");
+					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "(" + StatusCounter + "/" + dt.Rows.Count + "): Refreshing metadata for platform " + dr["name"] + " (" + dr["id"] + ")");
 					Metadata.Platforms.GetPlatform((long)dr["id"], true);
 				}
 				catch (Exception ex)
 				{
 					Logging.Log(Logging.LogType.Critical, "Metadata Refresh", "An error occurred while refreshing metadata for " + dr["name"], ex);
 				}
+
+				StatusCounter += 1;
 			}
+			ClearStatus();
 
 			// update games
 			if (forceRefresh == true)
@@ -42,18 +51,24 @@ namespace gaseous_server.Classes
 			}
 			dt = db.ExecuteCMD(sql);
 
+			StatusCounter = 1;
 			foreach (DataRow dr in dt.Rows)
 			{
+				SetStatus(StatusCounter, dt.Rows.Count, "Refreshing metadata for game " + dr["name"]);
+
 				try
 				{
-					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for game " + dr["name"] + " (" + dr["id"] + ")");
+					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "(" + StatusCounter + "/" + dt.Rows.Count + "): Refreshing metadata for game " + dr["name"] + " (" + dr["id"] + ")");
 					Metadata.Games.GetGame((long)dr["id"], true, false, forceRefresh);
 				}
 				catch (Exception ex)
 				{
 					Logging.Log(Logging.LogType.Critical, "Metadata Refresh", "An error occurred while refreshing metadata for " + dr["name"], ex);
 				}
+
+				StatusCounter += 1;
 			}
+			ClearStatus();
         }
 	}
 }

gaseous-server/Classes/QueueItemStatus.cs

@@ -0,0 +1,41 @@
+namespace gaseous_server.Classes
+{
+    public class QueueItemStatus
+    {
+        internal ProcessQueue.QueueItem? CallingQueueItem = null;
+
+        private int _CurrentItemNumber = 0;
+        private int _MaxItemsNumber = 0;
+        private string _StatusText = "";
+
+        public int CurrentItemNumber => _CurrentItemNumber;
+        public int MaxItemsNumber => _MaxItemsNumber;
+        public string StatusText => _StatusText;
+
+        public void SetStatus(int CurrentItemNumber, int MaxItemsNumber, string StatusText)
+        {
+            this._CurrentItemNumber = CurrentItemNumber;
+            this._MaxItemsNumber = MaxItemsNumber;
+            this._StatusText = StatusText;
+
+            if (CallingQueueItem != null)
+            {
+                CallingQueueItem.CurrentState = _CurrentItemNumber + " of " + _MaxItemsNumber + ": " + _StatusText;
+                CallingQueueItem.CurrentStateProgress = _CurrentItemNumber + " of " + _MaxItemsNumber;
+            }
+        }
+
+        public void ClearStatus()
+        {
+            this._CurrentItemNumber = 0;
+            this._MaxItemsNumber = 0;
+            this._StatusText = "";
+
+            if (CallingQueueItem != null)
+            {
+                CallingQueueItem.CurrentState = "";
+                CallingQueueItem.CurrentStateProgress = "";
+            }
+        }
+    }
+}

gaseous-server/Classes/Roms.cs

@@ -3,6 +3,7 @@ using System.Data;
 using gaseous_signature_parser.models.RomSignatureObject;
 using static gaseous_server.Classes.RomMediaGroup;
 using gaseous_server.Classes.Metadata;
+using IGDB.Models;
 
 namespace gaseous_server.Classes
 {
@@ -14,7 +15,7 @@ namespace gaseous_server.Classes
             {}
         }
 
-		public static GameRomObject GetRoms(long GameId, long PlatformId = -1)
+		public static GameRomObject GetRoms(long GameId, long PlatformId = -1, int pageNumber = 0, int pageSize = 0)
 		{
 			GameRomObject GameRoms = new GameRomObject();
 
@@ -24,23 +25,43 @@ namespace gaseous_server.Classes
             dbDict.Add("id", GameId);
             
 			if (PlatformId == -1) {
-				sql = "SELECT * FROM Games_Roms WHERE GameId = @id ORDER BY `Name`";
+				sql = "SELECT Games_Roms.*, Platform.`Name` AS platformname FROM Games_Roms LEFT JOIN Platform ON Games_Roms.PlatformId = Platform.Id WHERE Games_Roms.GameId = @id ORDER BY Platform.`Name`, Games_Roms.`Name`";
 			} else {
-				sql = "SELECT * FROM Games_Roms WHERE GameId = @id AND PlatformId = @platformid ORDER BY `Name`";
+				sql = "SELECT Games_Roms.*, Platform.`Name` AS platformname FROM Games_Roms LEFT JOIN Platform ON Games_Roms.PlatformId = Platform.Id WHERE Games_Roms.GameId = @id AND Games_Roms.PlatformId = @platformid ORDER BY Platform.`Name`, Games_Roms.`Name`";
 				dbDict.Add("platformid", PlatformId);
 			}
             DataTable romDT = db.ExecuteCMD(sql, dbDict);
 
             if (romDT.Rows.Count > 0)
             {
-				foreach (DataRow romDR in romDT.Rows)
+				// set count of roms
+				GameRoms.Count = romDT.Rows.Count;
+				
+				// setup platforms list
+				Dictionary<long, string> platformDict = new Dictionary<long, string>();
+
+				int pageOffset = pageSize * (pageNumber - 1);
+				for (int i = 0; i < romDT.Rows.Count; i++)
 				{
-					GameRoms.GameRomItems.Add(BuildRom(romDR));
+					GameRomItem gameRomItem = BuildRom(romDT.Rows[i]);
+
+					if ((i >= pageOffset && i < pageOffset + pageSize) || pageSize == 0)
+					{
+						GameRoms.GameRomItems.Add(gameRomItem);
+					}
+
+					if (!platformDict.ContainsKey(gameRomItem.PlatformId))
+					{
+						platformDict.Add(gameRomItem.PlatformId, gameRomItem.Platform);
+					}
 				}
 
 				// get rom media groups
 				GameRoms.MediaGroups = Classes.RomMediaGroup.GetMediaGroupsFromGameId(GameId);
 
+				// sort the platforms
+				GameRoms.Platforms = platformDict.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value).ToList<KeyValuePair<long, string>>();
+
 				return GameRoms;
             }
             else
@@ -52,7 +73,7 @@ namespace gaseous_server.Classes
 		public static GameRomItem GetRom(long RomId)
 		{
 			Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-			string sql = "SELECT * FROM Games_Roms WHERE Id = @id";
+			string sql = "SELECT Games_Roms.*, Platform.`Name` AS platformname FROM Games_Roms LEFT JOIN Platform ON Games_Roms.PlatformId = Platform.Id WHERE Games_Roms.Id = @id";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 			dbDict.Add("id", RomId);
 			DataTable romDT = db.ExecuteCMD(sql, dbDict);
@@ -114,7 +135,7 @@ namespace gaseous_server.Classes
             {
                 Id = (long)romDR["id"],
                 PlatformId = (long)romDR["platformid"],
-				Platform = Classes.Metadata.Platforms.GetPlatform((long)romDR["platformid"]),
+				Platform = (string)romDR["platformname"],
                 GameId = (long)romDR["gameid"],
                 Name = (string)romDR["name"],
                 Size = (long)romDR["size"],
@@ -151,13 +172,15 @@ namespace gaseous_server.Classes
 		{
 			public List<GameRomMediaGroupItem> MediaGroups { get; set; } = new List<GameRomMediaGroupItem>();
 			public List<GameRomItem> GameRomItems { get; set; } = new List<GameRomItem>();
+			public int Count { get; set; }
+			public List<KeyValuePair<long, string>> Platforms { get; set; }
 		}
 
 		public class GameRomItem
 		{
 			public long Id { get; set; }
 			public long PlatformId { get; set; }
-			public IGDB.Models.Platform Platform { get; set; }
+			public string Platform { get; set; }
 			//public Dictionary<string, object>? Emulator { get; set; }
             public Models.PlatformMapping.PlatformMapItem.WebEmulatorItem? Emulator { get; set; }
             public long GameId { get; set; }

gaseous-server/Classes/SignatureIngestors/XML.cs

@@ -6,7 +6,7 @@ using System.Data;
 
 namespace gaseous_server.SignatureIngestors.XML
 {
-    public class XMLIngestor
+    public class XMLIngestor : QueueItemStatus
     {
         public void Import(string SearchPath, gaseous_signature_parser.parser.SignatureParser XMLType)
         {
@@ -31,6 +31,14 @@ namespace gaseous_server.SignatureIngestors.XML
             {
                 string XMLFile = PathContents[i];
 
+                SetStatus(i + 1, PathContents.Length, "Processing signature file: " + XMLFile);
+
+                if (Common.SkippableFiles.Contains(Path.GetFileName(XMLFile), StringComparer.OrdinalIgnoreCase))
+                {
+                    Logging.Log(Logging.LogType.Information, "Signature Ingestor - XML", "Skipping file: " + XMLFile);
+                }
+                else
+                {
                     // check xml file md5
                     Common.hashObject hashObject = new Common.hashObject(XMLFile);
                     sql = "SELECT * FROM Signatures_Sources WHERE SourceMD5=@sourcemd5";
@@ -248,5 +256,7 @@ namespace gaseous_server.SignatureIngestors.XML
                     }
                 }
             }
+            ClearStatus();
+        }
     }
 }

gaseous-server/Controllers/V1.0/FilterController.cs

@@ -18,7 +18,7 @@ namespace gaseous_server.Controllers
     [ApiVersion("1.1")]
     [Authorize]
     [ApiController]
-    public class FilterController : ControllerBase
+    public class FilterController : Controller
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;

gaseous-server/Controllers/V1.0/GamesController.cs

@@ -22,7 +22,7 @@ namespace gaseous_server.Controllers
     [ApiVersion("1.1")]
     [Authorize]
     [ApiController]
-    public class GamesController : ControllerBase
+    public class GamesController : Controller
     {
         [MapToApiVersion("1.0")]
         [HttpGet]
@@ -870,13 +870,13 @@ namespace gaseous_server.Controllers
         [ProducesResponseType(typeof(Classes.Roms.GameRomObject), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         //[ResponseCache(CacheProfileName = "5Minute")]
-        public ActionResult GameRom(long GameId)
+        public ActionResult GameRom(long GameId, int pageNumber = 0, int pageSize = 0, long PlatformId = -1)
         {
             try
             {
                 Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
-                return Ok(Classes.Roms.GetRoms(GameId));
+                return Ok(Classes.Roms.GetRoms(GameId, PlatformId, pageNumber, pageSize));
             }
             catch
             {

gaseous-server/Controllers/V1.0/RomsController.cs

@@ -22,7 +22,7 @@ namespace gaseous_server.Controllers
     [ApiVersion("1.1")]
     [Authorize]
     [ApiController]
-    public class RomsController : ControllerBase
+    public class RomsController : Controller
     {
         [MapToApiVersion("1.0")]
         [MapToApiVersion("1.1")]

gaseous-server/Controllers/V1.0/SearchController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
 using IGDB;
 using IGDB.Models;
 using Microsoft.AspNetCore.Authorization;
@@ -19,12 +20,6 @@ namespace gaseous_server.Controllers
     [Authorize]
     public class SearchController : Controller
     {
-        private static IGDBClient igdb = new IGDBClient(
-                            // Found in Twitch Developer portal for your app
-                            Config.IGDB.ClientId,
-                            Config.IGDB.Secret
-                        );
-
         [MapToApiVersion("1.0")]
         [MapToApiVersion("1.1")]
         [HttpGet]
@@ -39,11 +34,12 @@ namespace gaseous_server.Controllers
         private static async Task<List<Platform>> _SearchForPlatform(string SearchString)
         {
             string searchBody = "";
-            searchBody += "fields abbreviation,alternative_name,category,checksum,created_at,generation,name,platform_family,platform_logo,slug,summary,updated_at,url,versions,websites; ";
+            string searchFields = "fields abbreviation,alternative_name,category,checksum,created_at,generation,name,platform_family,platform_logo,slug,summary,updated_at,url,versions,websites; ";
             searchBody += "where name ~ *\"" + SearchString + "\"*;";
 
             // get Platform metadata
-            var results = await igdb.QueryAsync<Platform>(IGDBClient.Endpoints.Platforms, query: searchBody);
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Platform>(IGDBClient.Endpoints.Platforms, searchFields, searchBody);
 
             return results.ToList();
         }
@@ -62,12 +58,13 @@ namespace gaseous_server.Controllers
         private static async Task<List<Game>> _SearchForGame(long PlatformId, string SearchString)
         {
             string searchBody = "";
-            searchBody += "fields cover.*,first_release_date,name,platforms,slug; ";
+            string searchFields = "fields cover.*,first_release_date,name,platforms,slug; ";
             searchBody += "search \"" + SearchString + "\";";
             searchBody += "where platforms = (" + PlatformId + ");";
 
             // get Platform metadata
-            var results = await igdb.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: searchBody);
+            Communications comms = new Communications();
+            var results = await comms.APIComm<Game>(IGDBClient.Endpoints.Games, searchFields, searchBody);
 
             return results.ToList();
         }

gaseous-server/Controllers/V1.0/SignaturesController.cs

@@ -18,7 +18,7 @@ namespace gaseous_server.Controllers
     [ApiVersion("1.0")]
     [ApiVersion("1.1")]
     [Authorize]
-    public class SignaturesController : ControllerBase
+    public class SignaturesController : Controller
     {
         /// <summary>
         /// Get the current signature counts from the database

gaseous-server/Controllers/V1.0/SystemController.cs

@@ -103,7 +103,7 @@ namespace gaseous_server.Controllers
                 "var AgeRatingStrings = " + JsonSerializer.Serialize(AgeRatingsStrings, new JsonSerializerOptions{
                     WriteIndented = true
                 }) + ";" + Environment.NewLine +
-                "var AgeRatingGroups = " + JsonSerializer.Serialize(AgeRatings.AgeGroups.AgeGroupingsFlat, new JsonSerializerOptions{
+                "var AgeRatingGroups = " + JsonSerializer.Serialize(AgeGroups.AgeGroupingsFlat, new JsonSerializerOptions{
                     WriteIndented = true
                 }) + ";";
             byte[] bytes = Encoding.UTF8.GetBytes(ver);

gaseous-server/Controllers/V1.1/FirstSetupController.cs

@@ -52,15 +52,22 @@ namespace gaseous_server.Controllers
                         NormalizedEmail = model.Email.ToUpper(),
                         SecurityProfile = new SecurityProfileViewModel()
                     };
+                    Logging.Log(Logging.LogType.Information, "First Run", "Creating new account " + model.Email);
                     var result = await _userManager.CreateAsync(user, model.Password);
                     if (result.Succeeded)
                     {
+                        Logging.Log(Logging.LogType.Information, "First Run", "Creation of " + model.Email + " successful.");
+                        Logging.Log(Logging.LogType.Information, "First Run", "Adding Player role to " + model.Email);
                         await _userManager.AddToRoleAsync(user, "Player");
+                        Logging.Log(Logging.LogType.Information, "First Run", "Adding Gamer role to " + model.Email);
                         await _userManager.AddToRoleAsync(user, "Gamer");
+                        Logging.Log(Logging.LogType.Information, "First Run", "Adding Admin role to " + model.Email);
                         await _userManager.AddToRoleAsync(user, "Admin");
 
+                        Logging.Log(Logging.LogType.Information, "First Run", "Signing in as " + model.Email);
                         await _signInManager.SignInAsync(user, isPersistent: true);
                         
+                        Logging.Log(Logging.LogType.Information, "First Run", "Setting first run state to 1");
                         Config.SetSetting("FirstRunStatus", "1");
 
                         return Ok(result);

gaseous-server/Controllers/V1.1/GamesController.cs

@@ -192,11 +192,14 @@ namespace gaseous_server.Controllers.v1_1
 
             string tempVal = "";
 
+            string nameWhereClause = "";
             if (model.Name.Length > 0)
             {
-                tempVal = "`Name` LIKE @Name";
-                whereParams.Add("@Name", "%" + model.Name + "%");
-                havingClauses.Add(tempVal);
+                // tempVal = "`Name` LIKE @Name";
+                // whereParams.Add("@Name", "%" + model.Name + "%");
+                // havingClauses.Add(tempVal);
+                nameWhereClause = "WHERE (MATCH(Game.`Name`) AGAINST (@Name IN BOOLEAN MODE) OR MATCH(AlternativeName.`Name`) AGAINST (@Name IN BOOLEAN MODE))";
+                whereParams.Add("@Name", "(*" + model.Name + "*) (" + model.Name + ") ");
             }
 
             if (model.GameRating != null)
@@ -263,9 +266,10 @@ namespace gaseous_server.Controllers.v1_1
                 }
             }
 
+            string platformWhereClause = "";
             if (model.Platform.Count > 0)
             {
-                tempVal = "Games_Roms.PlatformId IN (";
+                tempVal = " AND Games_Roms.PlatformId IN (";
                 for (int i = 0; i < model.Platform.Count; i++)
                 {
                     if (i > 0)
@@ -277,7 +281,8 @@ namespace gaseous_server.Controllers.v1_1
                     whereParams.Add(platformLabel, model.Platform[i]);
                 }
                 tempVal += ")";
-                whereClauses.Add(tempVal);
+                //whereClauses.Add(tempVal);
+                platformWhereClause = tempVal;
             }
 
             if (model.Genre.Count > 0)
@@ -352,7 +357,7 @@ namespace gaseous_server.Controllers.v1_1
             {
                 if (model.GameAgeRating.AgeGroupings.Count > 0)
                 {
-                    tempVal = "(AgeGroupId IN (";
+                    tempVal = "(Game.AgeGroupId IN (";
                     for (int i = 0; i < model.GameAgeRating.AgeGroupings.Count; i++)
                     {
                         if (i > 0)
@@ -367,7 +372,7 @@ namespace gaseous_server.Controllers.v1_1
 
                     if (model.GameAgeRating.IncludeUnrated == true)
                     {
-                        tempVal += " OR AgeGroupId IS NULL";
+                        tempVal += " OR Game.AgeGroupId IS NULL";
                     }
                     tempVal += ")";
 
@@ -439,7 +444,9 @@ namespace gaseous_server.Controllers.v1_1
             string orderByClause = "ORDER BY `" + orderByField + "` " + orderByOrder;
 
             Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT DISTINCT view_Games.* FROM view_Games LEFT JOIN Games_Roms ON view_Games.Id = Games_Roms.GameId LEFT JOIN Relation_Game_Genres ON view_Games.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON view_Games.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON view_Games.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON view_Games.Id = Relation_Game_Themes.GameId " + whereClause + " " + havingClause + " " + orderByClause;
+            //string sql = "SELECT DISTINCT view_Games.* FROM view_Games LEFT JOIN Relation_Game_Platforms ON view_Games.Id = Relation_Game_Platforms.GameId AND (Relation_Game_Platforms.PlatformsId IN (SELECT DISTINCT PlatformId FROM Games_Roms WHERE Games_Roms.GameId = view_Games.Id)) LEFT JOIN Relation_Game_Genres ON view_Games.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON view_Games.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON view_Games.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON view_Games.Id = Relation_Game_Themes.GameId " + whereClause + " " + havingClause + " " + orderByClause;
+
+            string sql = "SELECT DISTINCT Game.Id, Game.`Name`, Game.NameThe, Game.PlatformId, Game.TotalRating, Game.TotalRatingCount, Game.Cover, Game.Artworks, Game.FirstReleaseDate, Game.Category, Game.ParentGame, Game.AgeRatings, Game.AgeGroupId, Game.RomCount FROM (SELECT DISTINCT Game.*, CASE WHEN Game.`Name` LIKE 'The %' THEN CONCAT(TRIM(SUBSTR(Game.`Name` FROM 4)), ', The') ELSE Game.`Name` END AS NameThe, Games_Roms.PlatformId, AgeGroup.AgeGroupId, COUNT(Games_Roms.Id) AS RomCount FROM Game LEFT JOIN AgeGroup ON Game.Id = AgeGroup.GameId LEFT JOIN Games_Roms ON Game.Id = Games_Roms.GameId" + platformWhereClause + " LEFT JOIN AlternativeName ON Game.Id = AlternativeName.Game " + nameWhereClause + " GROUP BY Game.Id HAVING RomCount > 0) Game LEFT JOIN Relation_Game_Genres ON Game.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON Game.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON Game.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId " + whereClause + " " + havingClause + " " + orderByClause;
 
             List<IGDB.Models.Game> RetVal = new List<IGDB.Models.Game>();
 
@@ -450,26 +457,15 @@ namespace gaseous_server.Controllers.v1_1
             
             // compile data for return
             int pageOffset = pageSize * (pageNumber - 1);
-            for (int i = 0; i < dbResponse.Rows.Count; i++)
+            for (int i = pageOffset; i < dbResponse.Rows.Count; i++)
             {
-                DataRow dr = dbResponse.Rows[i];
-
-                bool includeGame = false;
-
-                if (pageSize == 0)
+                if (i >= (pageOffset + pageSize))
                 {
-                    // page size is full size include all
-                    includeGame = true;
-                }
-                else if (i >= pageOffset && i < (pageOffset + pageSize))
-                {
-                    includeGame = true;
+                    break;
                 }
 
-                if (includeGame == true)
-                {
-                    RetVal.Add(Classes.Metadata.Games.GetGame(dr));
-                }
+                Game retGame = Storage.BuildCacheObject<Game>(new Game() , dbResponse.Rows[i]);
+                RetVal.Add(retGame);
             }
 
             GameReturnPackage gameReturn = new GameReturnPackage(RecordCount, RetVal);

gaseous-server/Models/PlatformMapping.cs

@@ -157,18 +157,18 @@ namespace gaseous_server.Models
             if (Update == false)
             {
                 // insert
-                sql = "INSERT INTO PlatformMap (Id, RetroPieDirectoryName, WebEmulator_Type, WebEmulator_Core, AvailableWebEmulators) VALUES (@Id, @RetroPieDirectoryName, @WebEmulator_Type, @WebEmulator_Core, @AvailableWebEmulators)";
+                sql = "INSERT INTO PlatformMap (Id, RetroPieDirectoryName, WebEmulator_Type, WebEmulator_Core, AvailableWebEmulators) VALUES (@Id, @RetroPieDirectoryName, @WebEmulator_Type, @WebEmulator_Core, @AvailableWebEmulators);";
             }
             else
             {
                 // update
                 if (AllowAvailableEmulatorOverwrite == true)
                 {
-                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core, AvailableWebEmulators=@AvailableWebEmulators WHERE Id = @Id";
+                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core, AvailableWebEmulators=@AvailableWebEmulators WHERE Id = @Id; ";
                 }
                 else
                 {
-                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core WHERE Id = @Id";
+                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core WHERE Id = @Id;";
                 }
             }
             dbDict.Add("Id", item.IGDBId);

gaseous-server/ProcessQueue.cs

@@ -1,4 +1,6 @@
 using System;
+using System.ComponentModel.Design.Serialization;
+using System.Data;
 using gaseous_server.Classes;
 
 namespace gaseous_server
@@ -13,7 +15,7 @@ namespace gaseous_server
             {
                 _ItemType = ItemType;
                 _ItemState = QueueItemState.NeverStarted;
-                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ")));
+                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ"))).AddMinutes(-5);
                 _Interval = ExecutionInterval;
                 _AllowManualStart = AllowManualStart;
                 _RemoveWhenStopped = RemoveWhenStopped;
@@ -23,7 +25,7 @@ namespace gaseous_server
             {
                 _ItemType = ItemType;
                 _ItemState = QueueItemState.NeverStarted;
-                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ")));
+                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ"))).AddMinutes(-5);
                 _Interval = ExecutionInterval;
                 _AllowManualStart = AllowManualStart;
                 _RemoveWhenStopped = RemoveWhenStopped;
@@ -33,6 +35,7 @@ namespace gaseous_server
             private QueueItemType _ItemType = QueueItemType.NotConfigured;
             private QueueItemState _ItemState = QueueItemState.NeverStarted;
             private DateTime _LastRunTime = DateTime.UtcNow;
+            private double _LastRunDuration = 0;
             private DateTime _LastFinishTime
             {
                 get
@@ -55,13 +58,16 @@ namespace gaseous_server
             private bool _AllowManualStart = true;
             private bool _RemoveWhenStopped = false;
             private bool _IsBlocked = false;
+            private string _CorrelationId = "";
             private List<QueueItemType> _Blocks = new List<QueueItemType>();
 
             public QueueItemType ItemType => _ItemType;
             public QueueItemState ItemState => _ItemState;
             public DateTime LastRunTime => _LastRunTime;
             public DateTime LastFinishTime => _LastFinishTime;
-            public DateTime NextRunTime {
+            public double LastRunDuration => _LastRunDuration;
+            public DateTime NextRunTime 
+            {
                 get
                 {
                     return LastRunTime.AddMinutes(Interval);
@@ -85,6 +91,9 @@ namespace gaseous_server
             public bool RemoveWhenStopped => _RemoveWhenStopped;
             public bool IsBlocked => _IsBlocked;
             public object? Options { get; set; } = null;
+            public string CurrentState { get; set; } = "";
+            public string CurrentStateProgress { get; set; } = "";
+            public string CorrelationId => _CorrelationId;
             public List<QueueItemType> Blocks => _Blocks;
 
             public void Execute()
@@ -99,7 +108,15 @@ namespace gaseous_server
                         _LastResult = "";
                         _LastError = null;
 
-                        Logging.Log(Logging.LogType.Debug, "Timered Event", "Executing " + _ItemType);
+                        // set the correlation id
+                        Guid correlationId = Guid.NewGuid();
+                        _CorrelationId = correlationId.ToString();
+                        CallContext.SetData("CorrelationId", correlationId);
+                        CallContext.SetData("CallingProcess", _ItemType.ToString());
+                        CallContext.SetData("CallingUser", "System");
+
+                        // log the start
+                        Logging.Log(Logging.LogType.Debug, "Timered Event", "Executing " + _ItemType + " with correlation id " + _CorrelationId);
 
                         try
                         {
@@ -107,7 +124,10 @@ namespace gaseous_server
                             {
                                 case QueueItemType.SignatureIngestor:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Signature Ingestor");
-                                    SignatureIngestors.XML.XMLIngestor tIngest = new SignatureIngestors.XML.XMLIngestor();
+                                    SignatureIngestors.XML.XMLIngestor tIngest = new SignatureIngestors.XML.XMLIngestor
+                                    {
+                                        CallingQueueItem = this
+                                    };
 
                                     Logging.Log(Logging.LogType.Debug, "Signature Import", "Processing TOSEC files");
                                     tIngest.Import(Path.Combine(Config.LibraryConfiguration.LibrarySignatureImportDirectory, "TOSEC"), gaseous_signature_parser.parser.SignatureParser.TOSEC);
@@ -124,8 +144,12 @@ namespace gaseous_server
 
                                 case QueueItemType.TitleIngestor:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Title Ingestor");
-                                    Classes.ImportGames importGames = new Classes.ImportGames(Config.LibraryConfiguration.LibraryImportDirectory);
+                                    Classes.ImportGames importGames = new Classes.ImportGames(Config.LibraryConfiguration.LibraryImportDirectory)
+                                    {
+                                        CallingQueueItem = this
+                                    };
 
+                                    // clean up
                                     Classes.ImportGame.DeleteOrphanedDirectories(Config.LibraryConfiguration.LibraryImportDirectory);
 
                                     _SaveLastRunTime = true;
@@ -134,7 +158,11 @@ namespace gaseous_server
 
                                 case QueueItemType.MetadataRefresh:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Metadata Refresher");
-                                    Classes.MetadataManagement.RefreshMetadata(_ForceExecute);
+                                    Classes.MetadataManagement metadataManagement = new MetadataManagement
+                                    {
+                                        CallingQueueItem = this
+                                    };
+                                    metadataManagement.RefreshMetadata(_ForceExecute);
 
                                     _SaveLastRunTime = true;
 
@@ -150,7 +178,11 @@ namespace gaseous_server
 
                                 case QueueItemType.LibraryScan:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Library Scanner");
-                                    Classes.ImportGame.LibraryScan();
+                                    Classes.ImportGame import = new ImportGame
+                                    {
+                                        CallingQueueItem = this
+                                    };
+                                    import.LibraryScan();
 
                                     _SaveLastRunTime = true;
 
@@ -158,7 +190,11 @@ namespace gaseous_server
 
                                 case QueueItemType.Rematcher:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Rematch");
-                                    Classes.ImportGame.Rematcher(_ForceExecute);
+                                    Classes.ImportGame importRematch = new ImportGame
+                                    {
+                                        CallingQueueItem = this
+                                    };
+                                    importRematch.Rematcher(_ForceExecute);
 
                                     _SaveLastRunTime = true;
 
@@ -181,7 +217,10 @@ namespace gaseous_server
 
                                 case QueueItemType.Maintainer:
                                     Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Maintenance");
-                                    Classes.Maintenance.RunMaintenance();
+                                    Classes.Maintenance maintenance = new Maintenance{
+                                        CallingQueueItem = this
+                                    };
+                                    maintenance.RunMaintenance();
                                     break;
 
                             }
@@ -196,8 +235,9 @@ namespace gaseous_server
                         _ForceExecute = false;
                         _ItemState = QueueItemState.Stopped;
                         _LastFinishTime = DateTime.UtcNow;
+                        _LastRunDuration = Math.Round((DateTime.UtcNow - _LastRunTime).TotalSeconds, 2);
 
-                        Logging.Log(Logging.LogType.Information, "Timered Event", "Total " + _ItemType + " run time = " + (DateTime.UtcNow - _LastRunTime).TotalSeconds);
+                        Logging.Log(Logging.LogType.Information, "Timered Event", "Total " + _ItemType + " run time = " + _LastRunDuration);
                     }
                 }
             }
@@ -211,6 +251,66 @@ namespace gaseous_server
             {
                 _IsBlocked = BlockState;
             }
+
+            public HasErrorsItem HasErrors
+            {
+                get
+                {
+                    return new HasErrorsItem(_CorrelationId);
+                }
+            }
+
+            public class HasErrorsItem
+            {
+                public HasErrorsItem(string? CorrelationId)
+                {
+                    if (CorrelationId != null)
+                    {
+                        if (CorrelationId.Length > 0)
+                        {
+                            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                            string sql = "SELECT EventType, COUNT(EventType) AS EventTypes FROM gaseous.ServerLogs WHERE CorrelationId = @correlationid GROUP BY EventType ORDER BY EventType DESC LIMIT 1;";
+                            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                            dbDict.Add("correlationid", CorrelationId);
+
+                            DataTable data = db.ExecuteCMD(sql, dbDict);
+
+                            if (data.Rows.Count == 0)
+                            {
+                                ErrorType = null;
+                                ErrorCount = 0;
+                            }
+                            else
+                            {
+                                Logging.LogType errorType = (Logging.LogType)data.Rows[0]["EventType"];
+                                if (errorType != Logging.LogType.Information)
+                                {
+                                    ErrorType = errorType;
+                                    ErrorCount = (int)(long)data.Rows[0]["EventTypes"];
+                                }
+                                else
+                                {
+                                    ErrorType = null;
+                                    ErrorCount = 0;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            ErrorType = null;
+                            ErrorCount = 0;
+                        }
+                    }
+                    else
+                    {
+                        ErrorType = null;
+                        ErrorCount = 0;
+                    }
+                }
+
+                public Logging.LogType? ErrorType { get; set; }
+                public int ErrorCount { get; set; }
+            }
         }
 
         public enum QueueItemType

gaseous-server/Program.cs

@@ -49,6 +49,9 @@ Config.InitSettings();
 // write updated settings back to the config file
 Config.UpdateConfig();
 
+// set api metadata source from config
+Communications.MetadataSource = Config.MetadataConfiguration.Source;
+
 // set initial values
 Guid APIKey = Guid.NewGuid();
 if (Config.ReadSetting("API Key", "Test API Key") == "Test API Key")
@@ -292,27 +295,6 @@ using (var scope = app.Services.CreateScope())
             await roleManager.CreateAsync(applicationRole, CancellationToken.None);
         }
     }
-
-    // // set up administrator account
-    // var userManager = scope.ServiceProvider.GetRequiredService<UserStore>();
-    // if (await userManager.FindByNameAsync("admin@localhost", CancellationToken.None) == null)
-    // {
-    //     ApplicationUser adminUser = new ApplicationUser{
-    //         Id = Guid.NewGuid().ToString(),
-    //         Email = "admin@localhost",
-    //         NormalizedEmail = "ADMIN@LOCALHOST",
-    //         EmailConfirmed = true,
-    //         UserName = "administrator",
-    //         NormalizedUserName = "ADMINISTRATOR"
-    //     };
-
-    //     //set user password
-    //     PasswordHasher<ApplicationUser> ph = new PasswordHasher<ApplicationUser>();
-    //     adminUser.PasswordHash = ph.HashPassword(adminUser, "letmein");
-
-    //     await userManager.CreateAsync(adminUser, CancellationToken.None);
-    //     await userManager.AddToRoleAsync(adminUser, "Admin", CancellationToken.None);
-    // }
 }
 
 app.UseAuthorization();
@@ -326,6 +308,28 @@ app.UseStaticFiles(new StaticFileOptions
 
 app.MapControllers();
 
+app.Use(async (context, next) =>
+{
+    // set the correlation id
+    string correlationId = Guid.NewGuid().ToString();
+    CallContext.SetData("CorrelationId", correlationId);
+    CallContext.SetData("CallingProcess", context.Request.Method + ": " + context.Request.Path);
+    
+    string userIdentity;
+    try
+    {
+        userIdentity = context.User.Claims.Where(x=>x.Type==System.Security.Claims.ClaimTypes.NameIdentifier).FirstOrDefault().Value;
+    }
+    catch
+    {
+        userIdentity = "";
+    }
+    CallContext.SetData("CallingUser", userIdentity);
+
+    context.Response.Headers.Add("x-correlation-id", correlationId.ToString());
+    await next();
+});
+
 // emergency password recovery if environment variable is set
 // process:
 // - set the environment variable "recoveraccount" to the email address of the account to be recovered
@@ -397,7 +401,9 @@ Config.LibraryConfiguration.InitLibrary();
 
 // insert unknown platform and game if not present
 gaseous_server.Classes.Metadata.Games.GetGame(0, false, false, false);
+gaseous_server.Classes.Metadata.Games.AssignAllGamesToPlatformIdZero();
 gaseous_server.Classes.Metadata.Platforms.GetPlatform(0);
+gaseous_server.Classes.Metadata.Platforms.AssignAllPlatformsToGameIdZero();
 
 // extract platform map if not present
 PlatformMapping.ExtractPlatformMap();

gaseous-server/Support/Database/MySQL/gaseous-1008.sql

@@ -0,0 +1,26 @@
+ALTER TABLE `ClassificationMap` 
+ADD INDEX `idx_RatingId` (`RatingId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_AgeRatings` 
+ADD INDEX `idx_SecondaryColumn` (`AgeRatingsId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_GameModes` 
+ADD INDEX `idx_SecondaryColumn` (`GameModesId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_Genres` 
+ADD INDEX `idx_SecondaryColumn` (`GenresId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_Platforms` 
+ADD INDEX `idx_SecondaryColumn` (`PlatformsId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_PlayerPerspectives` 
+ADD INDEX `idx_SecondaryColumn` (`PlayerPerspectivesId` ASC) VISIBLE;
+
+ALTER TABLE `Relation_Game_Themes` 
+ADD INDEX `idx_SecondaryColumn` (`ThemesId` ASC) VISIBLE;
+
+ALTER TABLE `ServerLogs` 
+ADD COLUMN `CorrelationId` VARCHAR(45) NULL AFTER `Exception`,
+ADD COLUMN `CallingProcess` VARCHAR(255) NULL AFTER `CorrelationId`,
+ADD INDEX `idx_CorrelationId` (`CorrelationId` ASC) VISIBLE,
+ADD INDEX `idx_CallingProcess` (`CallingProcess` ASC) VISIBLE;

gaseous-server/Support/Database/MySQL/gaseous-1009.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `Games_Roms` 
+ADD INDEX `id_LibraryId` (`LibraryId` ASC) VISIBLE,
+ADD INDEX `id_MD5` USING BTREE (`MD5`) VISIBLE;
+

gaseous-server/Support/Database/MySQL/gaseous-1010.sql

@@ -0,0 +1,23 @@
+CREATE OR REPLACE VIEW `view_Games` AS
+SELECT 
+    a.*, b.AgeGroupId
+FROM
+    view_GamesWithRoms a
+        INNER JOIN
+    (SELECT 
+        view_GamesWithRoms.Id,
+            MAX((SELECT 
+                    AgeGroupId
+                FROM
+                    ClassificationMap
+                WHERE
+                    RatingId = AgeRating.Rating)) AgeGroupId
+    FROM
+        view_GamesWithRoms
+    LEFT JOIN Relation_Game_AgeRatings ON view_GamesWithRoms.Id = Relation_Game_AgeRatings.GameId
+    LEFT JOIN AgeRating ON Relation_Game_AgeRatings.AgeRatingsId = AgeRating.Id
+    GROUP BY Id) b ON a.Id = b.Id
+ORDER BY NameThe;
+
+ALTER TABLE `ServerLogs` 
+ADD COLUMN `CallingUser` VARCHAR(255) NULL AFTER `CallingProcess`;

gaseous-server/Support/Database/MySQL/gaseous-1011.sql

@@ -0,0 +1,29 @@
+CREATE TABLE `AgeGroup` (
+  `Id` BIGINT NOT NULL,
+  `GameId` BIGINT NULL,
+  `AgeGroupId` INT NULL,
+  `dateAdded` DATETIME NULL DEFAULT NULL,
+  `lastUpdated` DATETIME NULL DEFAULT NULL,
+  PRIMARY KEY (`Id`));
+
+ALTER TABLE `AgeGroup` 
+ADD INDEX `id_GameId` (`GameId` ASC) VISIBLE,
+ADD INDEX `id_AgeGroupId` (`AgeGroupId` ASC) VISIBLE;
+
+ALTER TABLE `Game` 
+CHANGE COLUMN `Slug` `Slug` VARCHAR(255) NULL DEFAULT NULL;
+
+CREATE OR REPLACE VIEW `view_Games` AS
+SELECT 
+    a.*, b.AgeGroupId
+FROM
+    view_GamesWithRoms a
+    LEFT JOIN AgeGroup b ON b.GameId = a.Id
+ORDER BY NameThe;
+
+ALTER TABLE `Game` 
+ADD FULLTEXT INDEX `ft_Name` (`Name`) VISIBLE;
+
+ALTER TABLE `AlternativeName` 
+ADD FULLTEXT INDEX `ft_Name` (`Name`) VISIBLE,
+ADD INDEX `id_GameId` (`Game` ASC) VISIBLE;

gaseous-server/gaseous-server.csproj

@@ -48,6 +48,10 @@
     <None Remove="Support\Database\MySQL\gaseous-1005.sql" />
     <None Remove="Support\Database\MySQL\gaseous-1006.sql" />
     <None Remove="Support\Database\MySQL\gaseous-1007.sql" />
+    <None Remove="Support\Database\MySQL\gaseous-1008.sql" />
+    <None Remove="Support\Database\MySQL\gaseous-1009.sql" />
+    <None Remove="Support\Database\MySQL\gaseous-1010.sql" />
+    <None Remove="Support\Database\MySQL\gaseous-1011.sql" />
     <None Remove="Classes\Metadata\" />
     <None Remove="Assets\" />
     <None Remove="Assets\Ratings\" />
@@ -178,5 +182,9 @@
     <EmbeddedResource Include="Support\Database\MySQL\gaseous-1005.sql" />
     <EmbeddedResource Include="Support\Database\MySQL\gaseous-1006.sql" />
     <EmbeddedResource Include="Support\Database\MySQL\gaseous-1007.sql" />
+    <EmbeddedResource Include="Support\Database\MySQL\gaseous-1008.sql" />
+    <EmbeddedResource Include="Support\Database\MySQL\gaseous-1009.sql" />
+    <EmbeddedResource Include="Support\Database\MySQL\gaseous-1010.sql" />
+    <EmbeddedResource Include="Support\Database\MySQL\gaseous-1011.sql" />
   </ItemGroup>
 </Project>

gaseous-server/wwwroot/index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <script src="/api/v1.1/System/VersionFile"></script>
-    <link type="text/css" rel="stylesheet" dat-href="/styles/style.css" />
+    <link type="text/css" rel="stylesheet" href="/styles/style.css" dat-href="/styles/style.css" />
     <script src="/scripts/jquery-3.6.0.min.js"></script>
     <script src="/scripts/moment-with-locales.min.js"></script>
     <link href="/styles/select2.min.css" rel="stylesheet" />

gaseous-server/wwwroot/pages/dialogs/collectionedit.html

@@ -71,11 +71,11 @@
                     </td>
                     <td>
                         <span id="collection_directorylayout_gaseous_label" name="collection_directorylayout_label">
-                            <p>Standard layout: /&lt;IGDB Platform Slug&gt;/&lt;IGDB Game Slug&gt;/Game ROM's</p>
+                            <p>Standard layout: /&lt;IGDB Platform Slug&gt;/&lt;IGDB Game Slug&gt;/Game ROMs</p>
                             <p>Example: /genesis-slash-megadrive/sonic-the-hedgehog/Sonic the Hedgehog.smd</p>
                         </span>
                         <span id="collection_directorylayout_retropie_label" style="display: none;" name="collection_directorylayout_label">
-                            <p>RetroPie layout: /roms/&lt;RetroPie Platform Label&gt;/Game ROM's</p>
+                            <p>RetroPie layout: /roms/&lt;RetroPie Platform Label&gt;/Game ROMs</p>
                             <p>Example: /roms/megadrive/Sonic the Hedgehog.smd</p>
                         </span>
                     </td>

gaseous-server/wwwroot/pages/dialogs/rominfo.html

@@ -120,9 +120,10 @@
 
     ajaxCall('/api/v1.1/Games/' + gameId + '/roms/' + modalVariables, 'GET', function (result) {
         romData = result;
+        console.log(romData);
         document.getElementById('modal-heading').innerHTML = result.name;
         document.getElementById('rominfo_library').innerHTML = result.library.name;
-        document.getElementById('rominfo_platform').innerHTML = result.platform.name;
+        document.getElementById('rominfo_platform').innerHTML = result.platform;
         document.getElementById('rominfo_size').innerHTML = formatBytes(result.size, 2);
         document.getElementById('rominfo_type').innerHTML = getRomType(result.romType);
         document.getElementById('rominfo_mediatype').innerHTML = result.romTypeMedia;
@@ -132,7 +133,7 @@
         document.getElementById('rominfo_signaturematch').innerHTML = result.source;
         document.getElementById('rominfo_signaturetitle').innerHTML = result.signatureSourceGameTitle;
 
-        document.getElementById('properties_fixplatform').innerHTML = "<option value='" + result.platform.id + "' selected='selected'>" + result.platform.name + "</option>";
+        document.getElementById('properties_fixplatform').innerHTML = "<option value='" + result.platformId + "' selected='selected'>" + result.platform + "</option>";
         document.getElementById('properties_fixgame').innerHTML = "<option value='" + gameData.id + "' selected='selected'>" + gameData.name + "</option>";
 
         if (result.library.isDefaultLibrary == false) {
@@ -196,8 +197,22 @@
         }
     });
 
-    $('#properties_fixgame').select2({
+    $('#properties_fixplatform').on('select2:select', function (e) {
+        var platformData = e.params.data;
+        console.log(platformData);
+
+        var gameValue = $('#properties_fixgame').select2('data');
+        if (gameValue) {
+            console.log(gameValue[0]);
+
+            setFixGameDropDown();
+        }
+    });
+
+    function setFixGameDropDown() {
+        $('#properties_fixgame').empty().select2({
             minimumInputLength: 3,
+            placeholder: 'Game',
             templateResult: DropDownRenderGameOption,
             ajax: {
                 url: '/api/v1.1/Search/Game',
@@ -219,7 +234,8 @@
                         arr.push({
                             id: data[i].id,
                             text: data[i].name,
-                        cover: data[i].cover
+                            cover: data[i].cover,
+                            releaseDate: data[i].firstReleaseDate
                         });
                     }
 
@@ -229,6 +245,8 @@
                 }
             }
         });
+    }
+    setFixGameDropDown();
 
     function SaveFixedGame() {
         var fixplatform = $('#properties_fixplatform').select2('data');

gaseous-server/wwwroot/pages/dialogs/settingsuseredit.html

@@ -50,7 +50,7 @@
                 </th>
             </tr>
             <tr>
-                <th colspan="4"><h3>Games and ROM's</h3></td>
+                <th colspan="4"><h3>Games and ROMs</h3></td>
             </tr>
             <tr class="romrow">
                 <td class="romcell">Play games</td>

gaseous-server/wwwroot/pages/game.html

@@ -74,7 +74,7 @@
         </div>
         <div id="gamesummaryroms">
             <span id="rom_edit" class="romlink" onclick="DisplayROMCheckboxes(true);">Edit</span>
-            <h3>ROM's/Images</h3>
+            <h3>ROMs/Images</h3>
             <div id="rom_edit_panel" style="display: none;">
                 <div id="rom_edit_panel_center">
                     <button id="rom_edit_delete" class="redbutton" onclick="deleteGameRoms();">Delete</button>
@@ -86,7 +86,7 @@
                 </div>
             </div>
         </div>
-        <div id="gamesummarysimilar">
+        <div id="gamesummarysimilar" style="display: none;">
             <h3>Similar Games</h3>
             <div id="gamesummarysimilarcontent"></div>
         </div>
@@ -365,6 +365,8 @@
         var gameSummarySimilar = document.getElementById('gamesummarysimilar');
         ajaxCall('/api/v1.1/Games/' + gameId + '/Related', 'GET', function (result) {
             if (result.games.length > 0) {
+                gameSummarySimilar.removeAttribute('style');
+
                 var gameSummarySimilarContent = document.getElementById('gamesummarysimilar');
                 for (var i = 0; i < result.games.length; i++) {
                     var similarObject = renderGameIcon(result.games[i], false, false, false, null, true);
@@ -382,28 +384,94 @@
         });
         
         // load roms
-        loadRoms();
+        loadRoms(false);
     });
 
-    function loadRoms(displayCheckboxes) {
+    function loadRoms(displayCheckboxes, pageNumber, selectedPlatform) {
+        if (!pageNumber) {
+            pageNumber = 1;
+        }
+
+        if (selectedPlatform == undefined) {
+            selectedPlatform = -1;
+        }
+
+        console.log(selectedPlatform);
+
+        var filterControlBlock = document.getElementById('games_library_controls');
+        if (filterControlBlock) {
+            filterControlBlock.remove();
+        }
+
         var existingTable = document.getElementById('romtable');
         if (existingTable) {
             existingTable.remove();
         }
 
+        var romPager = document.getElementById('romPaginator');
+        if (romPager) {
+            romPager.remove();
+        }
+
         var existingMgTable = document.getElementById('mediagrouptable');
         if (existingMgTable) {
             existingMgTable.remove();
         }
 
+        if (displayCheckboxes == undefined) {
+            if (document.getElementById('rom_edit_panel').style.display == 'none') {
+                displayCheckboxes = false;
+            } else {
+                displayCheckboxes = true;
+            }
+        }
+
         var gameRoms = document.getElementById('gamesummaryroms');
-        ajaxCall('/api/v1.1/Games/' + gameId + '/roms', 'GET', function (result) {
+        var pageSize = 20;
+        ajaxCall('/api/v1.1/Games/' + gameId + '/roms?pageNumber=' + pageNumber + '&pageSize=' + pageSize + '&platformId=' + selectedPlatform, 'GET', function (result) {
+            // display filter tools
+            var filterControls = document.createElement('div');
+            filterControls.id = "games_library_controls";
+
+            var platformFilterBlock = document.createElement('div');
+            platformFilterBlock.className = 'games_library_controlblock';
+
+            var platformFilterOpt = document.createElement('select');
+            platformFilterOpt.id = "platform_filter";
+            platformFilterOpt.setAttribute('onchange', 'loadRoms(' + undefined + ', ' + 1 + ', Number(document.getElementById("platform_filter").value));');
+
+            var platformFilterOptDefault = document.createElement('option');
+            platformFilterOptDefault.value = '-1';
+            platformFilterOptDefault.innerHTML = 'All Platforms';
+            if (selectedPlatform == -1) {
+                platformFilterOptDefault.selected = 'selected';
+            }
+            platformFilterOpt.appendChild(platformFilterOptDefault);
+
+            for (var i = 0; i < result.platforms.length; i++) {
+                var platformFilterOptValue = document.createElement('option');
+                platformFilterOptValue.value = result.platforms[i].key;
+                platformFilterOptValue.innerHTML = result.platforms[i].value;
+                if (selectedPlatform == Number(result.platforms[i].key)) {
+                    platformFilterOptValue.selected = 'selected';
+                }
+                platformFilterOpt.appendChild(platformFilterOptValue);
+            }
+            platformFilterBlock.appendChild(platformFilterOpt);
+            filterControls.appendChild(platformFilterBlock);
+
+            var romCounter = document.createElement('div');
+            romCounter.className = 'games_library_controlblock';
+            romCounter.innerHTML = result.count + ' ROMs';
+            filterControls.appendChild(romCounter);
+
+            gameRoms.appendChild(filterControls);
+
             if (result.gameRomItems) {
                 var gameRomItems = result.gameRomItems;
                 var mediaGroups = result.mediaGroups;
 
-                gameRomItems.sort((a, b) => a.platform.name.charCodeAt(0) - b.platform.name.charCodeAt(0));
-
+                // display roms
                 var newTable = document.createElement('table');
                 newTable.id = 'romtable';
                 newTable.className = 'romtable';
@@ -412,23 +480,21 @@
 
                 var lastPlatform = '';
                 for (var i = 0; i < gameRomItems.length; i++) {
-                    if (gameRomItems[i].platform.name != lastPlatform) {
-                        lastPlatform = gameRomItems[i].platform.name;
+                    if (gameRomItems[i].platform != lastPlatform) {
+                        lastPlatform = gameRomItems[i].platform;
                         var platformRow = document.createElement('tr');
                         var platformHeader = document.createElement('th');
                         platformHeader.setAttribute('colspan', 6);
-                        platformHeader.innerHTML = '<a href="#" onclick="ShowPlatformMappingDialog(' + gameRomItems[i].platform.id + ');" style="float: right; text-decoration: none;" class="romlink"><img src="/images/map.svg" class="banner_button_image banner_button_image_smaller" alt="Edit platform mapping" title="Edit platform mapping" /></a><a href="#" onclick="ShowCollectionDialog(' + gameRomItems[i].platform.id + ');" style="float: right; text-decoration: none;" class="romlink"><img src="/images/collections.svg" class="banner_button_image banner_button_image_smaller" alt="Add to collection" title="Add to collection" /></a>' + gameRomItems[i].platform.name;
+                        platformHeader.innerHTML = '<a href="#" onclick="ShowPlatformMappingDialog(' + gameRomItems[i].platformId + ');" style="float: right; text-decoration: none;" class="romlink"><img src="/images/map.svg" class="banner_button_image banner_button_image_smaller" alt="Edit platform mapping" title="Edit platform mapping" /></a><a href="#" onclick="ShowCollectionDialog(' + gameRomItems[i].platformId + ');" style="float: right; text-decoration: none;" class="romlink"><img src="/images/collections.svg" class="banner_button_image banner_button_image_smaller" alt="Add to collection" title="Add to collection" /></a>' + gameRomItems[i].platform;
                         platformRow.appendChild(platformHeader);
                         newTable.appendChild(platformRow);
                     }
 
-
-
                     var launchButton = '';
                     if (result.gameRomItems[i].emulator) {
                         if (gameRomItems[i].emulator.type) {
                             if (gameRomItems[i].emulator.type.length > 0) {
-                                launchButton = '<a href="/index.html?page=emulator&engine=' + gameRomItems[i].emulator.type + '&core=' + gameRomItems[i].emulator.core + '&platformid=' + gameRomItems[i].platform.id + '&gameid=' + gameId + '&rompath=' + encodeURIComponent('/api/v1.1/Games/' + gameId + '/roms/' + gameRomItems[i].id + '/' + encodeURIComponent(gameRomItems[i].name)) + '" class="romstart">Launch</a>';
+                                launchButton = '<a href="/index.html?page=emulator&engine=' + gameRomItems[i].emulator.type + '&core=' + gameRomItems[i].emulator.core + '&platformid=' + gameRomItems[i].platformId + '&gameid=' + gameId + '&rompath=' + encodeURIComponent('/api/v1.1/Games/' + gameId + '/roms/' + gameRomItems[i].id + '/' + encodeURIComponent(gameRomItems[i].name)) + '" class="romstart">Launch</a>';
                             }
                         }
                     }
@@ -451,6 +517,51 @@
                     DisplayROMCheckboxes(true);
                 }
 
+                if (result.count > pageSize) {
+                    // draw pagination
+                    var numOfPages = Math.ceil(result.count / pageSize);
+                    
+                    var romPaginator = document.createElement('div');
+                    romPaginator.id = 'romPaginator';
+                    romPaginator.className = 'rom_pager';
+
+                    // draw previous page button
+                    var prevPage = document.createElement('span');
+                    prevPage.className = 'rom_pager_number_disabled';
+                    prevPage.innerHTML = '&lt;';
+                    if (pageNumber != 1) {
+                        prevPage.setAttribute('onclick', 'loadRoms(' + undefined + ', ' + (pageNumber - 1) + ', ' + selectedPlatform + ');');
+                        prevPage.className = 'rom_pager_number';
+                    }
+                    romPaginator.appendChild(prevPage);
+
+                    // draw page numbers
+                    for (var i = 0; i < numOfPages; i++) {
+                        var romPaginatorPage = document.createElement('span');
+                        romPaginatorPage.className = 'rom_pager_number_disabled';
+                        romPaginatorPage.innerHTML = (i + 1);
+                        if ((i + 1) != pageNumber) {
+                            romPaginatorPage.setAttribute('onclick', 'loadRoms(' + undefined + ', ' + (i + 1) + ', ' + selectedPlatform + ');');
+                            romPaginatorPage.className = 'rom_pager_number';
+                        }
+
+                        romPaginator.appendChild(romPaginatorPage);
+                    }
+
+                    // draw next page button
+                    var nextPage = document.createElement('span');
+                    nextPage.className = 'rom_pager_number_disabled';
+                    nextPage.innerHTML = '&gt;';
+                    if (pageNumber != numOfPages) {
+                        nextPage.setAttribute('onclick', 'loadRoms(' + undefined + ', ' + (pageNumber + 1) + ', ' + selectedPlatform + ');');
+                        nextPage.className = 'rom_pager_number';
+                    }
+                    romPaginator.appendChild(nextPage);
+
+                    gameRoms.appendChild(romPaginator);
+                }
+                
+                // display media groups
                 var mediaGroupDiv = document.getElementById('gamesummarymediagroups');
                 if (mediaGroups.length == 0) {
                     mediaGroupDiv.style.display = 'none';
@@ -741,7 +852,20 @@
         }
     });
 
-    $('#rom_edit_fixgame').select2({
+    $('#rom_edit_fixplatform').on('select2:select', function (e) {
+        var platformData = e.params.data;
+        console.log(platformData);
+
+        var gameValue = $('#rom_edit_fixgame').select2('data');
+        if (gameValue) {
+            console.log(gameValue[0]);
+
+            setRomFixGameDropDown();
+        }
+    });
+
+    function setRomFixGameDropDown() {
+        $('#rom_edit_fixgame').empty().select2({
             minimumInputLength: 3,
             templateResult: DropDownRenderGameOption,
             placeholder: "Game",
@@ -765,7 +889,8 @@
                         arr.push({
                             id: data[i].id,
                             text: data[i].name,
-                        cover: data[i].cover
+                            cover: data[i].cover,
+                            releaseDate: data[i].firstReleaseDate
                         });
                     }
 
@@ -775,6 +900,8 @@
                 }
             }
         });
+    }
+    setRomFixGameDropDown();
 
     var remapCallCounter = 0;
     var remapCallCounterMax = 0;

gaseous-server/wwwroot/pages/settings.html

@@ -47,6 +47,10 @@
     SelectTab(selectedTab);
 
     function SelectTab(TabName) {
+        if (selectedTab != TabName) {
+            window.location.href = '/index.html?page=settings&sub=' + TabName;
+        }
+
         var tocs = document.getElementsByName('properties_toc_item');
         for (var i = 0; i < tocs.length; i++) {
             if ((tocs[i].id) == ("properties_toc_" + TabName)) {

gaseous-server/wwwroot/pages/settings/logs.html

@@ -5,10 +5,7 @@
 <table style="width: 960px; max-width: 960px;" cellspacing="0">
     <tr>
         <td>
-            <input type="datetime-local" id="logs_startdate" />
-        </td>
-        <td>
-            <input type="datetime-local" id="logs_enddate" />
+            <input type="datetime-local" id="logs_startdate" style="width: 30%;" /> <input type="datetime-local" id="logs_enddate" style="width: 30%;" />
         </td>
         <td>
             <input type="checkbox" id="logs_type_info"><label for="logs_type_info">Information</label>
@@ -19,10 +16,17 @@
         <td>
             <input type="checkbox" id="logs_type_critical"><label for="logs_type_critical">Critical</label>
         </td>
-        <td>
-            <input type="text" id="logs_textsearch" placeholder="Search" />
+    </tr>
+    <tr>
+        <td colspan="1">
+            <input type="text" id="logs_textsearch" placeholder="Search" style="width: 75%;" />
         </td>
-        <td>
+        <td colspan="3">
+            <input type="text" id="logs_correlationid" placeholder="Correlation Id" style="width: 75%;" />
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4" style="text-align: right;">
             <button onclick="loadLogs();">Search</button>
             <button onclick="resetFilters();">Reset</button>
         </td>
@@ -43,6 +47,13 @@
     var currentPage = 1;
     var searchModel = {};
 
+    var correlationIdParam = getQueryString('correlationid', 'string');
+    if (correlationIdParam) {
+        if (correlationIdParam.length > 0) {
+            document.getElementById('logs_correlationid').value = correlationIdParam;
+        }
+    }
+
     function resetFilters() {
         document.getElementById('logs_startdate').value = '';
         document.getElementById('logs_enddate').value = '';
@@ -50,6 +61,7 @@
         document.getElementById('logs_type_warning').checked = false;
         document.getElementById('logs_type_critical').checked = false;
         document.getElementById('logs_textsearch').value = '';
+        document.getElementById('logs_correlationid').value = '';
 
         loadLogs();
     }
@@ -81,6 +93,9 @@
             var searchText = null;
             var searchTextObj = document.getElementById('logs_textsearch');
             if (searchTextObj.value != null) { searchText = searchTextObj.value; }
+            var correlationId = null;
+            var correlationIdTextObj = document.getElementById('logs_correlationid');
+            if (correlationIdTextObj.value != null) { correlationId = correlationIdTextObj.value; }
 
             model = {
                 "StartIndex": StartIndex,
@@ -89,7 +104,8 @@
                 "Status": statusList,
                 "StartDateTime": startDate,
                 "EndDateTime": endDate,
-                "SearchText": searchText
+                "SearchText": searchText,
+                "CorrelationId": correlationId
             }
             searchModel = model;
         }
@@ -123,18 +139,25 @@
                 for (var i = 0; i < result.length; i++) {
                     lastStartIndex = result[i].id;
 
+                    console.log(result[i]);
+
+                    var surroundingRow = document.createElement('tbody');
+                    surroundingRow.setAttribute('colspan', 4);
+                    surroundingRow.className = 'logs_table_row_' + result[i].eventType;
+
                     var newRow = [
-                        //result[i].id,
                         moment(result[i].eventTime).format("YYYY-MM-DD h:mm:ss a"),
                         result[i].eventType,
                         result[i].process,
                         result[i].message
                     ];
 
-                    newTable.appendChild(createTableRow(false, newRow, 'romrow logs_table_row_' + result[i].eventType, 'romcell logs_table_cell'));
+                    surroundingRow.appendChild(createTableRow(false, newRow, '', 'romcell logs_table_cell'));
 
+                    // exception
+                    var exceptionString = '';
                     if (result[i].exceptionValue) {
-                        var exceptionString = "<h3>Exception</h3><pre class='logs_table_exception' style='width: 795px; word-wrap: break-word; overflow-wrap: break-word; overflow-y: scroll;'>" + syntaxHighlight(JSON.stringify(result[i].exceptionValue, null, 2)).replace(/\\n/g, "<br />    ") + "</pre>";
+                        exceptionString = "<strong>Exception</strong><pre class='logs_table_exception' style='width: 795px; word-wrap: break-word; overflow-wrap: break-word; overflow-y: scroll;'>" + syntaxHighlight(JSON.stringify(result[i].exceptionValue, null, 2)).replace(/\\n/g, "<br />    ") + "</pre>";
                         var exRow = document.createElement('tr');
                         var leadCell = document.createElement('td');
                         exRow.appendChild(leadCell);
@@ -142,8 +165,59 @@
                         exCell.colSpan = '3';
                         exCell.innerHTML = exceptionString;
                         exRow.appendChild(exCell);
-                        newTable.appendChild(exRow);
+                        surroundingRow.appendChild(exRow);
                     }
+                    
+                    // calling process
+                    var infoRow = document.createElement('tr');
+                    
+                    var infoRowEmptyCell = document.createElement('td');
+                    infoRowEmptyCell.className = 'romcell';
+
+                    var infoRowDataCell = document.createElement('td');
+                    infoRowDataCell.className = 'romcell';
+                    infoRowDataCell.setAttribute('colspan', 3);
+                    infoRowDataCell.innerHTML = '<strong>Calling process:</strong> ' + result[i].callingProcess;
+
+                    infoRow.appendChild(infoRowEmptyCell);
+                    infoRow.appendChild(infoRowDataCell);
+                    surroundingRow.appendChild(infoRow);
+                    
+                    // initiated by user
+                    if (result[i].callingUser) {
+                        if (result[i].callingUser.length > 0) {
+                            var infoRow3 = document.createElement('tr');
+                            
+                            var infoRowEmptyCell3 = document.createElement('td');
+                            infoRowEmptyCell3.className = 'romcell';
+
+                            var infoRowDataCell3 = document.createElement('td');
+                            infoRowDataCell3.className = 'romcell';
+                            infoRowDataCell3.setAttribute('colspan', 3);
+                            infoRowDataCell3.innerHTML = '<strong>User:</strong> ' + result[i].callingUser + "</a>";
+
+                            infoRow3.appendChild(infoRowEmptyCell3);
+                            infoRow3.appendChild(infoRowDataCell3);
+                            surroundingRow.appendChild(infoRow3);
+                        }
+                    }
+
+                    // correlation id
+                    var infoRow2 = document.createElement('tr');
+                    
+                    var infoRowEmptyCell2 = document.createElement('td');
+                    infoRowEmptyCell2.className = 'romcell';
+
+                    var infoRowDataCell2 = document.createElement('td');
+                    infoRowDataCell2.className = 'romcell';
+                    infoRowDataCell2.setAttribute('colspan', 3);
+                    infoRowDataCell2.innerHTML = '<strong>Correlation Id:</strong> <a class="romlink" href="/index.html?page=settings&sub=logs&correlationid=' + result[i].correlationId + '">' + result[i].correlationId + "</a>";
+
+                    infoRow2.appendChild(infoRowEmptyCell2);
+                    infoRow2.appendChild(infoRowDataCell2);
+                    surroundingRow.appendChild(infoRow2);
+
+                    newTable.appendChild(surroundingRow);
                 }
             },
             function (error) {

gaseous-server/wwwroot/pages/settings/system.html

@@ -25,19 +25,29 @@
 <h3>Signatures</h3>
 <div id="system_signatures"></div>
 
-<script type="text/javascript">function SystemLoadStatus() {
+<script type="text/javascript">
+    function SystemLoadStatus() {
         ajaxCall('/api/v1.1/BackgroundTasks', 'GET', function (result) {
             var newTable = document.createElement('table');
             newTable.className = 'romtable';
             newTable.setAttribute('cellspacing', 0);
-            newTable.appendChild(createTableRow(true, ['Task', 'Status', 'Interval', 'Last Run Time', 'Next Run Time', '']));
+            newTable.appendChild(createTableRow(true, ['Task', 'Status', 'Interval<br/>(minutes)', 'Last Run Duration<br />(hh:mm:ss)', '', 'Last Run Start', 'Next Run Start', '']));
 
             if (result) {
                 for (var i = 0; i < result.length; i++) {
+                    if (result[i].itemState != "Disabled") {
                         var itemTypeName = GetTaskFriendlyName(result[i].itemType, result[i].options);
                         
                         var itemStateName;
                         var itemLastStart;
+                        
+                        var hasError = "";
+                        if (result[i].hasErrors) {
+                            if (result[i].hasErrors.errorType != null) {
+                                hasError = " (" + result[i].hasErrors.errorType + ")";
+                            }
+                        }
+
                         if (result[i].isBlocked == false) {
                             switch (result[i].itemState) {
                                 case 'NeverStarted':
@@ -46,24 +56,30 @@
                                     break;
                                 case 'Stopped':
                                     itemStateName = "Stopped";
-                                itemLastStart = moment(result[i].lastRunTime).fromNow();
+                                    itemLastStart = moment(result[i].lastRunTime).format("YYYY-MM-DD h:mm:ss a");
                                     break;
                                 case 'Running':
-                                itemStateName = "Running";
-                                itemLastStart = moment(result[i].lastRunTime).fromNow();
+                                    var progressPercent = "";
+                                    if (result[i].currentStateProgress) {
+                                        progressPercent = " (" + result[i].currentStateProgress + ")";
+                                    }
+                                    itemStateName = "Running" + progressPercent;
+                                    itemLastStart = moment(result[i].lastRunTime).format("YYYY-MM-DD h:mm:ss a");
                                     break;
                                 default:
                                     itemStateName = "Unknown status";
-                                itemLastStart = moment(result[i].lastRunTime).fromNow();
+                                    itemLastStart = moment(result[i].lastRunTime).format("YYYY-MM-DD h:mm:ss a");
                                     break;
                             }
                         } else {
                             itemStateName = "Blocked";
-                        itemLastStart = moment(result[i].lastRunTime).fromNow();
+                            itemLastStart = moment(result[i].lastRunTime).format("YYYY-MM-DD h:mm:ss a");
                         }
 
+                        itemStateName += hasError;
+
                         var itemInterval = result[i].interval;
-                    var nextRunTime = moment(result[i].nextRunTime).fromNow();
+                        var nextRunTime = moment(result[i].nextRunTime).format("YYYY-MM-DD h:mm:ss a");
                         var startButton = '';
                         if (userProfile.roles.includes("Admin")) {
                             if (result[i].allowManualStart == true && result[i].itemState != "Running") {
@@ -76,10 +92,17 @@
                             nextRunTime = '';
                         }
 
+                        var logLink = '';
+                        if (result[i].correlationId) {
+                            logLink = '<a href="/index.html?page=settings&sub=logs&correlationid=' + result[i].correlationId + '" class="romlink">View Log</a>';
+                        }
+
                         var newRow = [
                             itemTypeName,
                             itemStateName,
                             itemInterval,
+                            new Date(result[i].lastRunDuration * 1000).toISOString().slice(11, 19),
+                            logLink,
                             itemLastStart,
                             nextRunTime,
                             startButton
@@ -87,6 +110,7 @@
                         newTable.appendChild(createTableRow(false, newRow, 'romrow', 'romcell'));
                     }
                 }
+            }
 
             var targetDiv = document.getElementById('system_tasks');
             targetDiv.innerHTML = '';
@@ -176,6 +200,9 @@
     }
 
     function BuildLibraryStatisticsBar(TargetObject, TargetObjectLegend, LibraryStatistics, LibrarySize) {
+        TargetObject.innerHTML = '';
+        TargetObjectLegend.innerHTML = '';
+
         var newTable = document.createElement('table');
         newTable.setAttribute('cellspacing', 0);
         newTable.setAttribute('style', 'width: 100%; height: 10px;');
@@ -239,8 +266,9 @@
     }
 
     SystemLoadStatus();
-    setInterval(SystemLoadStatus, 30000);
+    setInterval(SystemLoadStatus, 3000);
     SystemLoadSystemStatus();
-    setInterval(SystemLoadStatus, 60000);
+    setInterval(SystemLoadSystemStatus, 60000);
     SystemSignaturesStatus();
-    setInterval(SystemSignaturesStatus, 300000);</script>
+    setInterval(SystemSignaturesStatus, 300000);
+</script>

gaseous-server/wwwroot/scripts/gamesformating.js

@@ -12,6 +12,8 @@ function formatGamesPanel(targetElement, result, pageNumber, pageSize) {
     console.log("Displaying page: " + pageNumber);
     console.log("Page size: " + pageSize);
 
+    window.scrollTo(0, 0);
+
     var pageMode = GetPreference('LibraryPagination', 'paged');
 
     if (pageNumber == 1 || pageMode == 'paged') {
@@ -90,8 +92,26 @@ function formatGamesPanel(targetElement, result, pageNumber, pageSize) {
                     }
 
                     // add page numbers
+                    var pageEitherSide = 4;
+                    var currentPage = Number(pagerCheck.innerHTML);
                     var pageNumbers = document.createElement('span');
                     for (var i = 1; i <= pageCount; i++) {
+                        if (
+                            (
+                                (i >= currentPage - pageEitherSide) &&
+                                (i <= currentPage + pageEitherSide)
+                            ) ||
+                            (
+                                (
+                                    i <= (pageEitherSide * 2 + 1) &&
+                                    currentPage <= (pageEitherSide)
+                                ) ||
+                                (
+                                    i >= (pageCount - (pageEitherSide * 2)) &&
+                                    currentPage >= (pageCount - (pageEitherSide))
+                                )
+                            )
+                        ) {
                             var pageNum = document.createElement('span');
                             if (Number(pagerCheck.innerHTML) == i) {
                                 pageNum.className = 'games_pager_number_disabled';
@@ -102,6 +122,7 @@ function formatGamesPanel(targetElement, result, pageNumber, pageSize) {
                             pageNum.innerHTML = i;
                             pageNumbers.appendChild(pageNum);
                         }
+                    }
 
                     // add next page button
                     var nextPage = document.createElement('span');

gaseous-server/wwwroot/scripts/main.js

@@ -253,13 +253,18 @@ function DropDownRenderGameOption(state) {
 
     var response;
 
+    var releaseDate;
+    if (state.releaseDate) {
+        releaseDate = moment(state.releaseDate).format('yyyy');
+    }
+
     if (state.cover) {
         response = $(
-            '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="https://images.igdb.com/igdb/image/upload/t_cover_small/' + state.cover.value.imageId + '.jpg" /></td><td class="dropdown-label"><span>' + state.text + '</span></td></tr></table>'
+            '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="https://images.igdb.com/igdb/image/upload/t_cover_small/' + state.cover.value.imageId + '.jpg" /></td><td class="dropdown-label"><span class="dropdown-title">' + state.text + '</span><span class="dropdown-releasedate">' + releaseDate + '</span></td></tr></table>'
         );
     } else {
         response = $(
-            '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="/images/unknowngame.png" /></td><td class="dropdown-label"><span>' + state.text + '</span></td></tr></table>'
+            '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="/images/unknowngame.png" style="max-width: 90px;" /></td><td class="dropdown-label"><span>' + state.text + '</span><span class="dropdown-releasedate">' + releaseDate + '</span></td></tr></table>'
         );
     }
     return response;

gaseous-server/wwwroot/styles/style.css

@@ -316,7 +316,10 @@ input[id='filter_panel_userrating_max'] {
 }
 
 .games_pager_number {
+    display: inline-block;
     padding: 5px;
+    width: 40px;
+    text-align: center;
 }
 
 .games_pager_number:hover {
@@ -325,7 +328,44 @@ input[id='filter_panel_userrating_max'] {
 }
 
 .games_pager_number_disabled {
+    display: inline-block;
     padding: 5px;
+    width: 40px;
+    text-align: center;
+    color: grey;
+}
+
+.rom_pager {
+    position: absolute;
+    left: 50%;
+    transform: translate(-50%, 0);
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 15px;
+    padding-bottom: 15px;
+    font-size: 16px;
+    font-family: Commodore64;
+    text-align: center;
+    width: 80%;
+}
+
+.rom_pager_number {
+    display: inline-block;
+    padding: 5px;
+    width: 40px;
+    text-align: center;
+}
+
+.rom_pager_number:hover {
+    background-color: blue;
+    cursor: pointer;
+}
+
+.rom_pager_number_disabled {
+    display: inline-block;
+    padding: 5px;
+    width: 40px;
+    text-align: center;
     color: grey;
 }
 
@@ -518,6 +558,10 @@ input[id='filter_panel_userrating_max'] {
     width: 250px;
 }
 
+#gamesummaryroms {
+    position: relative;
+}
+
 .game_cover_image {
     display: block;
     max-width: 250px;
@@ -851,6 +895,18 @@ div[name="properties_toc_item"]:hover,div[name="properties_user_toc_item"]:hover
     text-align: left;
 }
 
+.dropdown-title {
+    display: block;
+    font-weight: bold;
+    margin-right: 5px;
+}
+
+.dropdown-releasedate {
+    display: block;
+    font-weight: normal;
+    color: lightgray;
+}
+
 button {
     background-color: #555;
     color: white;
@@ -1054,22 +1110,38 @@ button:disabled {
     vertical-align: top;
 }
 
-.logs_table_row_Information:hover {
+.logs_table_row_Information:nth-child(even) {
     background: rgba(42, 41, 150, 0.3);
 }
 
-.logs_table_row_Warning:hover {
+.logs_table_row_Information:nth-child(odd) {
+    background: rgba(10, 9, 83, 0.3);
+}
+
+.logs_table_row_Warning:nth-child(even) {
     background: rgba(139, 150, 41, 0.3);
 }
 
-.logs_table_row_Critical:hover {
+.logs_table_row_Warning:nth-child(odd) {
+    background: rgba(49, 53, 14, 0.3);
+}
+
+.logs_table_row_Critical:nth-child(even) {
     background: rgba(150, 41, 41, 0.3);
 }
 
-.logs_table_row_Debug:hover {
+.logs_table_row_Critical:nth-child(odd) {
+    background: rgba(58, 16, 16, 0.3);
+}
+
+.logs_table_row_Debug:nth-child(even) {
     background: rgba(150, 41, 135, 0.3);
 }
 
+.logs_table_row_Debug:nth-child(odd) {
+    background: rgba(68, 18, 61, 0.3);
+}
+
 .logs_table_exception {
     margin-right: 10px;
     padding: 5px;