Cache objects from database in memory to improve performance (#151)

* IGDB objects are now cached in memory

* Completed caching of PlatformMaps

.github/release.yml

@@ -1,15 +0,0 @@
-changelog:
-  categories:
-    - title: What's New
-      labels:
-        - '*'
-      exclude:
-        labels:
-          - bug
-          - dependencies
-    - title: Bug Fixes
-      labels:
-        - bug
-    - title: Dependencies
-      labels:
-        - dependencies

.gitignore

@@ -403,4 +403,3 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
-gaseous-server/.DS_Store

Gaseous.sln

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 25.0.1704.4
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-tools", "gaseous-tools\gaseous-tools.csproj", "{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-server", "gaseous-server\gaseous-server.csproj", "{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{17FA6F12-8532-420C-9489-CB8FDE42137C}"
@@ -35,6 +37,10 @@ Global
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Release|Any CPU.ActiveCfg = Release|Any CPU

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 ROMs.
+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.
 
 ## Warning
 
@@ -16,12 +16,11 @@ If you expose the server to the internet, **you do so at your own risk**.
 ![Emulator](./screenshots/Emulator.png)
 
 ## Requirements
-* MariaDB 11.1.2 or MySQL Server 8+
+* MySQL Server 8+*
-  * These are the database versions Gaseous has been tested and developed against. Your mileage may vary with earlier versions.
-  * Currently MariaDB is the preferred database server, while MySQL will continue to be supported for existing users (they should be interchangable).
-  * Note that due to the earlier database schema using MySQL specific features, moving to MariaDB from MySQL will require rebuilding your database from scratch. The "Library Scan" background task can be used to re-import all titles.
 * Internet Game Database API Key. See: https://api-docs.igdb.com/#account-creation
 
+***Note**: MariaDB is currently not supported as Gaseous uses features present only in MySQL. This is being tracked in https://github.com/gaseous-project/gaseous-server/issues/93
+
 ## Third Party Projects
 The following projects are used by Gaseous
 * https://dotnet.microsoft.com/en-us/apps/aspnet
@@ -67,7 +66,7 @@ When Gaseous-Server is started for the first time, it creates a configuration fi
   },
   "LoggingConfiguration": {
     "DebugLogging": false,
-    "LogRetention": 7
+    "LogFormat": "text"
   }
 }
 
@@ -76,7 +75,7 @@ When Gaseous-Server is started for the first time, it creates a configuration fi
 ## Docker
 ### Deploy with the prebuilt Docker image
 Dockerfile and docker-compose.yml files have been provided to make deployment of the server as easy as possible.
-1. Download the docker-compose-{database}.yml file for the database type you would like to use.
+1. Download the docker-compose.yml file
 2. Open the docker-compose.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
 3. Run the command ```docker-compose up -d```
 4. Connect to the host on port 5198
@@ -86,13 +85,13 @@ Dockerfile and docker-compose-build.yml files have been provided to make deploym
 1. Clone the repo with ```git clone https://github.com/gaseous-project/gaseous-server.git```
 2. Change into the gaseous-server directory
 3. Clone the submodules with the command ```git submodule update --init```
-4. Open the docker-compose-{database}-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+4. Open the docker-compose-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
-5. Run the command ```docker-compose --file docker-compose-{database}-build.yml up -d```
+5. Run the command ```docker-compose --file docker-compose-build.yml up -d```
 6. Connect to the host on port 5198
 
 ## Source
 ### Build and deploy
-1. Install and configure a MariaDB or MySQL instance - this is beyond the scope of this document
+1. Install and configure a MySQL instance
 2. Install the dotnet 7.0 packages appropriate for your operating system
     * See: https://learn.microsoft.com/en-us/dotnet/core/install/linux
 3. Create a database user with permission to create a databse. Gaseous will create the new database and apply the database schema on it's first startup.

docker-compose-mariadb-build.yml

@@ -1,39 +0,0 @@
-version: '2'
-services:
-  gaseous-server:
-    container_name: gaseous-server
-    build:
-      context: ./
-    restart: unless-stopped
-    networks:
-      - gaseous
-    depends_on:
-      - gsdb
-    ports:
-      - 5198:80
-    volumes:
-      - gs:/root/.gaseous-server
-    environment:
-      - dbhost=gsdb
-      - dbuser=root
-      - dbpass=gaseous
-      - igdbclientid=<clientid>
-      - igdbclientsecret=<clientsecret>
-  gsdb:
-    container_name: gsdb
-    image: mariadb
-    restart: unless-stopped
-    networks:
-      - gaseous
-    volumes:
-      - gsdb:/var/lib/mysql
-    environment:
-      - MARIADB_ROOT_PASSWORD=gaseous
-      - MARIADB_USER=gaseous
-      - MARIADB_PASSWORD=gaseous
-networks:
-  gaseous:
-    driver: bridge
-volumes:
-  gs:
-  gsdb:

docker-compose-mariadb.yml

@@ -1,38 +0,0 @@
-version: '2'
-services:
-  gaseous-server:
-    container_name: gaseous-server
-    image: gaseousgames/gaseousserver:latest
-    restart: unless-stopped
-    networks:
-      - gaseous
-    depends_on:
-      - gsdb
-    ports:
-      - 5198:80
-    volumes:
-      - gs:/root/.gaseous-server
-    environment:
-      - dbhost=gsdb
-      - dbuser=root
-      - dbpass=gaseous
-      - igdbclientid=<clientid>
-      - igdbclientsecret=<clientsecret>
-  gsdb:
-    container_name: gsdb
-    image: mariadb
-    restart: unless-stopped
-    networks:
-      - gaseous
-    volumes:
-      - gsdb:/var/lib/mysql
-    environment:
-      - MARIADB_ROOT_PASSWORD=gaseous
-      - MARIADB_USER=gaseous
-      - MARIADB_PASSWORD=gaseous
-networks:
-  gaseous:
-    driver: bridge
-volumes:
-  gs:
-  gsdb:

gaseous-server/Classes/Auth/Classes/IdentityRole.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the ASP.NET Identity
-    /// IRole interface 
-    /// </summary>
-    public class ApplicationRole : IdentityRole
-    {
-    }
-}

gaseous-server/Classes/Auth/Classes/IdentityUser.cs

@@ -1,16 +0,0 @@
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using System;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the ASP.NET Identity
-    /// IUser interface 
-    /// </summary>
-    public class ApplicationUser : IdentityUser
-    {
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public List<UserPreferenceViewModel> UserPreferences { get; set; }
-    }
-}

gaseous-server/Classes/Auth/Classes/RoleStore.cs

@@ -1,171 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using MySqlConnector;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that implements the key ASP.NET Identity role store iterfaces
-    /// </summary>
-    public class RoleStore : IQueryableRoleStore<ApplicationRole>
-    {
-        private RoleTable roleTable;
-        public Database Database { get; private set; }
-
-        public IQueryable<ApplicationRole> Roles
-        {
-            get
-            {
-                List<ApplicationRole> roles = roleTable.GetRoles();
-                return roles.AsQueryable();
-            }
-        }
-
-        public RoleStore()
-        {
-            Database = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            roleTable = new RoleTable(Database);
-        }
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase as argument 
-        /// </summary>
-        /// <param name="database"></param>
-        public RoleStore(Database database)
-        {
-            Database = database;
-            roleTable = new RoleTable(database);
-        }
-
-        public Task<IdentityResult> CreateAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            roleTable.Insert(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> DeleteAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            roleTable.Delete(role.Id);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<ApplicationRole> FindByIdAsync(string roleId, CancellationToken cancellationToken)
-        {
-            ApplicationRole result = roleTable.GetRoleById(roleId) as ApplicationRole;
-
-            return Task.FromResult<ApplicationRole>(result);
-        }
-
-        public Task<bool> RoleExistsAsync(string roleId, CancellationToken cancellationToken)
-        {
-            ApplicationRole? result = roleTable.GetRoleById(roleId) as ApplicationRole;
-
-            if (result == null)
-            {
-                return Task.FromResult<bool>(false);
-            }
-            else
-            {
-                return Task.FromResult<bool>(true);
-            }
-        }
-
-        public Task<ApplicationRole?> FindByNameAsync(string roleName, CancellationToken cancellationToken)
-        {
-            ApplicationRole? result = roleTable.GetRoleByName(roleName) as ApplicationRole;
-
-            return Task.FromResult<ApplicationRole?>(result);
-        }
-
-        public Task<IdentityResult> UpdateAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public void Dispose()
-        {
-            if (Database != null)
-            {
-                Database = null;
-            }
-        }
-
-        public Task<string> GetRoleIdAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string>(roleTable.GetRoleId(role.Name));
-            }
-
-            return Task.FromResult<string>(null);
-        }
-
-        public Task<string?> GetRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string?>(roleTable.GetRoleName(role.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task SetRoleNameAsync(ApplicationRole role, string? roleName, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            role.Name = roleName;
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<string?> GetNormalizedRoleNameAsync(ApplicationRole role, CancellationToken cancellationToken)
-        {
-            if (role != null)
-            {
-                return Task.FromResult<string?>(roleTable.GetRoleName(role.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task SetNormalizedRoleNameAsync(ApplicationRole role, string? normalizedName, CancellationToken cancellationToken)
-        {
-            if (role == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            role.Name = normalizedName;
-            roleTable.Update(role);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/RoleTable.cs

@@ -1,168 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the Role table in the MySQL Database
-    /// </summary>
-    public class RoleTable 
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public RoleTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Deltes a role from the Roles table
-        /// </summary>
-        /// <param name="roleId">The role Id</param>
-        /// <returns></returns>
-        public int Delete(string roleId)
-        {
-            string commandText = "Delete from Roles where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new Role in the Roles table
-        /// </summary>
-        /// <param name="roleName">The role's name</param>
-        /// <returns></returns>
-        public int Insert(ApplicationRole role)
-        {
-            string commandText = "Insert into Roles (Id, Name) values (@id, @name)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@name", role.Name);
-            parameters.Add("@id", role.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Returns a role name given the roleId
-        /// </summary>
-        /// <param name="roleId">The role Id</param>
-        /// <returns>Role name</returns>
-        public string? GetRoleName(string roleId)
-        {
-            string commandText = "Select Name from Roles where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", roleId);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns the role Id given a role name
-        /// </summary>
-        /// <param name="roleName">Role's name</param>
-        /// <returns>Role's Id</returns>
-        public string? GetRoleId(string roleName)
-        {
-            string? roleId = null;
-            string commandText = "Select Id from Roles where Name = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", roleName } };
-
-            DataTable result = _database.ExecuteCMD(commandText, parameters);
-            if (result.Rows.Count > 0)
-            {
-                return Convert.ToString(result.Rows[0][0]);
-            }
-
-            return roleId;
-        }
-
-        /// <summary>
-        /// Gets the ApplicationRole given the role Id
-        /// </summary>
-        /// <param name="roleId"></param>
-        /// <returns></returns>
-        public ApplicationRole? GetRoleById(string roleId)
-        {
-            var roleName = GetRoleName(roleId);
-            ApplicationRole? role = null;
-
-            if(roleName != null)
-            {
-                role = new ApplicationRole();
-                role.Id = roleId;
-                role.Name = roleName;
-                role.NormalizedName = roleName.ToUpper();
-            }
-
-            return role;
-
-        }
-
-        /// <summary>
-        /// Gets the ApplicationRole given the role name
-        /// </summary>
-        /// <param name="roleName"></param>
-        /// <returns></returns>
-        public ApplicationRole? GetRoleByName(string roleName)
-        {
-            var roleId = GetRoleId(roleName);
-            ApplicationRole role = null;
-
-            if (roleId != null)
-            {
-                role = new ApplicationRole();
-                role.Id = roleId;
-                role.Name = roleName;
-                role.NormalizedName = roleName.ToUpper();
-            }
-
-            return role;
-        }
-
-        public int Update(ApplicationRole role)
-        {
-            string commandText = "Update Roles set Name = @name where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", role.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        public List<ApplicationRole> GetRoles()
-        {
-            List<ApplicationRole> roles = new List<ApplicationRole>();
-
-            string commandText = "Select Name from Roles";
-
-            var rows = _database.ExecuteCMDDict(commandText);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                ApplicationRole role = (ApplicationRole)Activator.CreateInstance(typeof(ApplicationRole));
-                role.Id = (string)row["Id"];
-                role.Name = (string)row["Name"];
-                role.NormalizedName = ((string)row["Name"]).ToUpper();
-                roles.Add(role);
-            }
-
-            return roles;
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserClaimsTable.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Security.Claims;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserClaims table in the MySQL Database
-    /// </summary>
-    public class UserClaimsTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserClaimsTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns a ClaimsIdentity instance given a userId
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public ClaimsIdentity FindByUserId(string userId)
-        {
-            ClaimsIdentity claims = new ClaimsIdentity();
-            string commandText = "Select * from UserClaims where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@UserId", userId } };
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach (DataRow row in rows)
-            {
-                Claim claim = new Claim((string)row["ClaimType"], (string)row["ClaimValue"]);
-                claims.AddClaim(claim);
-            }
-
-            return claims;
-        }
-
-        /// <summary>
-        /// Deletes all claims from a user given a userId
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserClaims where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new claim in UserClaims table
-        /// </summary>
-        /// <param name="userClaim">User's claim to be added</param>
-        /// <param name="userId">User's id</param>
-        /// <returns></returns>
-        public int Insert(Claim userClaim, string userId)
-        {
-            string commandText = "Insert into UserClaims (ClaimValue, ClaimType, UserId) values (@value, @type, @userId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("value", userClaim.Value);
-            parameters.Add("type", userClaim.Type);
-            parameters.Add("userId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Deletes a claim from a user 
-        /// </summary>
-        /// <param name="user">The user to have a claim deleted</param>
-        /// <param name="claim">A claim to be deleted from user</param>
-        /// <returns></returns>
-        public int Delete(IdentityUser user, Claim claim)
-        {
-            string commandText = "Delete from UserClaims where UserId = @userId and @ClaimValue = @value and ClaimType = @type";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", user.Id);
-            parameters.Add("value", claim.Value);
-            parameters.Add("type", claim.Type);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserLoginsTable.cs

@@ -1,117 +0,0 @@
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using System.Collections.Generic;
-using System.Data;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserLogins table in the MySQL Database
-    /// </summary>
-    public class UserLoginsTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserLoginsTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Deletes a login from a user in the UserLogins table
-        /// </summary>
-        /// <param name="user">User to have login deleted</param>
-        /// <param name="login">Login to be deleted from user</param>
-        /// <returns></returns>
-        public int Delete(IdentityUser user, UserLoginInfo login)
-        {
-            string commandText = "Delete from UserLogins where UserId = @userId and LoginProvider = @loginProvider and ProviderKey = @providerKey";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", user.Id);
-            parameters.Add("loginProvider", login.LoginProvider);
-            parameters.Add("providerKey", login.ProviderKey);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Deletes all Logins from a user in the UserLogins table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserLogins where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new login in the UserLogins table
-        /// </summary>
-        /// <param name="user">User to have new login added</param>
-        /// <param name="login">Login to be added</param>
-        /// <returns></returns>
-        public int Insert(IdentityUser user, UserLoginInfo login)
-        {
-            string commandText = "Insert into UserLogins (LoginProvider, ProviderKey, UserId) values (@loginProvider, @providerKey, @userId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("loginProvider", login.LoginProvider);
-            parameters.Add("providerKey", login.ProviderKey);
-            parameters.Add("userId", user.Id);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Return a userId given a user's login
-        /// </summary>
-        /// <param name="userLogin">The user's login info</param>
-        /// <returns></returns>
-        public string? FindUserIdByLogin(UserLoginInfo userLogin)
-        {
-            string commandText = "Select UserId from UserLogins where LoginProvider = @loginProvider and ProviderKey = @providerKey";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("loginProvider", userLogin.LoginProvider);
-            parameters.Add("providerKey", userLogin.ProviderKey);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns a list of user's logins
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public List<UserLoginInfo> FindByUserId(string userId)
-        {
-            List<UserLoginInfo> logins = new List<UserLoginInfo>();
-            string commandText = "Select * from UserLogins where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@userId", userId } };
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach (DataRow row in rows)
-            {
-                var login = new UserLoginInfo((string)row["LoginProvider"], (string)row["ProviderKey"], (string)row["LoginProvider"]);
-                logins.Add(login);
-            }
-
-            return logins;
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserRoleTable.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the UserRoles table in the MySQL Database
-    /// </summary>
-    public class UserRolesTable
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserRolesTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns a list of user's roles
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public List<string> FindByUserId(string userId)
-        {
-            List<string> roles = new List<string>();
-            string commandText = "Select Roles.Name from UserRoles, Roles where UserRoles.UserId = @userId and UserRoles.RoleId = Roles.Id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", userId);
-
-            var rows = _database.ExecuteCMD(commandText, parameters).Rows;
-            foreach(DataRow row in rows)
-            {
-                roles.Add((string)row["Name"]);
-            }
-
-            return roles;
-        }
-
-        /// <summary>
-        /// Deletes all roles from a user in the UserRoles table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public int Delete(string userId)
-        {
-            string commandText = "Delete from UserRoles where UserId = @userId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("UserId", userId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        public int DeleteUserFromRole(string userId, string roleId)
-        {
-            string commandText = "Delete from UserRoles where UserId = @userId and RoleId = @roleId";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", userId);
-            parameters.Add("roleId", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-
-        /// <summary>
-        /// Inserts a new role for a user in the UserRoles table
-        /// </summary>
-        /// <param name="user">The User</param>
-        /// <param name="roleId">The Role's id</param>
-        /// <returns></returns>
-        public int Insert(IdentityUser user, string roleId)
-        {
-            string commandText = "Insert into UserRoles (UserId, RoleId) values (@userId, @roleId)";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("userId", user.Id);
-            parameters.Add("roleId", roleId);
-
-            return (int)_database.ExecuteNonQuery(commandText, parameters);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserStore.cs

@@ -1,616 +0,0 @@
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-using MySqlConnector;
-
-namespace Authentication
-{
-    public class UserStore : 
-        IUserStore<ApplicationUser>,
-        IUserRoleStore<ApplicationUser>,
-        IUserLoginStore<ApplicationUser>,
-        IUserClaimStore<ApplicationUser>,
-        IUserPasswordStore<ApplicationUser>,
-        IUserSecurityStampStore<ApplicationUser>,
-        IQueryableUserStore<ApplicationUser>,
-        IUserEmailStore<ApplicationUser>,
-        IUserPhoneNumberStore<ApplicationUser>,
-        IUserTwoFactorStore<ApplicationUser>,
-        IUserLockoutStore<ApplicationUser>
-    {
-        private Database database;
-
-        private UserTable<ApplicationUser> userTable;
-        private RoleTable roleTable;
-        private UserRolesTable userRolesTable;
-        private UserLoginsTable userLoginsTable;
-        private UserClaimsTable userClaimsTable;
-
-        public UserStore()
-        {
-            database = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            userTable = new UserTable<ApplicationUser>(database);
-            roleTable = new RoleTable(database);
-            userRolesTable = new UserRolesTable(database);
-            userLoginsTable = new UserLoginsTable(database);
-            userClaimsTable = new UserClaimsTable(database);
-        }
-
-        public UserStore(Database database)
-        {
-            this.database = database;
-            userTable = new UserTable<ApplicationUser>(database);
-            roleTable = new RoleTable(database);
-            userRolesTable = new UserRolesTable(database);
-            userLoginsTable = new UserLoginsTable(database);
-            userClaimsTable = new UserClaimsTable(database);
-        }
-
-        public IQueryable<ApplicationUser> Users
-        {
-            get
-            {
-                List<ApplicationUser> users = userTable.GetUsers();
-                return users.AsQueryable();
-            }
-        }
-
-        public Task AddClaimsAsync(ApplicationUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claims == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            foreach (Claim claim in claims)
-            {
-                userClaimsTable.Insert(claim, user.Id);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task AddLoginAsync(ApplicationUser user, UserLoginInfo login, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (login == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            userLoginsTable.Insert(user, login);
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task AddToRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (string.IsNullOrEmpty(roleName))
-            {
-                throw new ArgumentException("Argument cannot be null or empty: roleName.");
-            }
-
-            string roleId = roleTable.GetRoleId(roleName);
-            if (!string.IsNullOrEmpty(roleId))
-            {
-                userRolesTable.Insert(user, roleId);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task<IdentityResult> CreateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            userTable.Insert(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> DeleteAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                userTable.Delete(user);
-            }
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public void Dispose()
-        {
-            if (database != null)
-            {
-                database = null;
-            }
-        }
-
-        public Task<ApplicationUser?> FindByEmailAsync(string normalizedEmail, CancellationToken cancellationToken)
-        {
-            if (String.IsNullOrEmpty(normalizedEmail))
-            {
-                throw new ArgumentNullException("email");
-            }
-
-            ApplicationUser result = userTable.GetUserByEmail(normalizedEmail) as ApplicationUser;
-            if (result != null)
-            {
-                return Task.FromResult<ApplicationUser>(result);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByIdAsync(string userId, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(userId))
-            {
-                throw new ArgumentException("Null or empty argument: userId");
-            }
-
-            ApplicationUser result = userTable.GetUserById(userId) as ApplicationUser;
-            if (result != null)
-            {
-                return Task.FromResult<ApplicationUser>(result);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
-        {
-            if (loginProvider == null || providerKey == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            UserLoginInfo login = new UserLoginInfo(loginProvider, providerKey, loginProvider);
-
-            var userId = userLoginsTable.FindUserIdByLogin(login);
-            if (userId != null)
-            {
-                ApplicationUser user = userTable.GetUserById(userId) as ApplicationUser;
-                if (user != null)
-                {
-                    return Task.FromResult<ApplicationUser>(user);
-                }
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<ApplicationUser?> FindByNameAsync(string normalizedUserName, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(normalizedUserName))
-            {
-                throw new ArgumentException("Null or empty argument: normalizedUserName");
-            }
-
-            List<ApplicationUser> result = userTable.GetUserByName(normalizedUserName) as List<ApplicationUser>;
-
-            // Should I throw if > 1 user?
-            if (result != null && result.Count == 1)
-            {
-                return Task.FromResult<ApplicationUser>(result[0]);
-            }
-
-            return Task.FromResult<ApplicationUser>(null);
-        }
-
-        public Task<int> GetAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.AccessFailedCount);
-        }
-
-        public Task<IList<Claim>> GetClaimsAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            ClaimsIdentity identity = userClaimsTable.FindByUserId(user.Id);
-
-            return Task.FromResult<IList<Claim>>(identity.Claims.ToList());
-        }
-
-        public Task<string?> GetEmailAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.Email);
-        }
-
-        public Task<bool> GetEmailConfirmedAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.EmailConfirmed);
-        }
-
-        public Task<bool> GetLockoutEnabledAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.LockoutEnabled);
-        }
-
-        public Task<DateTimeOffset?> GetLockoutEndDateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user.LockoutEnd.HasValue)
-            {
-                return Task.FromResult((DateTimeOffset?)user.LockoutEnd.Value);
-            }
-            else
-            {
-                return Task.FromResult((DateTimeOffset?)new DateTimeOffset());
-            }
-        }
-
-        public Task<IList<UserLoginInfo>> GetLoginsAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            List<UserLoginInfo> logins = userLoginsTable.FindByUserId(user.Id);
-            if (logins != null)
-            {
-                return Task.FromResult<IList<UserLoginInfo>>(logins);
-            }
-
-            return Task.FromResult<IList<UserLoginInfo>>(null);
-        }
-
-        public Task<string?> GetNormalizedEmailAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.NormalizedEmail);
-        }
-
-        public Task<string?> GetNormalizedUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string?>(userTable.GetUserName(user.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<string?> GetPasswordHashAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string?>(userTable.GetPasswordHash(user.Id));
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<string?> GetPhoneNumberAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.PhoneNumber);
-        }
-
-        public Task<bool> GetPhoneNumberConfirmedAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.PhoneNumberConfirmed);
-        }
-
-        public Task<IList<string>> GetRolesAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            List<string> roles = userRolesTable.FindByUserId(user.Id);
-            {
-                if (roles != null)
-                {
-                    return Task.FromResult<IList<string>>(roles);
-                }
-            }
-
-            return Task.FromResult<IList<string>>(null);
-        }
-
-        public Task<string?> GetSecurityStampAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.SecurityStamp);
-        }
-
-        public Task<bool> GetTwoFactorEnabledAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(user.TwoFactorEnabled);
-        }
-
-        public Task<string> GetUserIdAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                return Task.FromResult<string>(userTable.GetUserId(user.NormalizedUserName));
-            }
-
-            return Task.FromResult<string>(null);
-        }
-
-        public Task<string?> GetUserNameAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user != null)
-            {
-                //return Task.FromResult<string?>(userTable.GetUserName(user.Id));
-                return Task.FromResult(user.UserName);
-            }
-
-            return Task.FromResult<string?>(null);
-        }
-
-        public Task<IList<ApplicationUser>> GetUsersForClaimAsync(Claim claim, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<IList<ApplicationUser>> GetUsersInRoleAsync(string roleName, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task<bool> HasPasswordAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            var hasPassword = !string.IsNullOrEmpty(userTable.GetPasswordHash(user.Id));
-
-            return Task.FromResult<bool>(Boolean.Parse(hasPassword.ToString()));
-        }
-
-        public Task<int> IncrementAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            user.AccessFailedCount++;
-            userTable.Update(user);
-
-            return Task.FromResult(user.AccessFailedCount);
-        }
-
-        public Task<bool> IsInRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (string.IsNullOrEmpty(roleName))
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            List<string> roles = userRolesTable.FindByUserId(user.Id);
-            {
-                if (roles != null)
-                {
-                    foreach (string role in roles)
-                    {
-                        if (role.ToUpper() == roleName.ToUpper())
-                        {
-                            return Task.FromResult<bool>(true);
-                        }
-                    }
-                }
-            }
-
-            return Task.FromResult<bool>(false);
-        }
-
-        public Task RemoveClaimsAsync(ApplicationUser user, IEnumerable<Claim> claims, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claims == null)
-            {
-                throw new ArgumentNullException("claim");
-            }
-
-            foreach (Claim claim in claims)
-            {
-                userClaimsTable.Delete(user, claim);
-            }
-
-            return Task.FromResult<object>(null);
-        }
-
-        public Task RemoveFromRoleAsync(ApplicationUser user, string roleName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (roleName == null)
-            {
-                throw new ArgumentNullException("role");
-            }
-
-            IdentityRole? role = roleTable.GetRoleByName(roleName);
-
-            if (role != null)
-            {
-                userRolesTable.DeleteUserFromRole(user.Id, role.Id);
-            }
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task RemoveLoginAsync(ApplicationUser user, string loginProvider, string providerKey, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (loginProvider == null || providerKey == null)
-            {
-                throw new ArgumentNullException("login");
-            }
-
-            UserLoginInfo login = new UserLoginInfo(loginProvider, providerKey, loginProvider);
-
-            userLoginsTable.Delete(user, login);
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task ReplaceClaimAsync(ApplicationUser user, Claim claim, Claim newClaim, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            if (claim == null || newClaim == null)
-            {
-                throw new ArgumentNullException("claim");
-            }
-
-            userClaimsTable.Delete(user, claim);
-            userClaimsTable.Insert(newClaim, user.Id);
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task ResetAccessFailedCountAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            user.AccessFailedCount = 0;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetEmailAsync(ApplicationUser user, string? email, CancellationToken cancellationToken)
-        {
-            user.Email = email;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetEmailConfirmedAsync(ApplicationUser user, bool confirmed, CancellationToken cancellationToken)
-        {
-            user.EmailConfirmed = confirmed;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetLockoutEnabledAsync(ApplicationUser user, bool enabled, CancellationToken cancellationToken)
-        {
-            user.LockoutEnabled = enabled;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetLockoutEndDateAsync(ApplicationUser user, DateTimeOffset? lockoutEnd, CancellationToken cancellationToken)
-        {
-            user.LockoutEnd = lockoutEnd;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetNormalizedEmailAsync(ApplicationUser user, string? normalizedEmail, CancellationToken cancellationToken)
-        {
-            user.NormalizedEmail = normalizedEmail;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetNormalizedUserNameAsync(ApplicationUser user, string? normalizedName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            user.NormalizedUserName = normalizedName;
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task SetPasswordHashAsync(ApplicationUser user, string? passwordHash, CancellationToken cancellationToken)
-        {
-            user.PasswordHash = passwordHash;
-
-            return Task.FromResult<Object>(null);
-        }
-
-        public Task SetPhoneNumberAsync(ApplicationUser user, string? phoneNumber, CancellationToken cancellationToken)
-        {
-            user.PhoneNumber = phoneNumber;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetPhoneNumberConfirmedAsync(ApplicationUser user, bool confirmed, CancellationToken cancellationToken)
-        {
-            user.PhoneNumberConfirmed = confirmed;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetSecurityStampAsync(ApplicationUser user, string stamp, CancellationToken cancellationToken)
-        {
-            user.SecurityStamp = stamp;
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetTwoFactorEnabledAsync(ApplicationUser user, bool enabled, CancellationToken cancellationToken)
-        {
-            user.TwoFactorEnabled = enabled;
-            userTable.Update(user);
-
-            return Task.FromResult(0);
-        }
-
-        public Task SetUserNameAsync(ApplicationUser user, string? userName, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            user.UserName = userName;
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-
-        public Task<IdentityResult> UpdateAsync(ApplicationUser user, CancellationToken cancellationToken)
-        {
-            if (user == null)
-            {
-                throw new ArgumentNullException("user");
-            }
-
-            userTable.Update(user);
-
-            return Task.FromResult<IdentityResult>(IdentityResult.Success);
-        }
-    }
-}

gaseous-server/Classes/Auth/Classes/UserTable.cs

@@ -1,441 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using gaseous_server.Classes;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication
-{
-    /// <summary>
-    /// Class that represents the Users table in the MySQL Database
-    /// </summary>
-    public class UserTable<TUser>
-        where TUser :ApplicationUser
-    {
-        private Database _database;
-
-        /// <summary>
-        /// Constructor that takes a MySQLDatabase instance 
-        /// </summary>
-        /// <param name="database"></param>
-        public UserTable(Database database)
-        {
-            _database = database;
-        }
-
-        /// <summary>
-        /// Returns the user's name given a user id
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public string? GetUserName(string userId)
-        {
-            string commandText = "Select NormalizedUserName from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-            
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns a User ID given a user name
-        /// </summary>
-        /// <param name="userName">The user's name</param>
-        /// <returns></returns>
-        public string? GetUserId(string normalizedUserName)
-        {
-            string commandText = "Select Id from Users where NormalizedUserName = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", normalizedUserName } };
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Returns an TUser given the user's id
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public TUser GetUserById(string userId)
-        {
-            TUser user = null;
-            string commandText = "Select * from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-
-            var rows = _database.ExecuteCMDDict(commandText, parameters);
-            if (rows != null && rows.Count == 1)
-            {
-                Dictionary<string, object> row = rows[0];
-                user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-            }
-
-            return user;
-        }
-
-        /// <summary>
-        /// Returns a list of TUser instances given a user name
-        /// </summary>
-        /// <param name="normalizedUserName">User's name</param>
-        /// <returns></returns>
-        public List<TUser> GetUserByName(string normalizedUserName)
-        {
-            List<TUser> users = new List<TUser>();
-            string commandText = "Select * from Users where NormalizedEmail = @name";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@name", normalizedUserName } };
-
-            var rows = _database.ExecuteCMDDict(commandText, parameters);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                TUser user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-                users.Add(user);
-            }
-
-            return users;
-        }
-
-        public List<TUser> GetUsers()
-        {
-            List<TUser> users = new List<TUser>();
-            string commandText = "Select * from Users order by NormalizedUserName";
-            
-            var rows = _database.ExecuteCMDDict(commandText);
-            foreach(Dictionary<string, object> row in rows)
-            {
-                TUser user = (TUser)Activator.CreateInstance(typeof(TUser));
-                user.Id = (string)row["Id"];
-                user.UserName = (string?)row["UserName"];
-                user.PasswordHash = (string?)(string.IsNullOrEmpty((string?)row["PasswordHash"]) ? null : row["PasswordHash"]);
-                user.SecurityStamp = (string?)(string.IsNullOrEmpty((string?)row["SecurityStamp"]) ? null : row["SecurityStamp"]);
-                user.ConcurrencyStamp = (string?)(string.IsNullOrEmpty((string?)row["ConcurrencyStamp"]) ? null : row["ConcurrencyStamp"]);
-                user.Email = (string?)(string.IsNullOrEmpty((string?)row["Email"]) ? null : row["Email"]);
-                user.EmailConfirmed = row["EmailConfirmed"] == "1" ? true:false;
-                user.PhoneNumber = (string?)(string.IsNullOrEmpty((string?)row["PhoneNumber"]) ? null : row["PhoneNumber"]);
-                user.PhoneNumberConfirmed = row["PhoneNumberConfirmed"] == "1" ? true : false;
-                user.NormalizedEmail = (string?)(string.IsNullOrEmpty((string?)row["NormalizedEmail"]) ? null : row["NormalizedEmail"]);
-                user.NormalizedUserName = (string?)(string.IsNullOrEmpty((string?)row["NormalizedUserName"]) ? null : row["NormalizedUserName"]);
-                user.LockoutEnabled = row["LockoutEnabled"] == "1" ? true : false;
-                user.LockoutEnd = string.IsNullOrEmpty((string?)row["LockoutEnd"]) ? DateTime.Now : DateTime.Parse((string?)row["LockoutEnd"]);
-                user.AccessFailedCount = string.IsNullOrEmpty((string?)row["AccessFailedCount"]) ? 0 : int.Parse((string?)row["AccessFailedCount"]);
-                user.TwoFactorEnabled = row["TwoFactorEnabled"] == "1" ? true:false;
-                user.SecurityProfile = GetSecurityProfile(user);
-                user.UserPreferences = GetPreferences(user);
-                users.Add(user);
-            }
-
-            return users;
-        }
-
-        public TUser GetUserByEmail(string email)
-        {
-            List<TUser> users = GetUserByName(email);
-            if (users.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return users[0];
-            }
-        }
-
-        /// <summary>
-        /// Return the user's password hash
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        public string GetPasswordHash(string userId)
-        {
-            string commandText = "Select PasswordHash from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@id", userId);
-
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Sets the user's password hash
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <param name="passwordHash"></param>
-        /// <returns></returns>
-        public int SetPasswordHash(string userId, string passwordHash)
-        {
-            string commandText = "Update Users set PasswordHash = @pwdHash where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@pwdHash", passwordHash);
-            parameters.Add("@id", userId);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Returns the user's security stamp
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        public string GetSecurityStamp(string userId)
-        {
-            string commandText = "Select SecurityStamp from Users where Id = @id";
-            Dictionary<string, object> parameters = new Dictionary<string, object>() { { "@id", userId } };
-            DataTable table = _database.ExecuteCMD(commandText, parameters);
-
-            if (table.Rows.Count == 0)
-            {
-                return null;
-            }
-            else
-            {
-                return (string)table.Rows[0][0];
-            }
-        }
-
-        /// <summary>
-        /// Inserts a new user in the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Insert(TUser user)
-        {
-            string commandText = @"Insert into Users (UserName, Id, PasswordHash, SecurityStamp, ConcurrencyStamp, Email, EmailConfirmed, PhoneNumber, PhoneNumberConfirmed, NormalizedEmail, NormalizedUserName, AccessFailedCount, LockoutEnabled, LockoutEnd, TwoFactorEnabled) values (@name, @id, @pwdHash, @SecStamp, @concurrencystamp, @email ,@emailconfirmed ,@phonenumber, @phonenumberconfirmed, @normalizedemail, @normalizedusername, @accesscount, @lockoutenabled, @lockoutenddate, @twofactorenabled);";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@name", user.UserName);
-            parameters.Add("@id", user.Id);
-            parameters.Add("@pwdHash", user.PasswordHash);
-            parameters.Add("@SecStamp", user.SecurityStamp);
-            parameters.Add("@concurrencystamp", user.ConcurrencyStamp);
-            parameters.Add("@email", user.Email);
-            parameters.Add("@emailconfirmed", user.EmailConfirmed);
-            parameters.Add("@phonenumber", user.PhoneNumber);
-            parameters.Add("@phonenumberconfirmed", user.PhoneNumberConfirmed);
-            parameters.Add("@normalizedemail", user.NormalizedEmail);
-            parameters.Add("@normalizedusername", user.NormalizedUserName);
-            parameters.Add("@accesscount", user.AccessFailedCount);
-            parameters.Add("@lockoutenabled", user.LockoutEnabled);
-            parameters.Add("@lockoutenddate", user.LockoutEnd);
-            parameters.Add("@twofactorenabled", user.TwoFactorEnabled);
-
-            // set default security profile
-            SetSecurityProfile(user, new SecurityProfileViewModel());
-
-            // set default preferences
-            SetPreferences(user, new List<UserPreferenceViewModel>());
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Deletes a user from the Users table
-        /// </summary>
-        /// <param name="userId">The user's id</param>
-        /// <returns></returns>
-        private int Delete(string userId)
-        {
-            string commandText = "Delete from Users where Id = @userId; Delete from User_Settings where Id = @userId;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", userId);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        /// <summary>
-        /// Deletes a user from the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Delete(TUser user)
-        {
-            return Delete(user.Id);
-        }
-
-        /// <summary>
-        /// Updates a user in the Users table
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public int Update(TUser user)
-        {
-            string commandText = @"Update Users set UserName = @userName, PasswordHash = @pwdHash, SecurityStamp = @secStamp, ConcurrencyStamp = @concurrencystamp, Email = @email, EmailConfirmed = @emailconfirmed, PhoneNumber = @phonenumber, PhoneNumberConfirmed = @phonenumberconfirmed, NormalizedEmail = @normalizedemail, NormalizedUserName = @normalizedusername, AccessFailedCount = @accesscount, LockoutEnabled = @lockoutenabled, LockoutEnd = @lockoutenddate, TwoFactorEnabled=@twofactorenabled WHERE Id = @userId;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("@userId", user.Id);
-            parameters.Add("@userName", user.UserName);
-            parameters.Add("@pwdHash", user.PasswordHash);
-            parameters.Add("@SecStamp", user.SecurityStamp);
-            parameters.Add("@concurrencystamp", user.ConcurrencyStamp);
-            parameters.Add("@email", user.Email);
-            parameters.Add("@emailconfirmed", user.EmailConfirmed);
-            parameters.Add("@phonenumber", user.PhoneNumber);
-            parameters.Add("@phonenumberconfirmed", user.PhoneNumberConfirmed);
-            parameters.Add("@normalizedemail", user.NormalizedEmail);
-            parameters.Add("@normalizedusername", user.NormalizedUserName);
-            parameters.Add("@accesscount", user.AccessFailedCount);
-            parameters.Add("@lockoutenabled", user.LockoutEnabled);
-            parameters.Add("@lockoutenddate", user.LockoutEnd);
-            parameters.Add("@twofactorenabled", user.TwoFactorEnabled);
-
-            // set the security profile
-            SetSecurityProfile(user, user.SecurityProfile);
-
-            // set preferences
-            SetPreferences(user, user.UserPreferences);
-
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        private SecurityProfileViewModel GetSecurityProfile(TUser user)
-        {
-            string sql = "SELECT SecurityProfile FROM Users WHERE Id=@Id;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("Id", user.Id);
-
-            List<Dictionary<string, object>> data = _database.ExecuteCMDDict(sql, dbDict);
-            if (data.Count == 0)
-            {
-                // no saved profile - return the default one
-                return new SecurityProfileViewModel();
-            }
-            else
-            {
-                string? securityProfileString = (string?)data[0]["SecurityProfile"];
-                if (securityProfileString != null && securityProfileString != "null")
-                {
-                    SecurityProfileViewModel securityProfile = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityProfileViewModel>(securityProfileString);
-                    return securityProfile;
-                }
-                else
-                {
-                    return new SecurityProfileViewModel();
-                }
-            }
-        }
-
-        private int SetSecurityProfile(TUser user, SecurityProfileViewModel securityProfile)
-        {
-            string commandText = "UPDATE Users SET SecurityProfile=@SecurityProfile WHERE Id=@Id;";
-            Dictionary<string, object> parameters = new Dictionary<string, object>();
-            parameters.Add("Id", user.Id);
-            parameters.Add("SecurityProfile", Newtonsoft.Json.JsonConvert.SerializeObject(securityProfile));
-            
-            return _database.ExecuteCMD(commandText, parameters).Rows.Count;
-        }
-
-        public List<UserPreferenceViewModel> GetPreferences(TUser user)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT `Setting`, `Value` FROM User_Settings WHERE Id=@id;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("id", user.Id);
-
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-
-            List<UserPreferenceViewModel> userPrefs = new List<UserPreferenceViewModel>();
-            foreach (DataRow row in data.Rows)
-            {
-                UserPreferenceViewModel userPref = new UserPreferenceViewModel();
-                userPref.Setting = (string)row["Setting"];
-                userPref.Value = (string)row["Value"];
-                userPrefs.Add(userPref);
-            }
-
-            return userPrefs;
-        }
-
-        public int SetPreferences(TUser user, List<UserPreferenceViewModel> model)
-        {
-            if (model != null)
-            {
-                List<UserPreferenceViewModel> userPreferences = GetPreferences(user);
-
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                
-                foreach (UserPreferenceViewModel modelItem in model)
-                {
-                    bool prefItemFound = false;
-                    foreach (UserPreferenceViewModel existing in userPreferences)
-                    {
-                        if (existing.Setting.ToLower() == modelItem.Setting.ToLower())
-                        {
-                            prefItemFound = true;
-                            break;
-                        }
-                    }
-
-                    string sql = "INSERT INTO User_Settings (`Id`, `Setting`, `Value`) VALUES (@id, @setting, @value);";
-                    if (prefItemFound == true)
-                    {
-                        sql = "UPDATE User_Settings SET `Value`=@value WHERE `Id`=@id AND `Setting`=@setting";
-                    }
-                    Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                    dbDict.Add("id", user.Id);
-                    dbDict.Add("setting", modelItem.Setting);
-                    dbDict.Add("value", modelItem.Value);
-                    db.ExecuteNonQuery(sql, dbDict);
-                }
-
-                return model.Count;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}

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

@@ -1,100 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication
-{
-    public class ExternalLoginConfirmationViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-    }
-
-    public class ManageUserViewModel
-    {
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Current password")]
-        public string OldPassword { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string NewPassword { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
-
-    public class LoginViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [Display(Name = "Remember me?")]
-        public bool RememberMe { get; set; }
-    }
-
-    public class RegisterViewModel
-    {
-        [Required]
-        [DataType(DataType.Text)]
-        [Display(Name = "User name")]
-        public string UserName { get; set; }
-
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-    }
-
-    public class ResetPasswordViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; }
-
-        public string Code { get; set; }
-    }
-
-    public class ForgotPasswordViewModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; }
-    }
-}

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

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class AddPhoneNumberViewModel
-{
-    [Required]
-    [Phone]
-    [Display(Name = "Phone number")]
-    public string PhoneNumber { get; set; }
-}

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

@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class ChangePasswordViewModel
-{
-    [Required]
-    [DataType(DataType.Password)]
-    [Display(Name = "Current password")]
-    public string OldPassword { get; set; }
-
-    [Required]
-    [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 10)]
-    [DataType(DataType.Password)]
-    [Display(Name = "New password")]
-    public string NewPassword { get; set; }
-
-    [DataType(DataType.Password)]
-    [Display(Name = "Confirm new password")]
-    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-    public string ConfirmPassword { get; set; }
-}

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

@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class DisplayRecoveryCodesViewModel
-{
-    [Required]
-    public IEnumerable<string> Codes { get; set; }
-
-}

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

@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication;
-
-public class IndexViewModel
-{
-    public bool HasPassword { get; set; }
-
-    public IList<UserLoginInfo> Logins { get; set; }
-
-    public string PhoneNumber { get; set; }
-
-    public bool TwoFactor { get; set; }
-
-    public bool BrowserRemembered { get; set; }
-
-    public string AuthenticatorKey { get; set; }
-}

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

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-
-namespace Authentication;
-
-public class ManageLoginsViewModel
-{
-    public IList<UserLoginInfo> CurrentLogins { get; set; }
-
-    public IList<AuthenticationScheme> OtherLogins { get; set; }
-}

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

@@ -1,47 +0,0 @@
-namespace Authentication
-{
-    public class ProfileBasicViewModel
-    {
-        public string UserId { get; set; }
-        public string UserName { get; set; }
-        public string EmailAddress { get; set; }
-        public List<String> Roles { get; set; }
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public List<UserPreferenceViewModel> UserPreferences { get; set; }
-        public string HighestRole {
-            get
-            {
-                string _highestRole = "";
-                foreach (string role in Roles)
-                {
-                    switch (role)
-                    {
-                        case "Admin":
-                            // there is no higher
-                            _highestRole = role;
-                            break;
-                        case "Gamer":
-                            // only one high is Admin, so check for that
-                            if (_highestRole != "Admin")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        case "Player":
-                            // make sure _highestRole isn't already set to Gamer or Admin
-                            if (_highestRole != "Admin" && _highestRole != "Gamer")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        default:
-                            _highestRole = "Player";
-                            break;
-                    }
-                }
-
-                return _highestRole;
-            }
-        }
-    }
-}

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

@@ -1,10 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace Authentication;
-
-public class RemoveLoginViewModel
-{
-    public string LoginProvider { get; set; }
-    public string ProviderKey { get; set; }
-}

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

@@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication
-{
-    public class SecurityProfileViewModel
-    {
-        public AgeRestrictionItem AgeRestrictionPolicy { get; set; } = new AgeRestrictionItem{ 
-            MaximumAgeRestriction = gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings.Adult,
-            IncludeUnrated = true 
-        };
-
-        public class AgeRestrictionItem
-        {
-            public gaseous_server.Classes.Metadata.AgeGroups.AgeRestrictionGroupings MaximumAgeRestriction { get; set; }
-            public bool IncludeUnrated { get; set; }
-        }
-    }
-}

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

@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Mvc.Rendering;
-
-namespace Authentication;
-
-public class SendCodeViewModel
-{
-    public string SelectedProvider { get; set; }
-
-    public ICollection<SelectListItem> Providers { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    public bool RememberMe { get; set; }
-}

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

@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class SetPasswordViewModel
-{
-    [Required]
-    [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
-    [DataType(DataType.Password)]
-    [Display(Name = "New password")]
-    public string NewPassword { get; set; }
-
-    [DataType(DataType.Password)]
-    [Display(Name = "Confirm new password")]
-    [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-    public string ConfirmPassword { get; set; }
-}

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

@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class UseRecoveryCodeViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-}

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

@@ -1,8 +0,0 @@
-namespace Authentication;
-
-public class UserPreferenceViewModel
-{
-    public string Setting { get; set; }
-
-    public string Value { get; set; }
-}

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

@@ -1,47 +0,0 @@
-namespace Authentication
-{
-    public class UserViewModel
-    {
-        public string Id { get; set; }
-        public string EmailAddress { get; set; }
-        public bool LockoutEnabled { get; set; }
-        public DateTimeOffset? LockoutEnd { get; set; }
-        public List<string> Roles { get; set; }
-        public SecurityProfileViewModel SecurityProfile { get; set; }
-        public string HighestRole {
-            get
-            {
-                string _highestRole = "";
-                foreach (string role in Roles)
-                {
-                    switch (role)
-                    {
-                        case "Admin":
-                            // there is no higher
-                            _highestRole = role;
-                            break;
-                        case "Gamer":
-                            // only one high is Admin, so check for that
-                            if (_highestRole != "Admin")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        case "Player":
-                            // make sure _highestRole isn't already set to Gamer or Admin
-                            if (_highestRole != "Admin" && _highestRole != "Gamer")
-                            {
-                                _highestRole = role;
-                            }
-                            break;
-                        default:
-                            _highestRole = "Player";
-                            break;
-                    }
-                }
-
-                return _highestRole;
-            }
-        }
-    }
-}

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

@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyAuthenticatorCodeViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    [Display(Name = "Remember this browser?")]
-    public bool RememberBrowser { get; set; }
-
-    [Display(Name = "Remember me?")]
-    public bool RememberMe { get; set; }
-}

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

@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyCodeViewModel
-{
-    [Required]
-    public string Provider { get; set; }
-
-    [Required]
-    public string Code { get; set; }
-
-    public string ReturnUrl { get; set; }
-
-    [Display(Name = "Remember this browser?")]
-    public bool RememberBrowser { get; set; }
-
-    [Display(Name = "Remember me?")]
-    public bool RememberMe { get; set; }
-}

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

@@ -1,17 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-
-namespace Authentication;
-
-public class VerifyPhoneNumberViewModel
-{
-    [Required]
-    public string Code { get; set; }
-
-    [Required]
-    [Phone]
-    [Display(Name = "Phone number")]
-    public string PhoneNumber { get; set; }
-}

gaseous-server/Classes/Bios.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
+using gaseous_tools;
 
 namespace gaseous_server.Classes
 {

gaseous-server/Classes/Collections.cs

@@ -4,33 +4,24 @@ using System.IO.Compression;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
-using Authentication;
 using gaseous_server.Classes.Metadata;
 using gaseous_server.Controllers;
 using gaseous_server.Models;
+using gaseous_tools;
 using IGDB.Models;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Newtonsoft.Json;
-using SharpCompress.Common;
 
 namespace gaseous_server.Classes
 {
 	public class Collections
 	{
-        private readonly UserManager<ApplicationUser> _userManager;
+		public Collections()
-        private readonly SignInManager<ApplicationUser> _signInManager;
-
-		public Collections(
-            UserManager<ApplicationUser> userManager,
-            SignInManager<ApplicationUser> signInManager)
 		{
-            _userManager = userManager;
+            
-            _signInManager = signInManager;
 		}
 
         public static List<CollectionItem> GetCollections() {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "SELECT * FROM RomCollections ORDER BY `Name`";
 
             DataTable data = db.ExecuteCMD(sql);
@@ -45,7 +36,7 @@ namespace gaseous_server.Classes
         }
 
         public static CollectionItem GetCollection(long Id) {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "SELECT * FROM RomCollections WHERE Id = @id ORDER BY `Name`";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 			dbDict.Add("id", Id);
@@ -66,8 +57,8 @@ namespace gaseous_server.Classes
 
         public static CollectionItem NewCollection(CollectionItem item)
         {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "INSERT INTO RomCollections (`Name`, Description, Platforms, Genres, Players, PlayerPerspectives, Themes, MinimumRating, MaximumRating, MaximumRomsPerPlatform, MaximumBytesPerPlatform, MaximumCollectionSizeInBytes, FolderStructure, IncludeBIOSFiles, ArchiveType, AlwaysInclude, BuiltStatus) VALUES (@name, @description, @platforms, @genres, @players, @playerperspectives, @themes, @minimumrating, @maximumrating, @maximumromsperplatform, @maximumbytesperplatform, @maximumcollectionsizeinbytes, @folderstructure, @includebiosfiles, @archivetype, @alwaysinclude, @builtstatus); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+            string sql = "INSERT INTO RomCollections (`Name`, Description, Platforms, Genres, Players, PlayerPerspectives, Themes, MinimumRating, MaximumRating, MaximumRomsPerPlatform, MaximumBytesPerPlatform, MaximumCollectionSizeInBytes, FolderStructure, IncludeBIOSFiles, AlwaysInclude, BuiltStatus) VALUES (@name, @description, @platforms, @genres, @players, @playerperspectives, @themes, @minimumrating, @maximumrating, @maximumromsperplatform, @maximumbytesperplatform, @maximumcollectionsizeinbytes, @folderstructure, @includebiosfiles, @alwaysinclude, @builtstatus); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("name", item.Name);
             dbDict.Add("description", item.Description);
@@ -83,7 +74,6 @@ namespace gaseous_server.Classes
             dbDict.Add("maximumcollectionsizeinbytes", Common.ReturnValueIfNull(item.MaximumCollectionSizeInBytes, -1));
             dbDict.Add("folderstructure", Common.ReturnValueIfNull(item.FolderStructure, CollectionItem.FolderStructures.Gaseous));
             dbDict.Add("includebiosfiles", Common.ReturnValueIfNull(item.IncludeBIOSFiles, 0));
-            dbDict.Add("archivetype", Common.ReturnValueIfNull(item.ArchiveType, CollectionItem.ArchiveTypes.Zip));
             dbDict.Add("alwaysinclude", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.AlwaysInclude, new List<CollectionItem.AlwaysIncludeItem>())));
             dbDict.Add("builtstatus", CollectionItem.CollectionBuildStatus.WaitingForBuild);
             DataTable romDT = db.ExecuteCMD(sql, dbDict);
@@ -98,8 +88,8 @@ namespace gaseous_server.Classes
 
         public static CollectionItem EditCollection(long Id, CollectionItem item, bool ForceRebuild = true)
         {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "UPDATE RomCollections SET `Name`=@name, Description=@description, Platforms=@platforms, Genres=@genres, Players=@players, PlayerPerspectives=@playerperspectives, Themes=@themes, MinimumRating=@minimumrating, MaximumRating=@maximumrating, MaximumRomsPerPlatform=@maximumromsperplatform, MaximumBytesPerPlatform=@maximumbytesperplatform, MaximumCollectionSizeInBytes=@maximumcollectionsizeinbytes, FolderStructure=@folderstructure, IncludeBIOSFiles=@includebiosfiles, ArchiveType=@archivetype, AlwaysInclude=@alwaysinclude, BuiltStatus=@builtstatus WHERE Id=@id";
+            string sql = "UPDATE RomCollections SET `Name`=@name, Description=@description, Platforms=@platforms, Genres=@genres, Players=@players, PlayerPerspectives=@playerperspectives, Themes=@themes, MinimumRating=@minimumrating, MaximumRating=@maximumrating, MaximumRomsPerPlatform=@maximumromsperplatform, MaximumBytesPerPlatform=@maximumbytesperplatform, MaximumCollectionSizeInBytes=@maximumcollectionsizeinbytes, FolderStructure=@folderstructure, IncludeBIOSFiles=@includebiosfiles, AlwaysInclude=@alwaysinclude, BuiltStatus=@builtstatus WHERE Id=@id";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", Id);
             dbDict.Add("name", item.Name);
@@ -117,9 +107,8 @@ namespace gaseous_server.Classes
             dbDict.Add("folderstructure", Common.ReturnValueIfNull(item.FolderStructure, CollectionItem.FolderStructures.Gaseous));
             dbDict.Add("includebiosfiles", Common.ReturnValueIfNull(item.IncludeBIOSFiles, 0));
             dbDict.Add("alwaysinclude", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.AlwaysInclude, new List<CollectionItem.AlwaysIncludeItem>())));
-            dbDict.Add("archivetype", Common.ReturnValueIfNull(item.ArchiveType, CollectionItem.ArchiveTypes.Zip));
             
-            string CollectionZipFile = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + item.ArchiveExtension);
+            string CollectionZipFile = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ".zip");
             if (ForceRebuild == true) 
             {
                 dbDict.Add("builtstatus", CollectionItem.CollectionBuildStatus.WaitingForBuild);
@@ -154,7 +143,7 @@ namespace gaseous_server.Classes
 
         public static void DeleteCollection(long Id)
         {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "DELETE FROM RomCollections WHERE Id=@id";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", Id);
@@ -174,7 +163,7 @@ namespace gaseous_server.Classes
             if (collectionItem.BuildStatus != CollectionItem.CollectionBuildStatus.Building)
             {
                 // set collection item to waitingforbuild
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
                 string sql = "UPDATE RomCollections SET BuiltStatus=@bs WHERE Id=@id";
                 Dictionary<string, object> dbDict = new Dictionary<string, object>();
                 dbDict.Add("id", Id);
@@ -223,11 +212,8 @@ namespace gaseous_server.Classes
                 }
             } else {
                 // get all platforms to pull from
-                Dictionary<string, List<Filters.FilterItem>> FilterDict = Filters.Filter(AgeGroups.AgeRestrictionGroupings.Adult, true);
+                FilterController filterController = new FilterController();
-                List<Classes.Filters.FilterItem> filteredPlatforms = (List<Classes.Filters.FilterItem>)FilterDict["platforms"];
+                platforms.AddRange((List<Platform>)filterController.Filter()["platforms"]);
-                foreach (Filters.FilterItem filterItem in filteredPlatforms) {
-                    platforms.Add(Platforms.GetPlatform(filterItem.Id));
-                }
             }
 
             // build collection
@@ -280,7 +266,7 @@ namespace gaseous_server.Classes
                             gameItem.InclusionStatus.PlatformId = alwaysIncludeItem.PlatformId;
                             gameItem.InclusionStatus.GameId = alwaysIncludeItem.GameId;
                             gameItem.InclusionStatus.InclusionState = alwaysIncludeItem.InclusionState;
-                            gameItem.Roms = Roms.GetRoms((long)gameItem.Id, (long)platform.Id).GameRomItems;
+                            gameItem.Roms = Roms.GetRoms((long)gameItem.Id, (long)platform.Id);
 
                             collectionPlatformItem.Games.Add(gameItem);
                     }
@@ -300,14 +286,14 @@ namespace gaseous_server.Classes
                     {
                         CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem = new CollectionContents.CollectionPlatformItem.CollectionGameItem(game);
 
-                        List<Roms.GameRomItem> gameRoms = Roms.GetRoms((long)game.Id, (long)platform.Id).GameRomItems;
+                        List<Roms.GameRomItem> gameRoms = Roms.GetRoms((long)game.Id, (long)platform.Id);
                         
                         bool AddGame = false;
 
                         // calculate total rom size for the game
                         long GameRomSize = 0;
                         foreach (Roms.GameRomItem gameRom in gameRoms) {
-                            GameRomSize += (long)gameRom.Size;
+                            GameRomSize += gameRom.Size;
                         }
                         if (collectionItem.MaximumBytesPerPlatform > 0) {
                             if ((TotalRomSize + GameRomSize) < collectionItem.MaximumBytesPerPlatform) {
@@ -377,7 +363,7 @@ namespace gaseous_server.Classes
 
         public static void CompileCollections(long CollectionId)
         {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             CollectionItem collectionItem = GetCollection(CollectionId);
             if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild)
@@ -392,7 +378,7 @@ namespace gaseous_server.Classes
                 db.ExecuteCMD(sql, dbDict);
 
                 List<CollectionContents.CollectionPlatformItem> collectionPlatformItems = GetCollectionContent(collectionItem).Collection;
-                string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, collectionItem.Id + collectionItem.ArchiveExtension);
+                string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, collectionItem.Id + ".zip");
                 string ZipFileTempPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, collectionItem.Id.ToString());
 
                 try
@@ -430,7 +416,7 @@ namespace gaseous_server.Classes
                                 if (File.Exists(biosItem.biosPath))
                                 {
                                     Logging.Log(Logging.LogType.Information, "Collections", "Copying BIOS file: " + biosItem.filename);
-                                    File.Copy(biosItem.biosPath, Path.Combine(ZipBiosPath, biosItem.filename), true);
+                                    File.Copy(biosItem.biosPath, Path.Combine(ZipBiosPath, biosItem.filename));
                                 }
                             }
                         }
@@ -502,7 +488,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), true);
+                                        File.Copy(gameRomItem.Path, Path.Combine(ZipGamePath, gameRomItem.Name));
                                     }
                                 }
                             }
@@ -511,21 +497,7 @@ namespace gaseous_server.Classes
 
                     // compress to zip
                     Logging.Log(Logging.LogType.Information, "Collections", "Compressing collection");
-                    switch(collectionItem.ArchiveType)
-                    {
-                        case CollectionItem.ArchiveTypes.Zip:
                     ZipFile.CreateFromDirectory(ZipFileTempPath, ZipFilePath, CompressionLevel.SmallestSize, false);
-                            break;
-
-                        case CollectionItem.ArchiveTypes.RAR:
-
-                            break;
-
-                        case CollectionItem.ArchiveTypes.SevenZip:
-                            
-                            break;
-                    }
-                    
 
                     // clean up
                     if (Directory.Exists(ZipFileTempPath))
@@ -584,7 +556,6 @@ namespace gaseous_server.Classes
             item.MaximumCollectionSizeInBytes = (long)Common.ReturnValueIfNull(row["MaximumCollectionSizeInBytes"], (long)-1);
             item.FolderStructure = (CollectionItem.FolderStructures)(int)Common.ReturnValueIfNull(row["FolderStructure"], 0);
             item.IncludeBIOSFiles = (bool)row["IncludeBIOSFiles"];
-            item.ArchiveType = (CollectionItem.ArchiveTypes)(int)Common.ReturnValueIfNull(row["ArchiveType"], 0);
             item.AlwaysInclude = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CollectionItem.AlwaysIncludeItem>>(strAlwaysInclude);
             item.BuildStatus = (CollectionItem.CollectionBuildStatus)(int)Common.ReturnValueIfNull(row["BuiltStatus"], 0);
 
@@ -613,32 +584,6 @@ namespace gaseous_server.Classes
             public long? MaximumCollectionSizeInBytes { get; set; }
             public FolderStructures FolderStructure { get; set; } = FolderStructures.Gaseous;
             public bool IncludeBIOSFiles { get; set; } = true;
-            public ArchiveTypes ArchiveType { get; set; } = CollectionItem.ArchiveTypes.Zip;
-            public string ArchiveExtension
-            {
-                get
-                {
-                    if (ArchiveType != null)
-                    {
-                        switch (ArchiveType)
-                        {
-                            case ArchiveTypes.Zip:
-                            default:
-                                return ".zip";
-                            
-                            case ArchiveTypes.RAR:
-                                return ".rar";
-
-                            case ArchiveTypes.SevenZip:
-                                return ".7z";
-                        }
-                    }
-                    else
-                    {
-                        return ".zip";
-                    }
-                }
-            }
             public List<AlwaysIncludeItem> AlwaysInclude { get; set; }
 
             [JsonIgnore]
@@ -648,7 +593,7 @@ namespace gaseous_server.Classes
                 {
                     if (_BuildStatus == CollectionBuildStatus.Completed)
                     {
-                        if (File.Exists(Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ArchiveExtension)))
+                        if (File.Exists(Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ".zip")))
                         {
                             return CollectionBuildStatus.Completed;
                         }
@@ -676,7 +621,7 @@ namespace gaseous_server.Classes
                 {
                     if (BuildStatus == CollectionBuildStatus.Completed)
                     {
-                        string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ArchiveExtension);
+                        string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ".zip");
                         if (File.Exists(ZipFilePath))
                         {
                             FileInfo fi = new FileInfo(ZipFilePath);
@@ -709,13 +654,6 @@ namespace gaseous_server.Classes
                 RetroPie = 1
             }
 
-            public enum ArchiveTypes
-            {
-                Zip = 0,
-                RAR = 1,
-                SevenZip = 2
-            }
-
             public class AlwaysIncludeItem
             {
                 public long PlatformId { get; set; }
@@ -800,7 +738,7 @@ namespace gaseous_server.Classes
                         long Size = 0;
                         foreach (CollectionGameItem Game in Games) {
                             foreach (Roms.GameRomItem Rom in Game.Roms) {
-                                Size += (long)Rom.Size;
+                                Size += Rom.Size;
                             }
                         }
 
@@ -843,15 +781,6 @@ namespace gaseous_server.Classes
                     public string Name { get; set; }
                     public string Slug { get; set; }
                     public long Cover { get; set;}
-                    public IGDB.Models.Cover CoverItem
-                    {
-                        get
-                        {
-                            IGDB.Models.Cover cover = Covers.GetCover(Cover, Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory, "Games", Slug), false);
-
-                            return cover;
-                        }
-                    }
 
                     public CollectionItem.AlwaysIncludeItem InclusionStatus { get; set; }
 
@@ -861,7 +790,7 @@ namespace gaseous_server.Classes
                     get {
                         long Size = 0;
                         foreach (Roms.GameRomItem Rom in Roms) {
-                            Size += (long)Rom.Size;
+                            Size += Rom.Size;
                         }
                     
                         return Size;

gaseous-server/Classes/FileSignature.cs

@@ -1,373 +0,0 @@
-using System.Collections.Concurrent;
-using System.IO.Compression;
-using HasheousClient.Models;
-using NuGet.Common;
-using SevenZip;
-using SharpCompress.Archives;
-using SharpCompress.Archives.Rar;
-using SharpCompress.Archives.Zip;
-using SharpCompress.Common;
-
-namespace gaseous_server.Classes
-{
-    public class FileSignature
-    {
-        public gaseous_server.Models.Signatures_Games GetFileSignature(GameLibrary.LibraryItem library, Common.hashObject hash, FileInfo fi, string GameFileImportPath)
-        {
-            Logging.Log(Logging.LogType.Information, "Get Signature", "Getting signature for file: " + GameFileImportPath);
-            gaseous_server.Models.Signatures_Games discoveredSignature = new gaseous_server.Models.Signatures_Games();
-            discoveredSignature = _GetFileSignature(hash, fi.Name, fi.Extension, fi.Length, GameFileImportPath, false);
-
-            string[] CompressionExts = { ".zip", ".rar", ".7z" };
-            string ImportedFileExtension = Path.GetExtension(GameFileImportPath);
-
-            if (CompressionExts.Contains(ImportedFileExtension) && (fi.Length < 1073741824))
-            {
-                // file is a zip and less than 1 GiB
-                // extract the zip file and search the contents
-
-                string ExtractPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, library.Id.ToString(), Path.GetRandomFileName());
-                Logging.Log(Logging.LogType.Information, "Get Signature", "Decompressing " + GameFileImportPath + " to " + ExtractPath + " examine contents");
-                if (!Directory.Exists(ExtractPath)) { Directory.CreateDirectory(ExtractPath); }
-                try
-                {
-                    switch(ImportedFileExtension)
-                    {
-                        case ".zip":
-                            Logging.Log(Logging.LogType.Information, "Get Signature", "Decompressing using zip");
-                            try
-                            {
-                                using (var archive = SharpCompress.Archives.Zip.ZipArchive.Open(GameFileImportPath))
-                                {
-                                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                                    {
-                                        Logging.Log(Logging.LogType.Information, "Get Signature", "Extracting file: " + entry.Key);
-                                        entry.WriteToDirectory(ExtractPath, new ExtractionOptions()
-                                        {
-                                            ExtractFullPath = true,
-                                            Overwrite = true
-                                        });
-                                    }
-                                }
-                            }
-                            catch (Exception zipEx)
-                            {
-                                Logging.Log(Logging.LogType.Warning, "Get Signature", "Unzip error", zipEx);
-                                throw;
-                            }
-                            break;
-
-                        case ".rar":
-                            Logging.Log(Logging.LogType.Information, "Get Signature", "Decompressing using rar");
-                            try
-                            {
-                                using (var archive = RarArchive.Open(GameFileImportPath))
-                                {
-                                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                                    {
-                                        Logging.Log(Logging.LogType.Information, "Get Signature", "Extracting file: " + entry.Key);
-                                        entry.WriteToDirectory(ExtractPath, new ExtractionOptions()
-                                        {
-                                            ExtractFullPath = true,
-                                            Overwrite = true
-                                        });
-                                    }
-                                }
-                            }
-                            catch (Exception zipEx)
-                            {
-                                Logging.Log(Logging.LogType.Warning, "Get Signature", "Unrar error", zipEx);
-                                throw;
-                            }
-                            break;
-
-                        case ".7z":
-                            Logging.Log(Logging.LogType.Information, "Get Signature", "Decompressing using 7z");
-                            try
-                            {
-                                using (var archive = SharpCompress.Archives.SevenZip.SevenZipArchive.Open(GameFileImportPath))
-                                {
-                                    foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
-                                    {
-                                        Logging.Log(Logging.LogType.Information, "Get Signature", "Extracting file: " + entry.Key);
-                                        entry.WriteToDirectory(ExtractPath, new ExtractionOptions()
-                                        {
-                                            ExtractFullPath = true,
-                                            Overwrite = true
-                                        });
-                                    }
-                                }
-                            }
-                            catch (Exception zipEx)
-                            {
-                                Logging.Log(Logging.LogType.Warning, "Get Signature", "7z error", zipEx);
-                                throw;
-                            }
-                            break;
-                    }
-                    
-                    Logging.Log(Logging.LogType.Information, "Get Signature", "Processing decompressed files for signature matches");
-                    // loop through contents until we find the first signature match
-                    List<ArchiveData> archiveFiles = new List<ArchiveData>();
-                    bool signatureFound = false;
-                    foreach (string file in Directory.GetFiles(ExtractPath, "*.*", SearchOption.AllDirectories))
-                    {
-                        if (File.Exists(file))
-                        {
-                            FileInfo zfi = new FileInfo(file);
-                            Common.hashObject zhash = new Common.hashObject(file);
-                            
-                            Logging.Log(Logging.LogType.Information, "Get Signature", "Checking signature of decompressed file " + file);
-
-                            if (zfi != null)
-                            {
-                                ArchiveData archiveData = new ArchiveData{
-                                    FileName = Path.GetFileName(file),
-                                    FilePath = zfi.Directory.FullName.Replace(ExtractPath, ""),
-                                    Size = zfi.Length,
-                                    MD5 = hash.md5hash,
-                                    SHA1 = hash.sha1hash
-                                };
-                                archiveFiles.Add(archiveData);
-
-                                if (signatureFound == false)
-                                {
-                                    gaseous_server.Models.Signatures_Games zDiscoveredSignature = _GetFileSignature(zhash, zfi.Name, zfi.Extension, zfi.Length, file, true);
-                                    zDiscoveredSignature.Rom.Name = Path.ChangeExtension(zDiscoveredSignature.Rom.Name, ImportedFileExtension);
-
-                                    if (zDiscoveredSignature.Score > discoveredSignature.Score)
-                                    {
-                                        if (
-                                            zDiscoveredSignature.Rom.SignatureSource == gaseous_server.Models.Signatures_Games.RomItem.SignatureSourceType.MAMEArcade || 
-                                            zDiscoveredSignature.Rom.SignatureSource == gaseous_server.Models.Signatures_Games.RomItem.SignatureSourceType.MAMEMess
-                                        )
-                                        {
-                                            zDiscoveredSignature.Rom.Name = zDiscoveredSignature.Game.Description + ImportedFileExtension;
-                                        }
-                                        zDiscoveredSignature.Rom.Crc = discoveredSignature.Rom.Crc;
-                                        zDiscoveredSignature.Rom.Md5 = discoveredSignature.Rom.Md5;
-                                        zDiscoveredSignature.Rom.Sha1 = discoveredSignature.Rom.Sha1;
-                                        zDiscoveredSignature.Rom.Size = discoveredSignature.Rom.Size;
-                                        discoveredSignature = zDiscoveredSignature;
-
-                                        signatureFound = true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    discoveredSignature.Rom.Attributes.Add(new KeyValuePair<string, object>(
-                         "ZipContents", Newtonsoft.Json.JsonConvert.SerializeObject(archiveFiles)
-                    ));
-                }
-                catch (Exception ex)
-                {
-                    Logging.Log(Logging.LogType.Critical, "Get Signature", "Error processing compressed file: " + GameFileImportPath, ex);
-                }
-            }
-
-            return discoveredSignature;
-        }
-
-        private gaseous_server.Models.Signatures_Games _GetFileSignature(Common.hashObject hash, string ImageName, string ImageExtension, long ImageSize, string GameFileImportPath, bool IsInZip)
-        {
-            Logging.Log(Logging.LogType.Information, "Import Game", "Checking signature for file: " + GameFileImportPath + "\nMD5 hash: " + hash.md5hash + "\nSHA1 hash: " + hash.sha1hash);
-
-
-            gaseous_server.Models.Signatures_Games discoveredSignature = new gaseous_server.Models.Signatures_Games();
-
-            // do database search first
-            gaseous_server.Models.Signatures_Games? dbSignature = _GetFileSignatureFromDatabase(hash, ImageName, ImageExtension, ImageSize, GameFileImportPath);
-
-            if (dbSignature != null)
-            {
-                // local signature found
-                Logging.Log(Logging.LogType.Information, "Import Game", "Signature found in local database for game: " + dbSignature.Game.Name);
-                discoveredSignature = dbSignature;
-            }
-            else
-            {
-                // no local signature attempt to pull from Hasheous
-                dbSignature = _GetFileSignatureFromHasheous(hash, ImageName, ImageExtension, ImageSize, GameFileImportPath);
-
-                if (dbSignature != null)
-                {
-                    // signature retrieved from Hasheous
-                    Logging.Log(Logging.LogType.Information, "Import Game", "Signature retrieved from Hasheous for game: " + dbSignature.Game.Name);
-                
-                    discoveredSignature = dbSignature;
-                }
-                else
-                {
-                    // construct a signature from file data
-                    dbSignature = _GetFileSignatureFromFileData(hash, ImageName, ImageExtension, ImageSize, GameFileImportPath);
-                    Logging.Log(Logging.LogType.Information, "Import Game", "Signature generated from provided file for game: " + dbSignature.Game.Name);
-                
-                    discoveredSignature = dbSignature;
-                }
-            }
-
-            gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, ImageExtension, false);
-
-            Logging.Log(Logging.LogType.Information, "Import Game", "  Determined import file as: " + discoveredSignature.Game.Name + " (" + discoveredSignature.Game.Year + ") " + discoveredSignature.Game.System);
-            Logging.Log(Logging.LogType.Information, "Import Game", "  Platform determined to be: " + discoveredSignature.Flags.IGDBPlatformName + " (" + discoveredSignature.Flags.IGDBPlatformId + ")");
-
-            return discoveredSignature;
-        }
-
-		private gaseous_server.Models.Signatures_Games? _GetFileSignatureFromDatabase(Common.hashObject hash, string ImageName, string ImageExtension, long ImageSize, string GameFileImportPath)
-		{
-            Logging.Log(Logging.LogType.Information, "Get Signature", "Checking local database for MD5: " + hash.md5hash);
-
-            // check 1: do we have a signature for it?
-            gaseous_server.Classes.SignatureManagement sc = new SignatureManagement();
-            List<gaseous_server.Models.Signatures_Games> signatures = sc.GetSignature(hash.md5hash);
-            if (signatures == null || signatures.Count == 0)
-            {
-                Logging.Log(Logging.LogType.Information, "Get Signature", "Checking local database for SHA1: " + hash.sha1hash);
-
-                // no md5 signature found - try sha1
-                signatures = sc.GetSignature("", hash.sha1hash);
-            }
-
-            gaseous_server.Models.Signatures_Games? discoveredSignature = null;
-            if (signatures.Count == 1)
-            {
-                // only 1 signature found!
-                discoveredSignature = signatures.ElementAt(0);
-
-                return discoveredSignature;
-            }
-            else if (signatures.Count > 1)
-            {
-                // more than one signature found - find one with highest score
-                // start with first returned element
-                discoveredSignature = signatures.First();
-                foreach (gaseous_server.Models.Signatures_Games Sig in signatures)
-                {
-                    if (Sig.Score > discoveredSignature.Score)
-                    {
-                        discoveredSignature = Sig;
-                    }
-                }
-
-                return discoveredSignature;
-            }
-
-            return null;
-        }
-
-        private gaseous_server.Models.Signatures_Games? _GetFileSignatureFromHasheous(Common.hashObject hash, string ImageName, string ImageExtension, long ImageSize, string GameFileImportPath)
-        {
-            // check if hasheous is enabled, and if so use it's signature database
-            if (Config.MetadataConfiguration.SignatureSource == HasheousClient.Models.MetadataModel.SignatureSources.Hasheous)
-            {
-                HasheousClient.Hasheous hasheous = new HasheousClient.Hasheous();
-                SignatureLookupItem? HasheousResult = hasheous.RetrieveFromHasheousAsync(new HashLookupModel{
-                    MD5 = hash.md5hash,
-                    SHA1 = hash.sha1hash
-                });
-
-                if (HasheousResult != null)
-                {
-                    if (HasheousResult.Signature != null)
-                    {
-                        gaseous_server.Models.Signatures_Games signature = new Models.Signatures_Games();
-                        signature.Game = HasheousResult.Signature.Game;
-                        signature.Rom = HasheousResult.Signature.Rom;
-                        
-                        if (HasheousResult.MetadataResults != null)
-                        {
-                            if (HasheousResult.MetadataResults.Count > 0)
-                            {
-                                foreach (SignatureLookupItem.MetadataResult metadataResult in HasheousResult.MetadataResults)
-                                {
-                                    if (metadataResult.Source == MetadataModel.MetadataSources.IGDB)
-                                    {
-                                        signature.Flags.IGDBPlatformId = (long)metadataResult.PlatformId;
-                                        signature.Flags.IGDBGameId = (long)metadataResult.GameId;
-                                    }
-                                }
-                            }
-                        }
-
-                        return signature;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private gaseous_server.Models.Signatures_Games _GetFileSignatureFromFileData(Common.hashObject hash, string ImageName, string ImageExtension, long ImageSize, string GameFileImportPath)
-        {
-            SignatureManagement signatureManagement = new SignatureManagement();
-
-            gaseous_server.Models.Signatures_Games discoveredSignature = new gaseous_server.Models.Signatures_Games();
-
-            // no signature match found - try name search
-            List<gaseous_server.Models.Signatures_Games> signatures = signatureManagement.GetByTosecName(ImageName);
-
-            if (signatures.Count == 1)
-            {
-                // only 1 signature found!
-                discoveredSignature = signatures.ElementAt(0);
-
-                return discoveredSignature;
-            }
-            else if (signatures.Count > 1)
-            {
-                // more than one signature found - find one with highest score
-                foreach (gaseous_server.Models.Signatures_Games Sig in signatures)
-                {
-                    if (Sig.Score > discoveredSignature.Score)
-                    {
-                        discoveredSignature = Sig;
-                    }
-                }
-
-                return discoveredSignature;
-            }
-            else
-            {
-                // still no search - try alternate method
-                gaseous_server.Models.Signatures_Games.GameItem gi = new gaseous_server.Models.Signatures_Games.GameItem();
-                gaseous_server.Models.Signatures_Games.RomItem ri = new gaseous_server.Models.Signatures_Games.RomItem();
-
-                discoveredSignature.Game = gi;
-                discoveredSignature.Rom = ri;
-
-                // game title is the file name without the extension or path
-                gi.Name = Path.GetFileNameWithoutExtension(GameFileImportPath);
-
-                // remove everything after brackets - leaving (hopefully) only the name
-                if (gi.Name.Contains("("))
-                {
-                    gi.Name = gi.Name.Substring(0, gi.Name.IndexOf("(")).Trim();
-                }
-
-                // remove special characters like dashes
-                gi.Name = gi.Name.Replace("-", "").Trim();
-
-                // get rom data
-                ri.Name = Path.GetFileName(GameFileImportPath);
-                ri.Md5 = hash.md5hash;
-                ri.Sha1 = hash.sha1hash;
-                ri.Size = ImageSize;
-                ri.SignatureSource = gaseous_server.Models.Signatures_Games.RomItem.SignatureSourceType.None;
-
-                return discoveredSignature;
-            }
-        }
-
-        public class ArchiveData
-        {
-            public string FileName { get; set; }
-            public string FilePath { get; set; }
-            public long Size { get; set; }
-            public string MD5 { get; set; }
-            public string SHA1 { get; set; }
-        }
-    }
-}

gaseous-server/Classes/Filters.cs

@@ -1,143 +0,0 @@
-using System.Data;
-using System.Reflection.Metadata.Ecma335;
-using gaseous_server.Classes.Metadata;
-using IGDB.Models;
-
-namespace gaseous_server.Classes
-{
-    public class Filters
-    {
-        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, List<FilterItem>> FilterSet = new Dictionary<string, List<FilterItem>>();
-
-            // platforms
-            List<FilterItem> platforms = new List<FilterItem>();
-            
-            string ageRestriction_Platform = "AgeGroup.AgeGroupId <= " + (int)MaximumAgeRestriction;
-            string ageRestriction_Generic = "view_Games.AgeGroupId <= " + (int)MaximumAgeRestriction;
-            if (IncludeUnrated == true)
-            {
-                ageRestriction_Platform += " OR AgeGroup.AgeGroupId IS NULL";
-                ageRestriction_Generic += " OR view_Games.AgeGroupId IS NULL";
-            }
-
-            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)
-            {
-                FilterItem platformItem = new FilterItem(dr);
-                platforms.Add(platformItem);
-
-            }
-            FilterSet.Add("platforms", platforms);
-
-            // genres
-            List<FilterItem> genres = new List<FilterItem>();
-            dbResponse = GetGenericFilterItem(db, "Genre", ageRestriction_Platform);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                FilterItem genreItem = new FilterItem(dr);
-                genres.Add(genreItem);
-            }
-            FilterSet.Add("genres", genres);
-
-            // game modes
-            List<FilterItem> gameModes = new List<FilterItem>();
-            dbResponse = GetGenericFilterItem(db, "GameMode", ageRestriction_Platform);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                FilterItem gameModeItem = new FilterItem(dr);
-                gameModes.Add(gameModeItem);
-            }
-            FilterSet.Add("gamemodes", gameModes);
-
-            // player perspectives
-            List<FilterItem> playerPerspectives = new List<FilterItem>();
-            dbResponse = GetGenericFilterItem(db, "PlayerPerspective", ageRestriction_Platform);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                FilterItem playerPerspectiveItem = new FilterItem(dr);
-                playerPerspectives.Add(playerPerspectiveItem);
-            }
-            FilterSet.Add("playerperspectives", playerPerspectives);
-
-            // themes
-            List<FilterItem> themes = new List<FilterItem>();
-            dbResponse = GetGenericFilterItem(db, "Theme", ageRestriction_Platform);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                FilterItem themeItem = new FilterItem(dr);
-                themes.Add(themeItem);
-            }
-            FilterSet.Add("themes", themes);
-
-            // age groups
-            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)
-            {
-                FilterItem filterAgeGrouping = new FilterItem();
-                if (dr["AgeGroupId"] == DBNull.Value)
-                {
-                    filterAgeGrouping.Id = (int)(long)AgeGroups.AgeRestrictionGroupings.Unclassified;
-                    filterAgeGrouping.Name = AgeGroups.AgeRestrictionGroupings.Unclassified.ToString();
-                }
-                else
-                {
-                    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);
-            }
-            FilterSet.Add("agegroupings", agegroupings);
-
-            return FilterSet;
-        }
-
-        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 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 FilterItem
-        {
-            public FilterItem()
-            {
-
-            }
-
-            public FilterItem(DataRow dr)
-            {
-                this.Id = (long)dr["Id"];
-                this.Name = (string)dr["Name"];
-                this.GameCount = (int)(long)dr["GameCount"];
-            }
-
-            public long Id { get; set; }
-
-            public string Name { get; set; }
-
-            public int GameCount { get; set; }
-        }
-    }
-}

gaseous-server/Classes/GameLibrary.cs

@@ -1,222 +0,0 @@
-using System;
-using System.Data;
-using gaseous_server.Classes;
-using gaseous_server.Classes.Metadata;
-using IGDB.Models;
-using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow;
-
-namespace gaseous_server
-{
-	public static class GameLibrary
-	{
-        // exceptions
-        public class PathExists : Exception
-        { 
-            public PathExists(string path) : base("The library path " + path + " already exists.")
-            {}
-        }
-
-        public class PathNotFound : Exception
-        {
-            public PathNotFound(string path) : base("The path " + path + " does not exist.")
-            {}
-        }
-
-        public class LibraryNotFound : Exception
-        {
-            public LibraryNotFound(int LibraryId) : base("Library id " + LibraryId + " does not exist.")
-            {}
-        }
-
-        public class CannotDeleteDefaultLibrary : Exception
-        {
-            public CannotDeleteDefaultLibrary() : base("Unable to delete the default library.")
-            {}
-        }
-
-        public class CannotDeleteLibraryWhileScanIsActive : Exception
-        {
-            public CannotDeleteLibraryWhileScanIsActive() : base("Unable to delete library while a library scan is active. Wait for all scans to complete and try again")
-            {}
-        }
-
-        // code
-        public static LibraryItem GetDefaultLibrary
-        {
-            get
-            {
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                string sql = "SELECT * FROM GameLibraries WHERE DefaultLibrary=1 LIMIT 1";
-                DataTable data = db.ExecuteCMD(sql);
-                DataRow row = data.Rows[0];
-                LibraryItem library = new LibraryItem((int)row["Id"], (string)row["Name"], (string)row["Path"], (long)row["DefaultPlatform"], Convert.ToBoolean((int)row["DefaultLibrary"]));
-
-                if (!Directory.Exists(library.Path))
-                {
-                    Directory.CreateDirectory(library.Path);
-                }
-
-                return library;
-            }
-        }
-
-        public static List<LibraryItem> GetLibraries
-        {
-            get
-            {
-                List<LibraryItem> libraryItems = new List<LibraryItem>();
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                string sql = "SELECT * FROM GameLibraries";
-                DataTable data = db.ExecuteCMD(sql);
-                foreach (DataRow row in data.Rows)
-                {
-                    LibraryItem library = new LibraryItem((int)row["Id"], (string)row["Name"], (string)row["Path"], (long)row["DefaultPlatform"], Convert.ToBoolean((int)row["DefaultLibrary"]));
-                    libraryItems.Add(library);
-
-                    if (library.IsDefaultLibrary == true)
-                    {
-                        // check directory exists
-                        if (!Directory.Exists(library.Path))
-                        {
-                            Directory.CreateDirectory(library.Path);
-                        }
-                    }
-                }
-
-                return libraryItems;
-            }
-        }
-
-        public static LibraryItem AddLibrary(string Name, string Path, long DefaultPlatformId)
-        {
-            string PathName = Common.NormalizePath(Path);
-
-            // check path isn't already in place
-            foreach (LibraryItem item in GetLibraries)
-            {
-                if (Common.NormalizePath(PathName) == Common.NormalizePath(item.Path))
-                {
-                    // already existing path!
-                    throw new PathExists(PathName);
-                }
-            }
-
-            if (!System.IO.Path.Exists(PathName))
-            {
-                throw new PathNotFound(PathName);
-            }
-
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "INSERT INTO GameLibraries (Name, Path, DefaultPlatform, DefaultLibrary) VALUES (@name, @path, @defaultplatform, 0); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("name", Name);
-            dbDict.Add("path", PathName);
-            dbDict.Add("defaultplatform", DefaultPlatformId);
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-            
-            int newLibraryId = (int)(long)data.Rows[0][0];
-
-            Logging.Log(Logging.LogType.Information, "Library Management", "Created library " + Name + " at directory " + PathName);
-
-            LibraryItem library = GetLibrary(newLibraryId);
-
-            return library;
-        }
-
-        public static void DeleteLibrary(int LibraryId)
-        {
-            LibraryItem library = GetLibrary(LibraryId);
-            if (library.IsDefaultLibrary == false)
-            {
-                // check for active library scans
-                foreach(ProcessQueue.QueueItem item in ProcessQueue.QueueItems)
-                {
-                    if (
-                        (item.ItemType == ProcessQueue.QueueItemType.LibraryScan && item.ItemState == ProcessQueue.QueueItemState.Running) || 
-                        (item.ItemType == ProcessQueue.QueueItemType.LibraryScanWorker && item.ItemState == ProcessQueue.QueueItemState.Running)
-                    )
-                    {
-                        Logging.Log(Logging.LogType.Warning, "Library Management", "Unable to delete libraries while a library scan is running. Wait until the the library scan is completed and try again.");
-                        throw new CannotDeleteLibraryWhileScanIsActive();
-                    }
-                }
-
-                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                string sql = "DELETE FROM Games_Roms WHERE LibraryId=@id; DELETE FROM GameLibraries WHERE Id=@id;";
-                Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                dbDict.Add("id", LibraryId);
-                db.ExecuteCMD(sql, dbDict);
-
-                Logging.Log(Logging.LogType.Information, "Library Management", "Deleted library " + library.Name + " at path " + library.Path);
-            }
-            else
-            {
-                Logging.Log(Logging.LogType.Warning, "Library Management", "Unable to delete the default library.");
-                throw new CannotDeleteDefaultLibrary();
-            }
-        }
-
-        public static LibraryItem GetLibrary(int LibraryId)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM GameLibraries WHERE Id=@id";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("id", LibraryId);
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-            if (data.Rows.Count > 0)
-            {
-                DataRow row = data.Rows[0];
-                LibraryItem library = new LibraryItem((int)row["Id"], (string)row["Name"], (string)row["Path"], (long)row["DefaultPlatform"], Convert.ToBoolean((int)row["DefaultLibrary"]));
-                return library;
-            }
-            else
-            {
-                throw new LibraryNotFound(LibraryId);
-            }
-        }
-        
-        public class LibraryItem
-        {
-            public LibraryItem(int Id, string Name, string Path, long DefaultPlatformId, bool IsDefaultLibrary)
-            {
-                _Id = Id;
-                _Name = Name;
-                _Path = Path;
-                _DefaultPlatformId = DefaultPlatformId;
-                _IsDefaultLibrary = IsDefaultLibrary;
-
-                if (!Directory.Exists(Path))
-                {
-                    Directory.CreateDirectory(Path);
-                }
-            }
-
-            int _Id = 0;
-            string _Name = "";
-            string _Path = "";
-            long _DefaultPlatformId = 0;
-            bool _IsDefaultLibrary = false;
-
-            public int Id => _Id;
-            public string Name => _Name;
-            public string Path => _Path;
-            public long DefaultPlatformId => _DefaultPlatformId;
-            public string? DefaultPlatformName
-            {
-                get
-                {
-                    if (_DefaultPlatformId != 0)
-                    {
-                        Platform platform = Platforms.GetPlatform(_DefaultPlatformId);
-                        return platform.Name;
-                    }
-                    else
-                    {
-                        return "";
-                    }
-                }
-            }
-            public bool IsDefaultLibrary => _IsDefaultLibrary;
-        }
-    }
-}

gaseous-server/Classes/ImportGames.cs

@@ -1,43 +1,30 @@
 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 gaseous_tools;
-using gaseous_server.Models;
 using IGDB.Models;
-using NuGet.Common;
+using MySqlX.XDevAPI;
-using NuGet.LibraryModel;
+using Org.BouncyCastle.Utilities.IO.Pem;
 using static gaseous_server.Classes.Metadata.Games;
-using static gaseous_server.Classes.FileSignature;
-using HasheousClient.Models;
 
 namespace gaseous_server.Classes
 {
-	public class ImportGame : QueueItemStatus
+	public class ImportGames
 	{
-        public void ProcessDirectory(string ImportPath)
+		public ImportGames(string ImportPath)
 		{
 			if (Directory.Exists(ImportPath))
 			{
-				string[] importContents = Directory.GetFiles(ImportPath, "*.*", SearchOption.AllDirectories);
+				string[] importContents_Files = Directory.GetFiles(ImportPath);
-
+                string[] importContents_Directories = Directory.GetDirectories(ImportPath);
-                Logging.Log(Logging.LogType.Information, "Import Games", "Found " + importContents.Length + " files to process in import directory: " + ImportPath);
 
 				// import files first
-                int importCount = 1;
+				foreach (string importContent in importContents_Files) {
-				foreach (string importContent in importContents) {
+					ImportGame.ImportGameFile(importContent, null, false);
-                    SetStatus(importCount, importContents.Length, "Importing file: " + importContent);
-
-					ImportGameFile(importContent, null);
-
-                    importCount += 1;
 				}
-                ClearStatus();
-
-                DeleteOrphanedDirectories(ImportPath);
             }
 			else
 			{
@@ -46,9 +33,14 @@ namespace gaseous_server.Classes
 			}
 		}
 
-        public void ImportGameFile(string GameFileImportPath, IGDB.Models.Platform? OverridePlatform)
+
+	}
+
+	public class ImportGame
 	{
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+        public static void ImportGameFile(string GameFileImportPath, IGDB.Models.Platform? OverridePlatform, bool IsDirectory = false)
+		{
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 
@@ -57,6 +49,8 @@ namespace gaseous_server.Classes
                 Logging.Log(Logging.LogType.Debug, "Import Game", "Skipping item " + GameFileImportPath);
             }
 			else
+			{
+				if (IsDirectory == false)
 				{
 					FileInfo fi = new FileInfo(GameFileImportPath);
                     Common.hashObject hash = new Common.hashObject(GameFileImportPath);
@@ -73,33 +67,16 @@ namespace gaseous_server.Classes
                         DataTable importDB = db.ExecuteCMD(sql, dbDict);
                         if ((Int64)importDB.Rows[0]["count"] > 0)
                         {
-                        // import source was the import directory
+                            if (!GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryImportDirectory))
-                        if (GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryImportDirectory))
                             {
-                            Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - moving to " + Config.LibraryConfiguration.LibraryImportDuplicatesDirectory);
+                                Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping");
-
-                            string targetPathWithFileName = GameFileImportPath.Replace(Config.LibraryConfiguration.LibraryImportDirectory, Config.LibraryConfiguration.LibraryImportDuplicatesDirectory);
-                            string targetPath = Path.GetDirectoryName(targetPathWithFileName);
-
-                            if (!Directory.Exists(targetPath))
-                            {
-                                Directory.CreateDirectory(targetPath);
-                            }
-                            File.Move(GameFileImportPath, targetPathWithFileName, true);
-                        }
-                        
-                        // import source was the upload directory
-                        if (GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryUploadDirectory))
-                        {
-                            Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping import");
                             }
                         }
                         else
                         {
                             Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
 
-                        FileSignature fileSignature = new FileSignature();
+                            Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
-                        gaseous_server.Models.Signatures_Games discoveredSignature = fileSignature.GetFileSignature(GameLibrary.GetDefaultLibrary, hash, fi, GameFileImportPath);
 
                             // get discovered platform
                             IGDB.Models.Platform? determinedPlatform = null;
@@ -118,10 +95,10 @@ namespace gaseous_server.Classes
                                 discoveredSignature.Flags.IGDBPlatformName = determinedPlatform.Name;
                             }
 
-                        IGDB.Models.Game determinedGame = SearchForGame(discoveredSignature, discoveredSignature.Flags.IGDBPlatformId, true);
+                            IGDB.Models.Game determinedGame = SearchForGame(discoveredSignature.Game.Name, discoveredSignature.Flags.IGDBPlatformId);
 
                             // add to database
-                        StoreROM(GameLibrary.GetDefaultLibrary, hash, determinedGame, determinedPlatform, discoveredSignature, GameFileImportPath);
+                            StoreROM(hash, determinedGame, determinedPlatform, discoveredSignature, GameFileImportPath);
                         }
                     }
                     else
@@ -148,30 +125,150 @@ namespace gaseous_server.Classes
                     }
                 }
 			}
+		}
 
-        public static IGDB.Models.Game SearchForGame(gaseous_server.Models.Signatures_Games Signature, long PlatformId, bool FullDownload)
+        public static Models.Signatures_Games GetFileSignature(Common.hashObject hash, FileInfo fi, string GameFileImportPath)
         {
-            if (Signature.Flags != null)
+            Models.Signatures_Games discoveredSignature = _GetFileSignature(hash, fi, GameFileImportPath);
+
+            if ((Path.GetExtension(GameFileImportPath) == ".zip") && (fi.Length < 1073741824))
             {
-                if (Signature.Flags.IGDBGameId != null && Signature.Flags.IGDBGameId != 0)
+                // file is a zip and less than 1 GiB
+                // extract the zip file and search the contents
+                string ExtractPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, Path.GetRandomFileName());
+                if (!Directory.Exists(ExtractPath)) { Directory.CreateDirectory(ExtractPath); }
+                ZipFile.ExtractToDirectory(GameFileImportPath, ExtractPath);
+
+                // loop through contents until we find the first signature match
+                foreach (string file in Directory.GetFiles(ExtractPath))
                 {
-                    // game was determined elsewhere - probably a Hasheous server
+                    FileInfo zfi = new FileInfo(file);
-                    try
+                    Common.hashObject zhash = new Common.hashObject(file);
+
+                    Models.Signatures_Games zDiscoveredSignature = _GetFileSignature(zhash, zfi, file);
+                    zDiscoveredSignature.Rom.Name = Path.ChangeExtension(zDiscoveredSignature.Rom.Name, ".zip");
+
+                    if (zDiscoveredSignature.Score > discoveredSignature.Score)
                     {
-                        return Games.GetGame(Signature.Flags.IGDBGameId, false, false, FullDownload);
+                        if (
-                    }
+                            zDiscoveredSignature.Rom.SignatureSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.MAMEArcade || 
-                    catch (Exception ex)
+                            zDiscoveredSignature.Rom.SignatureSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.MAMEMess
-                    {
+                        )
-                        Logging.Log(Logging.LogType.Warning, "Import Game", "Provided game id resulted in a failed game lookup", ex);
+                        {
+                            zDiscoveredSignature.Rom.Name = zDiscoveredSignature.Game.Description + ".zip";
                         }
+                        zDiscoveredSignature.Rom.Crc = discoveredSignature.Rom.Crc;
+                        zDiscoveredSignature.Rom.Md5 = discoveredSignature.Rom.Md5;
+                        zDiscoveredSignature.Rom.Sha1 = discoveredSignature.Rom.Sha1;
+                        zDiscoveredSignature.Rom.Size = discoveredSignature.Rom.Size;
+                        discoveredSignature = zDiscoveredSignature;
+
+                        break;
                     }
                 }
 
+                if (Directory.Exists(ExtractPath)) { Directory.Delete(ExtractPath, true); }
+            }
+
+            return discoveredSignature;
+        }
+
+		private static Models.Signatures_Games _GetFileSignature(Common.hashObject hash, FileInfo fi, string GameFileImportPath)
+		{
+            // check 1: do we have a signature for it?
+            gaseous_server.Controllers.SignaturesController sc = new Controllers.SignaturesController();
+            List<Models.Signatures_Games> signatures = sc.GetSignature(hash.md5hash);
+            if (signatures.Count == 0)
+            {
+                // no md5 signature found - try sha1
+                signatures = sc.GetSignature("", hash.sha1hash);
+            }
+
+            Models.Signatures_Games discoveredSignature = new Models.Signatures_Games();
+            if (signatures.Count == 1)
+            {
+                // only 1 signature found!
+                discoveredSignature = signatures.ElementAt(0);
+                gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, fi, false);
+            }
+            else if (signatures.Count > 1)
+            {
+                // more than one signature found - find one with highest score
+                foreach (Models.Signatures_Games Sig in signatures)
+                {
+                    if (Sig.Score > discoveredSignature.Score)
+                    {
+                        discoveredSignature = Sig;
+                        gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, fi, false);
+                    }
+                }
+            }
+            else
+            {
+                // no signature match found - try name search
+                signatures = sc.GetByTosecName(fi.Name);
+
+                if (signatures.Count == 1)
+                {
+                    // only 1 signature found!
+                    discoveredSignature = signatures.ElementAt(0);
+                    gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, fi, false);
+                }
+                else if (signatures.Count > 1)
+                {
+                    // more than one signature found - find one with highest score
+                    foreach (Models.Signatures_Games Sig in signatures)
+                    {
+                        if (Sig.Score > discoveredSignature.Score)
+                        {
+                            discoveredSignature = Sig;
+                            gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, fi, false);
+                        }
+                    }
+                }
+                else
+                {
+                    // still no search - try alternate method
+                    Models.Signatures_Games.GameItem gi = new Models.Signatures_Games.GameItem();
+                    Models.Signatures_Games.RomItem ri = new Models.Signatures_Games.RomItem();
+
+                    discoveredSignature.Game = gi;
+                    discoveredSignature.Rom = ri;
+
+                    // game title is the file name without the extension or path
+                    gi.Name = Path.GetFileNameWithoutExtension(GameFileImportPath);
+
+                    // remove everything after brackets - leaving (hopefully) only the name
+                    if (gi.Name.Contains("("))
+                    {
+                        gi.Name = gi.Name.Substring(0, gi.Name.IndexOf("("));
+                    }
+
+                    // remove special characters like dashes
+                    gi.Name = gi.Name.Replace("-", "");
+
+                    // guess platform
+                    gaseous_server.Models.PlatformMapping.GetIGDBPlatformMapping(ref discoveredSignature, fi, true);
+
+                    // get rom data
+                    ri.Name = Path.GetFileName(GameFileImportPath);
+                    ri.Md5 = hash.md5hash;
+                    ri.Sha1 = hash.sha1hash;
+                    ri.Size = fi.Length;
+                    ri.SignatureSource = gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None;
+                }
+            }
+
+            Logging.Log(Logging.LogType.Information, "Import Game", "  Determined import file as: " + discoveredSignature.Game.Name + " (" + discoveredSignature.Game.Year + ") " + discoveredSignature.Game.System);
+
+            return discoveredSignature;
+        }
+
+        public static IGDB.Models.Game SearchForGame(string GameName, long PlatformId)
+        {
             // search discovered game - case insensitive exact match first
             IGDB.Models.Game determinedGame = new IGDB.Models.Game();
 
-            string GameName = Signature.Game.Name;
-
             List<string> SearchCandidates = GetSearchCandidates(GameName);
             
             foreach (string SearchCandidate in SearchCandidates)
@@ -294,9 +391,9 @@ namespace gaseous_server.Classes
             return SearchCandidates;
         }
 
-        public static long StoreROM(GameLibrary.LibraryItem library, Common.hashObject hash, IGDB.Models.Game determinedGame, IGDB.Models.Platform determinedPlatform, gaseous_server.Models.Signatures_Games discoveredSignature, string GameFileImportPath, long UpdateId = 0)
+        public static long StoreROM(Common.hashObject hash, IGDB.Models.Game determinedGame, IGDB.Models.Platform determinedPlatform, Models.Signatures_Games discoveredSignature, string GameFileImportPath, long UpdateId = 0)
         {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             string sql = "";
 
@@ -304,10 +401,10 @@ namespace gaseous_server.Classes
 
             if (UpdateId == 0)
             {
-                sql = "INSERT INTO Games_Roms (PlatformId, GameId, Name, Size, CRC, MD5, SHA1, DevelopmentStatus, Attributes, RomType, RomTypeMedia, MediaLabel, Path, MetadataSource, MetadataGameName, MetadataVersion, LibraryId) VALUES (@platformid, @gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @Attributes, @romtype, @romtypemedia, @medialabel, @path, @metadatasource, @metadatagamename, @metadataversion, @libraryid); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+                sql = "INSERT INTO Games_Roms (PlatformId, GameId, Name, Size, CRC, MD5, SHA1, DevelopmentStatus, Attributes, RomType, RomTypeMedia, MediaLabel, Path, MetadataSource, MetadataGameName, MetadataVersion) VALUES (@platformid, @gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @Attributes, @romtype, @romtypemedia, @medialabel, @path, @metadatasource, @metadatagamename, @metadataversion); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
             } else
             {
-                sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid, Name=@name, Size=@size, DevelopmentStatus=@developmentstatus, Attributes=@Attributes, RomType=@romtype, RomTypeMedia=@romtypemedia, MediaLabel=@medialabel, MetadataSource=@metadatasource, MetadataGameName=@metadatagamename, MetadataVersion=@metadataversion WHERE Id=@id;";
+                sql = "UPDATE Games_Roms SET PlatformId=platformid, GameId=@gameid, Name=@name, Size=@size, DevelopmentStatus=@developmentstatus, Attributes=@Attributes, RomType=@romtype, RomTypeMedia=@romtypemedia, MediaLabel=@medialabel, MetadataSource=@metadatasource, MetadataGameName=@metadatagamename, MetadataVersion=@metadataversion WHERE Id=@id;";
                 dbDict.Add("id", UpdateId);
             }
             dbDict.Add("platformid", Common.ReturnValueIfNull(determinedPlatform.Id, 0));
@@ -321,7 +418,6 @@ namespace gaseous_server.Classes
             dbDict.Add("metadatasource", discoveredSignature.Rom.SignatureSource);
             dbDict.Add("metadatagamename", discoveredSignature.Game.Name);
             dbDict.Add("metadataversion", 2);
-            dbDict.Add("libraryid", library.Id);
 
             if (discoveredSignature.Rom.Attributes != null)
             {
@@ -354,10 +450,7 @@ namespace gaseous_server.Classes
             }
 
             // move to destination
-            if (library.IsDefaultLibrary == true)
-            {
             MoveGameFile(romId);
-            }
 
             return romId;
         }
@@ -381,7 +474,7 @@ namespace gaseous_server.Classes
 			{
 				gameSlug = game.Slug;
 			}
-			string DestinationPath = Path.Combine(GameLibrary.GetDefaultLibrary.Path, gameSlug, platformSlug);
+			string DestinationPath = Path.Combine(Config.LibraryConfiguration.LibraryDataDirectory, gameSlug, platformSlug);
 			if (!Directory.Exists(DestinationPath))
 			{
 				Directory.CreateDirectory(DestinationPath);
@@ -419,7 +512,7 @@ namespace gaseous_server.Classes
 						File.Move(romPath, DestinationPath);
 
 						// update the db
-						Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+						Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 						string sql = "UPDATE Games_Roms SET Path=@path WHERE Id=@id";
 						Dictionary<string, object> dbDict = new Dictionary<string, object>();
 						dbDict.Add("id", RomId);
@@ -437,18 +530,14 @@ namespace gaseous_server.Classes
             }
         }
 
-		public void OrganiseLibrary()
+		public static void OrganiseLibrary()
 		{
-            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting default library organisation");
+            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting library organisation");
-
-            GameLibrary.LibraryItem library = GameLibrary.GetDefaultLibrary;
 
             // move rom files to their new location
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM Games_Roms WHERE LibraryId = @libraryid";
+            string sql = "SELECT * FROM Games_Roms";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            DataTable romDT = db.ExecuteCMD(sql);
-            dbDict.Add("libraryid", library.Id);
-            DataTable romDT = db.ExecuteCMD(sql, dbDict);
 
             if (romDT.Rows.Count > 0)
 			{
@@ -461,121 +550,36 @@ namespace gaseous_server.Classes
 			}
 
 			// clean up empty directories
-			DeleteOrphanedDirectories(GameLibrary.GetDefaultLibrary.Path);
+			DeleteOrphanedDirectories(Config.LibraryConfiguration.LibraryDataDirectory);
 
-            Logging.Log(Logging.LogType.Information, "Organise Library", "Finsihed default library organisation");
+            Logging.Log(Logging.LogType.Information, "Organise Library", "Finsihed library organisation");
         }
 
-        public static void DeleteOrphanedDirectories(string startLocation)
+        private static void DeleteOrphanedDirectories(string startLocation)
         {
             foreach (var directory in Directory.GetDirectories(startLocation))
             {
                 DeleteOrphanedDirectories(directory);
-
+                if (Directory.GetFiles(directory).Length == 0 &&
-                string[] files = Directory.GetFiles(directory);
+                    Directory.GetDirectories(directory).Length == 0)
-                string[] directories = Directory.GetDirectories(directory);
-                
-                if (files.Length == 0 &&
-                    directories.Length == 0)
                 {
                     Directory.Delete(directory, false);
                 }
             }
         }
 
-        public void LibraryScan(GameLibrary.LibraryItem? singleLibrary = null)
+        public static void LibraryScan()
         {
-            int maxWorkers = Config.MetadataConfiguration.MaxLibraryScanWorkers;
+            Logging.Log(Logging.LogType.Information, "Library Scan", "Starting library scan");
-
-            List<GameLibrary.LibraryItem> libraries = new List<GameLibrary.LibraryItem>();
-            if (singleLibrary == null)
-            {
-                libraries.AddRange(GameLibrary.GetLibraries);
-            }
-            else
-            {
-                libraries.Add(singleLibrary);
-            }
-
-            // setup background tasks for each library
-            foreach (GameLibrary.LibraryItem library in libraries)
-            {
-                Logging.Log(Logging.LogType.Information, "Library Scan", "Starting worker process for library " + library.Name);
-                ProcessQueue.QueueItem queue = new ProcessQueue.QueueItem(
-                    ProcessQueue.QueueItemType.LibraryScanWorker,
-                    1,
-                    new List<ProcessQueue.QueueItemType>
-                    {
-                        ProcessQueue.QueueItemType.OrganiseLibrary,
-                        ProcessQueue.QueueItemType.Rematcher
-                    },
-                    false,
-                    true);
-                queue.Options = library;
-                queue.ForceExecute();
-
-                ProcessQueue.QueueItems.Add(queue);
-
-                // check number of running tasks is less than maxWorkers
-                bool allowContinue;
-                do
-                {
-                    allowContinue = true;
-                    int currentWorkerCount = 0;
-                    List<ProcessQueue.QueueItem> queueItems = new List<ProcessQueue.QueueItem>();
-                    queueItems.AddRange(ProcessQueue.QueueItems);
-                    foreach (ProcessQueue.QueueItem item in queueItems)
-                    {
-                        if (item.ItemType == ProcessQueue.QueueItemType.LibraryScanWorker)
-                        {
-                            currentWorkerCount += 1;
-                        }
-                    }
-                    if (currentWorkerCount >= maxWorkers)
-                    {
-                        allowContinue = false;
-                        Thread.Sleep(60000);
-                    }
-                } while (allowContinue == false);
-            }
-
-            bool WorkersStillWorking;
-            do
-            {
-                WorkersStillWorking = false;
-                List<ProcessQueue.QueueItem> queueItems = new List<ProcessQueue.QueueItem>();
-                queueItems.AddRange(ProcessQueue.QueueItems);
-                foreach (ProcessQueue.QueueItem item in queueItems)
-                {
-                    if (item.ItemType == ProcessQueue.QueueItemType.LibraryScanWorker)
-                    {
-                        // workers are still running - sleep and keep looping
-                        WorkersStillWorking = true;
-                        Thread.Sleep(30000);
-                    }
-                }
-            } while (WorkersStillWorking == true);
-
-            Logging.Log(Logging.LogType.Information, "Library Scan", "Library scan complete. All workers stopped");
-        }
-
-        public void LibrarySpecificScan(GameLibrary.LibraryItem library)
-        {
-            
-            Logging.Log(Logging.LogType.Information, "Library Scan", "Starting scan of library: " + library.Name);
 
             Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             Logging.Log(Logging.LogType.Information, "Library Scan", "Looking for duplicate library files to clean up");
-            string duplicateSql = "DELETE r1 FROM Games_Roms r1 INNER JOIN Games_Roms r2 WHERE r1.Id > r2.Id AND r1.MD5 = r2.MD5 AND r1.LibraryId=@libraryid AND r2.LibraryId=@libraryid;";
+            string duplicateSql = "DELETE r1 FROM Games_Roms r1 INNER JOIN Games_Roms r2 WHERE r1.Id > r2.Id AND r1.MD5 = r2.MD5;";
-            Dictionary<string, object> dupDict = new Dictionary<string, object>();
+            db.ExecuteCMD(duplicateSql);
-            dupDict.Add("libraryid", library.Id);
-            db.ExecuteCMD(duplicateSql, dupDict);
 
-            string sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
+            string sql = "SELECT * FROM Games_Roms ORDER BY `name`";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            DataTable dtRoms = db.ExecuteCMD(sql);
-            dbDict.Add("libraryid", library.Id);
-            DataTable dtRoms = db.ExecuteCMD(sql, dbDict);
 
             // clean out database entries in the import folder
             if (dtRoms.Rows.Count > 0)
@@ -585,28 +589,25 @@ namespace gaseous_server.Classes
                     long romId = (long)dtRoms.Rows[i]["Id"];
                     string romPath = (string)dtRoms.Rows[i]["Path"];
 
-                    if (!romPath.StartsWith(library.Path))
+                    if (!romPath.StartsWith(Config.LibraryConfiguration.LibraryDataDirectory))
                     {
                         Logging.Log(Logging.LogType.Information, "Library Scan", " Deleting database entry for files with incorrect directory " + romPath);
-                        string deleteSql = "DELETE FROM Games_Roms WHERE Id=@id AND LibraryId=@libraryid";
+                        string deleteSql = "DELETE FROM Games_Roms WHERE Id=@id";
                         Dictionary<string, object> deleteDict = new Dictionary<string, object>();
                         deleteDict.Add("Id", romId);
-                        deleteDict.Add("libraryid", library.Id);
                         db.ExecuteCMD(deleteSql, deleteDict);
                     }
                 }
             }
 
-            sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
+            sql = "SELECT * FROM Games_Roms ORDER BY `name`";
-            dtRoms = db.ExecuteCMD(sql, dbDict);
+            dtRoms = db.ExecuteCMD(sql);
 
             // 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);
+            string[] LibraryFiles = Directory.GetFiles(Config.LibraryConfiguration.LibraryDataDirectory, "*.*", 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);
@@ -629,176 +630,95 @@ namespace gaseous_server.Classes
                     if (romFound == false)
                     {
                         // file is not in database - process it
-                        Logging.Log(Logging.LogType.Information, "Library Scan", "Orphaned file found in library: " + LibraryFile);
-                        
                         Common.hashObject hash = new Common.hashObject(LibraryFile);
                         FileInfo fi = new FileInfo(LibraryFile);
 
-                        FileSignature fileSignature = new FileSignature();
+                        Models.Signatures_Games sig = GetFileSignature(hash, fi, LibraryFile);
-                        gaseous_server.Models.Signatures_Games sig = fileSignature.GetFileSignature(library, hash, fi, LibraryFile);
+
+                        Logging.Log(Logging.LogType.Information, "Library Scan", " Orphaned file found in library: " + LibraryFile);
 
-                        try
-                        {
                         // get discovered platform
-                            long PlatformId;
+                        IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(sig.Flags.IGDBPlatformId);
-                            IGDB.Models.Platform determinedPlatform;
+                        if (determinedPlatform == null)
-                            
-                            if (sig.Flags.IGDBPlatformId == null || sig.Flags.IGDBPlatformId == 0 )
                         {
-                                // no platform discovered in the signature
+                            determinedPlatform = new IGDB.Models.Platform();
-                                PlatformId = library.DefaultPlatformId;
                         }
-                            else
-                            {
-                                // use the platform discovered in the signature
-                                PlatformId = sig.Flags.IGDBPlatformId;
-                            }
-                            determinedPlatform = Platforms.GetPlatform(PlatformId);
 
-                            IGDB.Models.Game determinedGame = SearchForGame(sig, PlatformId, true);
+                        IGDB.Models.Game determinedGame = SearchForGame(sig.Game.Name, sig.Flags.IGDBPlatformId);
 
-                            StoreROM(library, hash, determinedGame, determinedPlatform, sig, LibraryFile);
+                        StoreROM(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`";
+            sql = "SELECT * FROM Games_Roms ORDER BY `name`";
-            dtRoms = db.ExecuteCMD(sql, dbDict);
+            dtRoms = db.ExecuteCMD(sql);
 
             // 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++)
                 {
                     long romId = (long)dtRoms.Rows[i]["Id"];
                     string romPath = (string)dtRoms.Rows[i]["Path"];
-                    gaseous_server.Models.Signatures_Games.RomItem.SignatureSourceType romMetadataSource = (gaseous_server.Models.Signatures_Games.RomItem.SignatureSourceType)(int)dtRoms.Rows[i]["MetadataSource"];
+                    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))
                     {
-                        if (library.IsDefaultLibrary == true)
+                        // file exists, so lets check to make sure the signature was matched, and update if a signature can be found
+                        if (
+                            romMetadataSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None ||
+                            (int)dtRoms.Rows[i]["MetadataVersion"] == 1
+                        )
                         {
+                            Common.hashObject hash = new Common.hashObject
+                            {
+                                md5hash = (string)dtRoms.Rows[i]["MD5"],
+                                sha1hash = (string)dtRoms.Rows[i]["SHA1"]
+                            };
+                            FileInfo fi = new FileInfo(romPath);
+
+                            Models.Signatures_Games sig = GetFileSignature(hash, fi, romPath);
+                            if (sig.Rom.SignatureSource != gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None)
+                            {
+                                Logging.Log(Logging.LogType.Information, "Library Scan", " Update signature found for " + romPath);
+
+                                // get discovered platform
+                                IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(sig.Flags.IGDBPlatformId);
+                                if (determinedPlatform == null)
+                                {
+                                    determinedPlatform = new IGDB.Models.Platform();
+                                }
+
+                                IGDB.Models.Game determinedGame = SearchForGame(sig.Game.Name, sig.Flags.IGDBPlatformId);
+
+                                StoreROM(hash, determinedGame, determinedPlatform, sig, romPath, romId);
+                            }
+                        }
+
                         if (romPath != ComputeROMPath(romId))
                         {
-                                Logging.Log(Logging.LogType.Information, "Library Scan", "ROM at path " + romPath + " found, but needs to be moved");
                             MoveGameFile(romId);
                         }
-                            else
-                            {
-                                Logging.Log(Logging.LogType.Information, "Library Scan", "ROM at path " + romPath + " found");
-                            }
-                        }
                     }
                     else
                     {
                         // file doesn't exist where it's supposed to be! delete it from the db
                         Logging.Log(Logging.LogType.Warning, "Library Scan", " Deleting orphaned database entry for " + romPath);
 
-                        string deleteSql = "DELETE FROM Games_Roms WHERE Id = @id AND LibraryId = @libraryid";
+                        string deleteSql = "DELETE FROM Games_Roms WHERE Id = @id";
                         Dictionary<string, object> deleteDict = new Dictionary<string, object>();
                         deleteDict.Add("id", romId);
-                        deleteDict.Add("libraryid", library.Id);
                         db.ExecuteCMD(deleteSql, deleteDict);
                     }
-
-                    StatusCount += 1;
                 }
             }
 
             Logging.Log(Logging.LogType.Information, "Library Scan", "Library scan completed");
         }
-
-        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");
-
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-
-            foreach (GameLibrary.LibraryItem library in GameLibrary.GetLibraries)
-            {
-                Logging.Log(Logging.LogType.Information, "Rematch Scan", "Rematch on library " + library.Name);
-
-                string sql = "";
-                if (ForceExecute == false)
-                {
-                    sql = "SELECT * FROM Games_Roms WHERE (PlatformId = 0 AND GameId <> 0) OR (((PlatformId = 0 OR GameId = 0) AND MetadataSource = 0) OR (PlatformId = 0 AND GameId = 0)) AND (LastMatchAttemptDate IS NULL OR LastMatchAttemptDate < @lastmatchattemptdate) AND LibraryId = @libraryid LIMIT 100;";
-                }
-                else
-                {
-                    sql = "SELECT * FROM Games_Roms WHERE (PlatformId = 0 AND GameId <> 0) OR (((PlatformId = 0 OR GameId = 0) AND MetadataSource = 0) OR (PlatformId = 0 AND GameId = 0)) AND LibraryId = @libraryid;";
-                }
-                Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                dbDict.Add("lastmatchattemptdate", DateTime.UtcNow.AddDays(-7));
-                dbDict.Add("libraryid", library.Id);
-                DataTable data = db.ExecuteCMD(sql, dbDict);
-                int StatusCount = -0;
-                foreach (DataRow row in data.Rows)
-                {
-                    SetStatus(StatusCount, data.Rows.Count, "Running rematcher");
-
-                    // get rom info
-                    long romId = (long)row["Id"];
-                    string romPath = (string)row["Path"];
-                    Common.hashObject hash = new Common.hashObject
-                    {
-                        md5hash = (string)row["MD5"],
-                        sha1hash = (string)row["SHA1"]
-                    };
-                    FileInfo fi = new FileInfo(romPath);
-
-                    Logging.Log(Logging.LogType.Information, "Rematch Scan", "Running rematch against " + romPath);
-
-                    // determine rom signature
-                    FileSignature fileSignature = new FileSignature();
-                    gaseous_server.Models.Signatures_Games sig = fileSignature.GetFileSignature(library, hash, fi, romPath);
-
-                    // get discovered platform
-                    long PlatformId;
-                    IGDB.Models.Platform determinedPlatform;
-                    
-                    if (sig.Flags.IGDBPlatformId == null || sig.Flags.IGDBPlatformId == 0 )
-                    {
-                        // no platform discovered in the signature
-                        PlatformId = library.DefaultPlatformId;
-                    }
-                    else
-                    {
-                        // use the platform discovered in the signature
-                        PlatformId = sig.Flags.IGDBPlatformId;
-                    }
-                    determinedPlatform = Platforms.GetPlatform(PlatformId);
-
-                    IGDB.Models.Game determinedGame = SearchForGame(sig, PlatformId, true);
-
-                    StoreROM(library, hash, determinedGame, determinedPlatform, sig, romPath, romId);
-
-                    string attemptSql = "UPDATE Games_Roms SET LastMatchAttemptDate=@lastmatchattemptdate WHERE Id=@id;";
-                    Dictionary<string, object> dbLastAttemptDict = new Dictionary<string, object>();
-                    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

@@ -1,364 +0,0 @@
-using System;
-using System.Data;
-using System.Diagnostics;
-using System.Reflection;
-using System.Reflection.Metadata.Ecma335;
-namespace gaseous_server.Classes
-{
-	public class Logging
-	{
-        private static DateTime lastDiskRetentionSweep = DateTime.UtcNow;
-        public static bool WriteToDiskOnly { get; set; } = false;
-
-        static public void Log(LogType EventType, string ServerProcess, string Message, Exception? ExceptionValue = null, bool LogToDiskOnly = false)
-        {
-            LogItem logItem = new LogItem
-            {
-                EventTime = DateTime.UtcNow,
-                EventType = EventType,
-                Process = ServerProcess,
-                Message = Message,
-                ExceptionValue = Common.ReturnValueIfNull(ExceptionValue, "").ToString()
-            };
-
-            bool AllowWrite = false;
-            if (EventType == LogType.Debug)
-            {
-                if (Config.LoggingConfiguration.DebugLogging == true)
-                {
-                    AllowWrite = true;
-                }
-            }
-            else
-            {
-                AllowWrite = true;
-            }
-
-            if (AllowWrite == true)
-            {
-                // console output
-                string TraceOutput = logItem.EventTime.ToString("yyyyMMdd HHmmss") + ": " + logItem.EventType.ToString() + ": " + logItem.Process + ": " + logItem.Message;
-                if (logItem.ExceptionValue != null)
-                {
-                    TraceOutput += Environment.NewLine + logItem.ExceptionValue.ToString();
-                }
-                switch(logItem.EventType) {
-                    case LogType.Information:
-                        Console.ForegroundColor = ConsoleColor.Blue;
-                        break;
-
-                    case LogType.Warning:
-                        Console.ForegroundColor = ConsoleColor.Yellow;
-                        break;
-
-                    case LogType.Critical:
-                        Console.ForegroundColor = ConsoleColor.Red;
-                        break;
-
-                    case LogType.Debug:
-                        Console.ForegroundColor = ConsoleColor.Magenta;
-                        break;
-
-                }
-                Console.WriteLine(TraceOutput);
-                Console.ResetColor();
-
-                if (WriteToDiskOnly == true)
-                {
-                    LogToDiskOnly = true;
-                }
-
-                if (LogToDiskOnly == false)
-                {
-                    if (Config.LoggingConfiguration.AlwaysLogToDisk == true)
-                    {
-                        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 = "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("EventTime", logItem.EventTime);
-                    dbDict.Add("EventType", logItem.EventType);
-                    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
-                    {
-                        db.ExecuteCMD(sql, dbDict);
-                    }
-                    catch (Exception ex)
-                    {   
-                        LogToDisk(logItem, TraceOutput, ex);
-                    }
-                }
-                else
-                {
-                    LogToDisk(logItem, TraceOutput, null);
-                }
-            }
-
-            if (lastDiskRetentionSweep.AddMinutes(60) < DateTime.UtcNow)
-            {
-                // time to delete any old logs
-                lastDiskRetentionSweep = DateTime.UtcNow;
-                string[] files = Directory.GetFiles(Config.LogPath);
-
-                foreach (string file in files)
-                {
-                    FileInfo fi = new FileInfo(file);
-                    if (fi.LastAccessTime < DateTime.Now.AddDays(Config.LoggingConfiguration.LogRetention * -1)) 
-                    { 
-                        fi.Delete(); 
-                    }
-                }
-            }
-        }
-
-        static void LogToDisk(LogItem logItem, string TraceOutput, Exception? exception)
-        {
-            if (exception != null)
-            {
-                // dump the error
-                File.AppendAllText(Config.LogFilePath, logItem.EventTime.ToString("yyyyMMdd HHmmss") + ": " + logItem.EventType.ToString() + ": " + logItem.Process + ": " + logItem.Message + Environment.NewLine + exception.ToString());
-            
-
-                // something went wrong writing to the db
-                File.AppendAllText(Config.LogFilePath, logItem.EventTime.ToString("yyyyMMdd HHmmss") + ": The following event was unable to be written to the log database:");
-            }
-
-            File.AppendAllText(Config.LogFilePath, TraceOutput);
-        }
-
-        static public List<LogItem> GetLogs(LogsViewModel model) 
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("StartIndex", model.StartIndex);
-            dbDict.Add("PageNumber", (model.PageNumber - 1) * model.PageSize);
-            dbDict.Add("PageSize", model.PageSize);
-            string sql = "";
-
-            List<string> whereClauses = new List<string>();
-
-            // handle status criteria
-            if (model.Status != null)
-            {
-                if (model.Status.Count > 0)
-                {
-                    List<string> statusWhere = new List<string>();
-                    for (int i = 0; i < model.Status.Count; i++)
-                    {
-                        string valueName = "@eventtype" + i;
-                        statusWhere.Add(valueName);
-                        dbDict.Add(valueName, (int)model.Status[i]);
-                    }
-
-                    whereClauses.Add("EventType IN (" + string.Join(",", statusWhere) + ")");
-                }
-            }
-
-            // handle start date criteria
-            if (model.StartDateTime != null)
-            {
-                dbDict.Add("startdate", model.StartDateTime);
-                whereClauses.Add("EventTime >= @startdate");
-            }
-
-            // handle end date criteria
-            if (model.EndDateTime != null)
-            {
-                dbDict.Add("enddate", model.EndDateTime);
-                whereClauses.Add("EventTime <= @enddate");
-            }
-
-            // handle search text criteria
-            if (model.SearchText != null)
-            {
-                if (model.SearchText.Length > 0)
-                {
-                    dbDict.Add("messageSearch", model.SearchText);
-                    whereClauses.Add("MATCH(Message) AGAINST (@messageSearch)");
-                }
-            }
-
-            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)
-            {
-                whereClause = "(" + String.Join(" AND ", whereClauses) + ")";
-            }
-
-            // execute query
-            if (model.StartIndex == null)
-            {
-                if (whereClause.Length > 0)
-                {
-                    whereClause = "WHERE " + whereClause;
-                }
-                
-                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
-            {
-                if (whereClause.Length > 0)
-                {
-                    whereClause = "AND " + whereClause;
-                }
-                
-                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);
-
-            List<LogItem> logs = new List<LogItem>();
-            foreach (DataRow row in dataTable.Rows)
-            {
-                LogItem log = new LogItem
-                {
-                    Id = (long)row["Id"],
-                    EventTime = DateTime.Parse(((DateTime)row["EventTime"]).ToString("yyyy-MM-ddThh:mm:ss") + 'Z'),
-                    EventType = (LogType)row["EventType"],
-                    Process = (string)row["Process"],
-                    Message = (string)row["Message"],
-                    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);
-            }
-
-            return logs;
-        }
-
-        public enum LogType
-        {
-            Information = 0,
-            Debug = 1,
-            Warning = 2,
-            Critical = 3
-        }
-
-        public class LogItem
-        {
-            public long Id { get; set; }
-            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
-            {
-                get
-                {
-                    return _Message;
-                }
-                set
-                {
-                    _Message = value;
-                }
-            }
-            public string? ExceptionValue { get; set; }
-        }
-
-        public class LogsViewModel
-        {
-            public long? StartIndex { get; set; }
-            public int PageNumber { get; set; } = 1;
-            public int PageSize { get; set; } = 100;
-            public List<LogType> Status { get; set; } = new List<LogType>();
-            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

@@ -1,99 +0,0 @@
-using System;
-using System.Data;
-using gaseous_server.Models;
-using Microsoft.VisualStudio.Web.CodeGeneration;
-
-namespace gaseous_server.Classes
-{
-	public class Maintenance : QueueItemStatus
-    {
-        const int MaxFileAge = 30;
-
-        public void RunMaintenance()
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-
-            // remove any entries from the library that have an invalid id
-            string LibraryWhereClause = "";
-            foreach (GameLibrary.LibraryItem library in GameLibrary.GetLibraries)
-            {
-                if (LibraryWhereClause.Length > 0)
-                {
-                    LibraryWhereClause += ", ";
-                }
-                LibraryWhereClause += library.Id;
-            }
-            string sqlLibraryWhereClause = "";
-            if (LibraryWhereClause.Length > 0)
-            {
-                sqlLibraryWhereClause = "DELETE FROM Games_Roms WHERE LibraryId NOT IN ( " + LibraryWhereClause + " );";
-                db.ExecuteCMD(sqlLibraryWhereClause);
-            }
-
-            // delete old logs
-            sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate;";
-            dbDict.Add("EventRententionDate", DateTime.UtcNow.AddDays(Config.LoggingConfiguration.LogRetention * -1));
-            db.ExecuteCMD(sql, dbDict);
-
-            // delete files and directories older than 7 days in PathsToClean
-            List<string> PathsToClean = new List<string>();
-            PathsToClean.Add(Config.LibraryConfiguration.LibraryUploadDirectory);
-            PathsToClean.Add(Config.LibraryConfiguration.LibraryTempDirectory);
-
-            foreach (string PathToClean in PathsToClean)
-            {
-                Logging.Log(Logging.LogType.Information, "Maintenance", "Removing files older than " + MaxFileAge + " days from " + PathToClean);
-
-                // get content
-                // files first
-                foreach (string filePath in Directory.GetFiles(PathToClean))
-                {
-                    FileInfo fileInfo = new FileInfo(filePath);
-                    if (fileInfo.LastWriteTimeUtc.AddDays(MaxFileAge) < DateTime.UtcNow)
-                    {
-                        Logging.Log(Logging.LogType.Warning, "Maintenance", "Deleting file " + filePath);
-                        File.Delete(filePath);
-                    }
-                }
-
-                // now directories
-                foreach (string dirPath in Directory.GetDirectories(PathToClean))
-                {
-                    DirectoryInfo directoryInfo = new DirectoryInfo(dirPath);
-                    if (directoryInfo.LastWriteTimeUtc.AddDays(MaxFileAge) < DateTime.UtcNow)
-                    {
-                        Logging.Log(Logging.LogType.Warning, "Maintenance", "Deleting directory " + directoryInfo);
-                        Directory.Delete(dirPath, true);
-                    }
-                }
-            }
-
-            Logging.Log(Logging.LogType.Information, "Maintenance", "Optimising database tables");
-            sql = "SHOW FULL TABLES WHERE Table_Type = 'BASE TABLE';";
-            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)
-                {
-                    string retVal = "";
-                    for (int i = 0; i < responseRow.ItemArray.Length; i++)
-                    {
-                        retVal += responseRow.ItemArray[i] + "; ";
-                    }
-                    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

@@ -1,304 +0,0 @@
-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

@@ -1,9 +1,10 @@
 using System;
 using System.Reflection;
-using System.Text.Json.Serialization;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using Microsoft.CodeAnalysis.Classification;
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -15,6 +16,12 @@ 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))
@@ -77,7 +84,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<AgeRating>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -111,8 +118,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AgeRating> GetObjectFromServer(string WhereClause)
         {
             // get AgeRatings metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<AgeRating>(IGDBClient.Endpoints.AgeRating, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<AgeRating>(IGDBClient.Endpoints.AgeRating, fieldList, WhereClause);
             var result = results.First();
 
             return result;
@@ -148,44 +154,6 @@ namespace gaseous_server.Classes.Metadata
             public AgeRatingTitle RatingTitle { get; set; }
             public string[] Descriptions { get; set; }
         }
-
-        public static void PopulateAgeMap()
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "DELETE FROM ClassificationMap;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            db.ExecuteNonQuery(sql);
-
-            // loop all age groups
-            foreach(KeyValuePair<AgeGroups.AgeRestrictionGroupings, AgeGroups.AgeGroupItem> ageGrouping in AgeGroups.AgeGroupingsFlat)
-            {
-                AgeGroups.AgeGroupItem ageGroupItem = ageGrouping.Value;
-                var properties = ageGroupItem.GetType().GetProperties();
-                foreach (var prop in properties)
-                {
-                    if (prop.GetGetMethod() != null)
-                    {
-                        List<string> AgeRatingCategories = new List<string>(Enum.GetNames(typeof(AgeRatingCategory)));
-                        if (AgeRatingCategories.Contains(prop.Name))
-                        {
-                            AgeRatingCategory ageRatingCategory = (AgeRatingCategory)Enum.Parse(typeof(AgeRatingCategory), prop.Name);
-                            List<AgeRatingTitle> ageRatingTitles = (List<AgeRatingTitle>)prop.GetValue(ageGroupItem);
-                            
-                            foreach (AgeRatingTitle ageRatingTitle in ageRatingTitles)
-                            {
-                                dbDict.Clear();
-                                dbDict.Add("AgeGroupId", ageGrouping.Key);
-                                dbDict.Add("ClassificationBoardId", ageRatingCategory);
-                                dbDict.Add("RatingId", ageRatingTitle);
-
-                                sql = "INSERT INTO ClassificationMap (AgeGroupId, ClassificationBoardId, RatingId) VALUES (@AgeGroupId, @ClassificationBoardId, @RatingId);";
-                                db.ExecuteCMD(sql, dbDict);
-                            }
-                        }
-                    }
-                }
-            }
-        }
 	}
 }
 

gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<AgeRatingContentDescription>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AgeRatingContentDescription> GetObjectFromServer(string WhereClause)
         {
             // get AgeRatingContentDescriptionContentDescriptions metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<AgeRatingContentDescription>(IGDBClient.Endpoints.AgeRatingContentDescriptions, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<AgeRatingContentDescription>(IGDBClient.Endpoints.AgeRatingContentDescriptions, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/AlternativeNames.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<AlternativeName>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<AlternativeName> GetObjectFromServer(string WhereClause)
         {
             // get AlternativeNames metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<AlternativeName>(IGDBClient.Endpoints.AlternativeNames, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<AlternativeName>(IGDBClient.Endpoints.AlternativeNames, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Artworks.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,7 +15,13 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        public static Artwork? GetArtwork(long? Id, string ImagePath, bool GetImages)
+        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))
             {
@@ -21,18 +29,18 @@ namespace gaseous_server.Classes.Metadata
             }
             else
             {
-                Task<Artwork> RetVal = _GetArtwork(SearchUsing.id, Id, ImagePath, GetImages);
+                Task<Artwork> RetVal = _GetArtwork(SearchUsing.id, Id, LogoPath);
                 return RetVal.Result;
             }
         }
 
-        public static Artwork GetArtwork(string Slug, string ImagePath, bool GetImages)
+        public static Artwork GetArtwork(string Slug, string LogoPath)
         {
-            Task<Artwork> RetVal = _GetArtwork(SearchUsing.slug, Slug, ImagePath, GetImages);
+            Task<Artwork> RetVal = _GetArtwork(SearchUsing.slug, Slug, LogoPath);
             return RetVal.Result;
         }
 
-        private static async Task<Artwork> _GetArtwork(SearchUsing searchUsing, object searchValue, string ImagePath, bool GetImages = true)
+        private static async Task<Artwork> _GetArtwork(SearchUsing searchUsing, object searchValue, string LogoPath)
         {
             // check database first
             Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
@@ -61,24 +69,23 @@ namespace gaseous_server.Classes.Metadata
 
             Artwork returnValue = new Artwork();
             bool forceImageDownload = false;
-            ImagePath = Path.Combine(ImagePath, "Artwork");
+            LogoPath = Path.Combine(LogoPath, "Artwork");
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
-                    returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                     Storage.NewCacheValue(returnValue);
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
                     try
                     {
-                        returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                         Storage.NewCacheValue(returnValue, true);
-                        forceImageDownload = true;
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Artwork>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -89,17 +96,11 @@ namespace gaseous_server.Classes.Metadata
                     throw new Exception("How did you get here?");
             }
 
-            // check for presence of "original" quality file - download if absent or force download is true
+            if ((!File.Exists(Path.Combine(LogoPath, returnValue.ImageId + ".jpg"))) || forceImageDownload == true)
-            string localFile = Path.Combine(ImagePath, Communications.IGDBAPI_ImageSize.original.ToString(), returnValue.ImageId + ".jpg");
-            if (GetImages == true)
             {
-                if ((!File.Exists(localFile)) || forceImageDownload == true)
+                //GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_thumb, returnValue.ImageId);
-                {
+                //GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_logo_med, returnValue.ImageId);
-                    Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Artwork download forced.");
+                GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_original, returnValue.ImageId);
-
-                    Communications comms = new Communications();
-                    comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
-                }
             }
 
             return returnValue;
@@ -111,15 +112,64 @@ namespace gaseous_server.Classes.Metadata
             slug
         }
 
-        private static async Task<Artwork> GetObjectFromServer(string WhereClause, string ImagePath)
+        private static async Task<Artwork> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get Artwork metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Artwork>(IGDBClient.Endpoints.Artworks, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<Artwork>(IGDBClient.Endpoints.Artworks, fieldList, WhereClause);
             var result = results.First();
 
+            //GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb, result.ImageId);
+            //GetImageFromServer(result.Url, LogoPath, LogoSize.t_logo_med, result.ImageId);
+            GetImageFromServer(result.Url, LogoPath, LogoSize.t_original, result.ImageId);
+
             return result;
         }
+
+        private static void GetImageFromServer(string Url, string LogoPath, LogoSize logoSize, string ImageId)
+        {
+            using (var client = new HttpClient())
+            {
+                string fileName = "Artwork.jpg";
+                string extension = "jpg";
+                switch (logoSize)
+                {
+                    case LogoSize.t_thumb:
+                        fileName = "_Thumb";
+                        extension = "jpg";
+                        break;
+                    case LogoSize.t_logo_med:
+                        fileName = "_Medium";
+                        extension = "png";
+                        break;
+                    case LogoSize.t_original:
+                        fileName = "";
+                        extension = "png";
+                        break;
+                    default:
+                        fileName = "Artwork";
+                        extension = "jpg";
+                        break;
+                }
+                fileName = ImageId + fileName;
+                string imageUrl = Url.Replace(LogoSize.t_thumb.ToString(), logoSize.ToString()).Replace("jpg", extension);
+
+                using (var s = client.GetStreamAsync("https:" + imageUrl))
+                {
+                    if (!Directory.Exists(LogoPath)) { Directory.CreateDirectory(LogoPath); }
+                    using (var fs = new FileStream(Path.Combine(LogoPath, fileName + "." + extension), FileMode.OpenOrCreate))
+                    {
+                        s.Result.CopyTo(fs);
+                    }
+                }
+            }
+        }
+
+        private enum LogoSize
+        {
+            t_thumb,
+            t_logo_med,
+            t_original
+        }
 	}
 }
 

gaseous-server/Classes/Metadata/Collections.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Collection>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Collection> GetObjectFromServer(string WhereClause)
         {
             // get Collections metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Collection>(IGDBClient.Endpoints.Collections, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<Collection>(IGDBClient.Endpoints.Collections, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Communications.cs

@@ -1,577 +0,0 @@
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Net;
-using Humanizer;
-using IGDB;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using RestEase;
-
-namespace gaseous_server.Classes.Metadata
-{
-    /// <summary>
-    /// Handles all metadata API communications
-    /// </summary>
-    public class Communications
-    {
-        static Communications()
-        {
-            var handler = new HttpClientHandler();
-            handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-            client = new HttpClient(handler);
-
-            client.DefaultRequestHeaders.Add("Accept-Encoding", "gzip");
-            client.DefaultRequestHeaders.Add("Accept-Encoding", "deflate");
-        }
-
-        private static IGDBClient igdb = new IGDBClient(
-                    // Found in Twitch Developer portal for your app
-                    Config.IGDB.ClientId,
-                    Config.IGDB.Secret
-                );
-
-        private static HttpClient client = new HttpClient();
-
-        /// <summary>
-        /// Configure metadata API communications
-        /// </summary>
-        public static HasheousClient.Models.MetadataModel.MetadataSources MetadataSource
-        {
-            get
-            {
-                return _MetadataSource;
-            }
-            set
-            {
-                _MetadataSource = value;
-
-                switch (value)
-                {
-                    case HasheousClient.Models.MetadataModel.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 HasheousClient.Models.MetadataModel.MetadataSources _MetadataSource = HasheousClient.Models.MetadataModel.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>
-        /// 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 HasheousClient.Models.MetadataModel.MetadataSources.None:
-                    return null;
-                case HasheousClient.Models.MetadataModel.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;
-            }
-        }
-
-        /// <summary>
-        /// Download from the specified uri
-        /// </summary>
-        /// <param name="uri">The uri to download from</param>
-        /// <param name="DestinationFile">The file name and path the download should be stored as</param>
-        public Task<bool?> DownloadFile(Uri uri, string DestinationFile)
-        {
-            var result = _DownloadFile(uri, DestinationFile);
-            
-            return result;
-        }
-
-        private async Task<bool?> _DownloadFile(Uri uri, string DestinationFile)
-        {
-            string DestinationDirectory = new FileInfo(DestinationFile).Directory.FullName;
-            if (!Directory.Exists(DestinationDirectory))
-            {
-                Directory.CreateDirectory(DestinationDirectory);
-            }
-
-            Logging.Log(Logging.LogType.Information, "Communications", "Downloading from " + uri.ToString() + " to " + DestinationFile);
-
-            try
-            {
-                using (HttpResponseMessage response = client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).Result)
-                {
-                    response.EnsureSuccessStatusCode();
-
-                    using (Stream contentStream = await response.Content.ReadAsStreamAsync(), fileStream = new FileStream(DestinationFile, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true))
-                    {
-                        var totalRead = 0L;
-                        var totalReads = 0L;
-                        var buffer = new byte[8192];
-                        var isMoreToRead = true;
-
-                        do
-                        {
-                            var read = await contentStream.ReadAsync(buffer, 0, buffer.Length);
-                            if (read == 0)
-                            {
-                                isMoreToRead = false;
-                            }
-                            else
-                            {
-                                await fileStream.WriteAsync(buffer, 0, read);
-
-                                totalRead += read;
-                                totalReads += 1;
-
-                                if (totalReads % 2000 == 0)
-                                {
-                                    Console.WriteLine(string.Format("total bytes downloaded so far: {0:n0}", totalRead));
-                                }
-                            }
-                        }
-                        while (isMoreToRead);
-                    }
-                }
-
-                return true;
-            }
-            catch (HttpRequestException ex)
-            {
-                if (ex.StatusCode == HttpStatusCode.NotFound)
-                {
-                    if (File.Exists(DestinationFile))
-                    {
-                        FileInfo fi = new FileInfo(DestinationFile);
-                        if (fi.Length == 0)
-                        {
-                            File.Delete(DestinationFile);
-                        }
-                    }
-                }
-
-                Logging.Log(Logging.LogType.Warning, "Download Images", "Error downloading file: ", ex);
-            }
-
-            return false;
-        }
-
-        public async Task<string> GetSpecificImageFromServer(string ImagePath, string ImageId, IGDBAPI_ImageSize size, List<IGDBAPI_ImageSize>? FallbackSizes = null)
-        {
-            string returnPath = "";
-
-            // check for artificial sizes first
-            switch (size)
-            {
-                case IGDBAPI_ImageSize.screenshot_small:
-                case IGDBAPI_ImageSize.screenshot_thumb:
-                    string BasePath = Path.Combine(ImagePath, size.ToString());
-                    if (!Directory.Exists(BasePath))
-                    {
-                        Directory.CreateDirectory(BasePath);
-                    }
-                    returnPath = Path.Combine(BasePath, ImageId + ".jpg");
-                    if (!File.Exists(returnPath))
-                    {
-                        // get original size image and resize
-                        string originalSizePath = await GetSpecificImageFromServer(ImagePath, ImageId, IGDBAPI_ImageSize.original, null);
-
-                        int width = 0;
-                        int height = 0;
-                        
-                        switch (size)
-                        {
-                            case IGDBAPI_ImageSize.screenshot_small:
-                                // 235x128
-                                width = 235;
-                                height = 128;
-                                break;
-                            
-                            case IGDBAPI_ImageSize.screenshot_thumb:
-                                // 165x90
-                                width = 165;
-                                height = 90;
-                                break;
-
-                        }
-
-                        using (var image = new ImageMagick.MagickImage(originalSizePath))
-                        {
-                            image.Resize(width, height);
-                            image.Strip();
-                            image.Write(returnPath);
-                        }
-                    }
-
-                    break;
-
-                default:
-                    // these sizes are IGDB native
-                    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);
-                    }
-
-                    if (InRateLimitAvoidanceMode == true)
-                    {
-                        // sleep for a moment to help avoid hitting the rate limiter
-                        Thread.Sleep(RateLimitAvoidanceWait);
-                    }
-
-                    Communications comms = new Communications();
-                    List<IGDBAPI_ImageSize> imageSizes = new List<IGDBAPI_ImageSize>
-                    {
-                        size
-                    };
-
-                    // get the image
-                    try
-                    {
-                        returnPath = Path.Combine(ImagePath, size.ToString(), ImageId + ".jpg");
-
-                        // fail early if the file is already downloaded
-                        if (!File.Exists(returnPath))
-                        {
-                            await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
-                        }
-                        
-                    }
-                    catch (HttpRequestException ex)
-                    {
-                        if (ex.StatusCode == HttpStatusCode.NotFound)
-                        {
-                            Logging.Log(Logging.LogType.Information, "Image Download", "Image not found, trying a different size.");
-
-                            if (FallbackSizes != null)
-                            {
-                                foreach (Communications.IGDBAPI_ImageSize imageSize in FallbackSizes)
-                                {
-                                    returnPath = await GetSpecificImageFromServer(ImagePath, ImageId, imageSize, null);
-                                }
-                            }
-                        }
-                    }
-
-                    // increment rate limiter avoidance call count
-                    RateLimitAvoidanceCallCount += 1;
-
-                    break;
-            }
-
-            return returnPath;
-        }
-
-        public static T? GetSearchCache<T>(string SearchFields, string SearchString)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM SearchCache WHERE SearchFields = @searchfields AND SearchString = @searchstring;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>
-            {
-                { "searchfields", SearchFields },
-                { "searchstring", SearchString }
-            };
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-            if (data.Rows.Count > 0)
-            {
-                // cache hit
-                string rawString = data.Rows[0]["Content"].ToString();
-                T ReturnValue = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(rawString);
-                if (ReturnValue != null)
-                {
-                    Logging.Log(Logging.LogType.Information, "Search Cache", "Found search result in cache. Search string: " + SearchString);
-                    return ReturnValue;
-                }
-                else
-                {
-                    Logging.Log(Logging.LogType.Information, "Search Cache", "Search result not found in cache.");
-                    return default;
-                }
-            }
-            else
-            {
-                // cache miss
-                Logging.Log(Logging.LogType.Information, "Search Cache", "Search result not found in cache.");
-                return default;
-            }
-        }
-
-        public static void SetSearchCache<T>(string SearchFields, string SearchString, T SearchResult)
-        {
-            Logging.Log(Logging.LogType.Information, "Search Cache", "Storing search results in cache. Search string: " + SearchString);
-
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "INSERT INTO SearchCache (SearchFields, SearchString, Content, LastSearch) VALUES (@searchfields, @searchstring, @content, @lastsearch);";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>
-            {
-                { "searchfields", SearchFields },
-                { "searchstring", SearchString },
-                { "content", Newtonsoft.Json.JsonConvert.SerializeObject(SearchResult) },
-                { "lastsearch", DateTime.UtcNow }
-            };
-            db.ExecuteNonQuery(sql, dbDict);
-        }
-
-        /// <summary>
-        /// See https://api-docs.igdb.com/?javascript#images for more information about the image url structure
-        /// </summary>
-        /// <param name="ImageId"></param>
-        /// <param name="outputPath">The path to save the downloaded files to
-        public async Task IGDBAPI_GetImage(List<IGDBAPI_ImageSize> ImageSizes, string ImageId, string OutputPath)
-        {
-            string urlTemplate = "https://images.igdb.com/igdb/image/upload/t_{size}/{hash}.jpg";
-            
-            foreach (IGDBAPI_ImageSize ImageSize in ImageSizes)
-            {
-                string url = urlTemplate.Replace("{size}", Common.GetDescription(ImageSize)).Replace("{hash}", ImageId);
-                string newOutputPath = Path.Combine(OutputPath, Common.GetDescription(ImageSize));
-                string OutputFile = ImageId + ".jpg";
-                string fullPath = Path.Combine(newOutputPath, OutputFile);
-                
-                await _DownloadFile(new Uri(url), fullPath);
-            }
-        }
-
-        public enum IGDBAPI_ImageSize
-        {
-            /// <summary>
-            /// 90x128 Fit
-            /// </summary>
-            [Description("cover_small")]
-            cover_small,
-
-            /// <summary>
-            /// 264x374 Fit
-            /// </summary>
-            [Description("cover_big")]
-            cover_big,
-
-            /// <summary>
-            /// 165x90 Lfill, Centre gravity - resized by Gaseous and is not a real IGDB size
-            /// </summary>
-            [Description("screenshot_thumb")]
-            screenshot_thumb,
-
-            /// <summary>
-            /// 235x128 Lfill, Centre gravity - resized by Gaseous and is not a real IGDB size
-            /// </summary>
-            [Description("screenshot_small")]
-            screenshot_small,
-
-            /// <summary>
-            /// 589x320 Lfill, Centre gravity
-            /// </summary>
-            [Description("screenshot_med")]
-            screenshot_med,
-
-            /// <summary>
-            /// 889x500 Lfill, Centre gravity
-            /// </summary>
-            [Description("screenshot_big")]
-            screenshot_big,
-
-            /// <summary>
-            /// 1280x720 Lfill, Centre gravity
-            /// </summary>
-            [Description("screenshot_huge")]
-            screenshot_huge,
-
-            /// <summary>
-            /// 284x160 Fit
-            /// </summary>
-            [Description("logo_med")]
-            logo_med,
-
-            /// <summary>
-            /// 90x90 Thumb, Centre gravity
-            /// </summary>
-            [Description("thumb")]
-            thumb,
-
-            /// <summary>
-            /// 35x35 Thumb, Centre gravity
-            /// </summary>
-            [Description("micro")]
-            micro,
-
-            /// <summary>
-            /// 1280x720 Fit, Centre gravity
-            /// </summary>
-            [Description("720p")]
-            r720p,
-
-            /// <summary>
-            /// 1920x1080 Fit, Centre gravity
-            /// </summary>
-            [Description("1080p")]
-            r1080p,
-
-            /// <summary>
-            /// The originally uploaded image
-            /// </summary>
-            [Description("original")]
-            original
-        }
-    }
-}

gaseous-server/Classes/Metadata/Company.cs

@@ -1,4 +1,5 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -12,6 +13,12 @@ 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))
@@ -74,7 +81,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Company>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -105,8 +112,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Company> GetObjectFromServer(string WhereClause)
         {
             // get Companies metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Company>(IGDBClient.Endpoints.Companies, query: fieldList + " " + WhereClause + ";");
-            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

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,7 +15,13 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        public static CompanyLogo? GetCompanyLogo(long? Id, string ImagePath)
+        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))
             {
@@ -21,18 +29,18 @@ namespace gaseous_server.Classes.Metadata
             }
             else
             {
-                Task<CompanyLogo> RetVal = _GetCompanyLogo(SearchUsing.id, Id, ImagePath);
+                Task<CompanyLogo> RetVal = _GetCompanyLogo(SearchUsing.id, Id, LogoPath);
                 return RetVal.Result;
             }
         }
 
-        public static CompanyLogo GetCompanyLogo(string Slug, string ImagePath)
+        public static CompanyLogo GetCompanyLogo(string Slug, string LogoPath)
         {
-            Task<CompanyLogo> RetVal = _GetCompanyLogo(SearchUsing.slug, Slug, ImagePath);
+            Task<CompanyLogo> RetVal = _GetCompanyLogo(SearchUsing.slug, Slug, LogoPath);
             return RetVal.Result;
         }
 
-        private static async Task<CompanyLogo> _GetCompanyLogo(SearchUsing searchUsing, object searchValue, string ImagePath)
+        private static async Task<CompanyLogo> _GetCompanyLogo(SearchUsing searchUsing, object searchValue, string LogoPath)
         {
             // check database first
             Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
@@ -64,7 +72,7 @@ namespace gaseous_server.Classes.Metadata
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
-                    returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                     if (returnValue != null)
                     {
                         Storage.NewCacheValue(returnValue);
@@ -74,13 +82,13 @@ namespace gaseous_server.Classes.Metadata
                 case Storage.CacheStatus.Expired:
                     try
                     {
-                        returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                         Storage.NewCacheValue(returnValue, true);
                         forceImageDownload = true;
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<CompanyLogo>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -91,14 +99,13 @@ namespace gaseous_server.Classes.Metadata
                     throw new Exception("How did you get here?");
             }
 
-            // check for presence of "original" quality file - download if absent or force download is true
+            if (returnValue != null)
-            string localFile = Path.Combine(ImagePath, Communications.IGDBAPI_ImageSize.original.ToString(), returnValue.ImageId + ".jpg");
-            if ((!File.Exists(localFile)) || forceImageDownload == true)
             {
-                Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Company logo download forced.");
+                if ((!File.Exists(Path.Combine(LogoPath, "Logo.jpg"))) || forceImageDownload == true)
-
+                {
-                Communications comms = new Communications();
+                    GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_thumb);
-                comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
+                    GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_logo_med);
+                }
             }
 
             return returnValue;
@@ -110,15 +117,64 @@ namespace gaseous_server.Classes.Metadata
             slug
         }
 
-        private static async Task<CompanyLogo> GetObjectFromServer(string WhereClause, string ImagePath)
+        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 + ";");
+            if (results.Length > 0)
             {
-            // get Artwork metadata
-            Communications comms = new Communications();
-            var results = await comms.APIComm<CompanyLogo>(IGDBClient.Endpoints.CompanyLogos, fieldList, WhereClause);
                 var result = results.First();
 
+                GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb);
+                GetImageFromServer(result.Url, LogoPath, LogoSize.t_logo_med);
+
                 return result;
             }
+            else
+            {
+                return null;
+            }
+        }
+
+        private static void GetImageFromServer(string Url, string LogoPath, LogoSize logoSize)
+        {
+            using (var client = new HttpClient())
+            {
+                string fileName = "Logo.jpg";
+                string extension = "jpg";
+                switch (logoSize)
+                {
+                    case LogoSize.t_thumb:
+                        fileName = "Logo_Thumb";
+                        extension = "jpg";
+                        break;
+                    case LogoSize.t_logo_med:
+                        fileName = "Logo_Medium";
+                        extension = "png";
+                        break;
+                    default:
+                        fileName = "Logo";
+                        extension = "jpg";
+                        break;
+                }
+                string imageUrl = Url.Replace(LogoSize.t_thumb.ToString(), logoSize.ToString()).Replace("jpg", extension);
+
+                using (var s = client.GetStreamAsync("https:" + imageUrl))
+                {
+                    if (!Directory.Exists(LogoPath)) { Directory.CreateDirectory(LogoPath); }
+                    using (var fs = new FileStream(Path.Combine(LogoPath, fileName + "." + extension), FileMode.OpenOrCreate))
+                    {
+                        s.Result.CopyTo(fs);
+                    }
+                }
+            }
+        }
+
+        private enum LogoSize
+        {
+            t_thumb,
+            t_logo_med
+        }
     }
 }
 

gaseous-server/Classes/Metadata/Covers.cs

@@ -1,9 +1,9 @@
 using System;
-using System.Net;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using Microsoft.CodeAnalysis.Elfie.Model.Strings;
+using MySqlX.XDevAPI.Common;
-
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -15,7 +15,13 @@ namespace gaseous_server.Classes.Metadata
         {
         }
 
-        public static Cover? GetCover(long? Id, string ImagePath, bool GetImages)
+        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))
             {
@@ -23,18 +29,18 @@ namespace gaseous_server.Classes.Metadata
             }
             else
             {
-                Task<Cover> RetVal = _GetCover(SearchUsing.id, Id, ImagePath, GetImages);
+                Task<Cover> RetVal = _GetCover(SearchUsing.id, Id, LogoPath);
                 return RetVal.Result;
             }
         }
 
-        public static Cover GetCover(string Slug, string ImagePath, bool GetImages)
+        public static Cover GetCover(string Slug, string LogoPath)
         {
-            Task<Cover> RetVal = _GetCover(SearchUsing.slug, Slug, ImagePath, GetImages);
+            Task<Cover> RetVal = _GetCover(SearchUsing.slug, Slug, LogoPath);
             return RetVal.Result;
         }
 
-        private static async Task<Cover> _GetCover(SearchUsing searchUsing, object searchValue, string ImagePath, bool GetImages = true)
+        private static async Task<Cover> _GetCover(SearchUsing searchUsing, object searchValue, string LogoPath)
         {
             // check database first
             Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
@@ -63,24 +69,23 @@ namespace gaseous_server.Classes.Metadata
 
             Cover returnValue = new Cover();
             bool forceImageDownload = false;
-            ImagePath = Path.Combine(ImagePath, "Covers");
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
-                    returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                     Storage.NewCacheValue(returnValue);
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
                     try
                     {
-                        returnValue = await GetObjectFromServer(WhereClause, ImagePath);
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                         Storage.NewCacheValue(returnValue, true);
                         forceImageDownload = true;
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Cover>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -91,30 +96,11 @@ namespace gaseous_server.Classes.Metadata
                     throw new Exception("How did you get here?");
             }
 
-            string localFile = Path.Combine(ImagePath, Communications.IGDBAPI_ImageSize.original.ToString(), returnValue.ImageId + ".jpg");
+            if ((!File.Exists(Path.Combine(LogoPath, "Cover.jpg"))) || forceImageDownload == true)
-            if (GetImages == true)
             {
-                if ((!File.Exists(localFile)) || forceImageDownload == true)
+                //GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_thumb, returnValue.ImageId);
-                {
+                //GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_logo_med, returnValue.ImageId);
-                    Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Cover download forced.");
+                GetImageFromServer(returnValue.Url, LogoPath, LogoSize.t_original, returnValue.ImageId);
-
-                    // check for presence of image file - download if absent or force download is true
-                    List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>{
-                        Communications.IGDBAPI_ImageSize.cover_big,
-                        Communications.IGDBAPI_ImageSize.cover_small,
-                        Communications.IGDBAPI_ImageSize.original
-                    };
-
-                    Communications comms = new Communications();
-                    foreach (Communications.IGDBAPI_ImageSize size in imageSizes)
-                    {
-                        localFile = Path.Combine(ImagePath, size.ToString(), returnValue.ImageId + ".jpg");
-                        if ((!File.Exists(localFile)) || forceImageDownload == true)
-                        {
-                            comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, size, null);
-                        }
-                    }
-                }
             }
 
             return returnValue;
@@ -126,15 +112,63 @@ namespace gaseous_server.Classes.Metadata
             slug
         }
 
-        private static async Task<Cover> GetObjectFromServer(string WhereClause, string ImagePath)
+        private static async Task<Cover> GetObjectFromServer(string WhereClause, string LogoPath)
         {
             // get Cover metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Cover>(IGDBClient.Endpoints.Covers, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<Cover>(IGDBClient.Endpoints.Covers, fieldList, WhereClause);
             var result = results.First();
 
+            //GetImageFromServer(result.Url, LogoPath, LogoSize.t_thumb, result.ImageId);
+            //GetImageFromServer(result.Url, LogoPath, LogoSize.t_logo_med, result.ImageId);
+            GetImageFromServer(result.Url, LogoPath, LogoSize.t_original, result.ImageId);
+
             return result;
         }
+
+        private static void GetImageFromServer(string Url, string LogoPath, LogoSize logoSize, string ImageId)
+        {
+            using (var client = new HttpClient())
+            {
+                string fileName = "Cover.jpg";
+                string extension = "jpg";
+                switch (logoSize)
+                {
+                    case LogoSize.t_thumb:
+                        fileName = "Cover_Thumb";
+                        extension = "jpg";
+                        break;
+                    case LogoSize.t_logo_med:
+                        fileName = "Cover_Medium";
+                        extension = "png";
+                        break;
+                    case LogoSize.t_original:
+                        fileName = "Cover";
+                        extension = "png";
+                        break;
+                    default:
+                        fileName = "Cover";
+                        extension = "jpg";
+                        break;
+                }
+                string imageUrl = Url.Replace(LogoSize.t_thumb.ToString(), logoSize.ToString()).Replace("jpg", extension);
+
+                using (var s = client.GetStreamAsync("https:" + imageUrl))
+                {
+                    if (!Directory.Exists(LogoPath)) { Directory.CreateDirectory(LogoPath); }
+                    using (var fs = new FileStream(Path.Combine(LogoPath, fileName + "." + extension), FileMode.OpenOrCreate))
+                    {
+                        s.Result.CopyTo(fs);
+                    }
+                }
+            }
+        }
+
+        private enum LogoSize
+        {
+            t_thumb,
+            t_logo_med,
+            t_original
+        }
 	}
 }
 

gaseous-server/Classes/Metadata/ExternalGames.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -77,7 +85,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<ExternalGame>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -100,8 +108,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<ExternalGame?> GetObjectFromServer(string WhereClause)
         {
             // get ExternalGames metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<ExternalGame>(IGDBClient.Endpoints.ExternalGames, query: fieldList + " " + WhereClause + ";");
-            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

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Franchise>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Franchise> GetObjectFromServer(string WhereClause)
         {
             // get FranchiseContentDescriptions metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Franchise>(IGDBClient.Endpoints.Franchies, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<Franchise>(IGDBClient.Endpoints.Franchies, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/GameModes.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<GameMode>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<GameMode> GetObjectFromServer(string WhereClause)
         {
             // get Game_Modes metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<GameMode>(IGDBClient.Endpoints.GameModes, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<GameMode>(IGDBClient.Endpoints.GameModes, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/GameVideos.cs

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<GameVideo>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<GameVideo> GetObjectFromServer(string WhereClause)
         {
             // get Game_Videos metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<GameVideo>(IGDBClient.Endpoints.GameVideos, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<GameVideo>(IGDBClient.Endpoints.GameVideos, fieldList, WhereClause);
             var result = results.First();
 
             return result;

gaseous-server/Classes/Metadata/Games.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Data;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -14,11 +15,11 @@ namespace gaseous_server.Classes.Metadata
 
         }
 
-        public class InvalidGameId : Exception
+        private static IGDBClient igdb = new IGDBClient(
-        { 
+                    // Found in Twitch Developer portal for your app
-            public InvalidGameId(long Id) : base("Unable to find Game by id " + Id)
+                    Config.IGDB.ClientId,
-            {}
+                    Config.IGDB.Secret
-        }
+                );
 
         public static Game? GetGame(long Id, bool getAllMetadata, bool followSubGames, bool forceRefresh)
         {
@@ -98,85 +99,36 @@ namespace gaseous_server.Classes.Metadata
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    UpdateSubClasses(returnValue, getAllMetadata, followSubGames, forceRefresh);
+                    UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
                     return returnValue;
                 case Storage.CacheStatus.Expired:
                     try
                     {
                         returnValue = await GetObjectFromServer(WhereClause);
                         Storage.NewCacheValue(returnValue, true);
-                        UpdateSubClasses(returnValue, getAllMetadata, followSubGames, forceRefresh);
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
                     }
                     return returnValue;
                 case Storage.CacheStatus.Current:
-                    returnValue = Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
+                    return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
-                    UpdateSubClasses(returnValue, false, false, false);
-                    return returnValue;
                 default:
                     throw new Exception("How did you get here?");
             }
         }
 
-        private static void UpdateSubClasses(Game Game, bool getAllMetadata, bool followSubGames, bool forceRefresh)
+        private static void UpdateSubClasses(Game Game, bool getAllMetadata, bool followSubGames)
         {
-            // required metadata
             if (Game.Cover != null)
             {
-                try
+                Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
-                {
-                    Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game), forceRefresh);
-                }
-                catch (Exception ex)
-                {
-                    Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch cover artwork.", ex);
-                }
             }
 
-            if (Game.Genres != null)
+            if (getAllMetadata == true)
             {
-                foreach (long GenreId in Game.Genres.Ids)
-                {
-                    Genre GameGenre = Genres.GetGenres(GenreId);
-                }
-            }
-
-            if (Game.GameModes != null)
-            {
-                foreach (long gameModeId in Game.GameModes.Ids)
-                {
-                    GameMode gameMode = GameModes.GetGame_Modes(gameModeId);
-                }
-            }
-
-            if (Game.MultiplayerModes != null)
-            {
-                foreach (long multiplayerModeId in Game.MultiplayerModes.Ids)
-                {
-                    MultiplayerMode multiplayerMode = MultiplayerModes.GetGame_MultiplayerModes(multiplayerModeId);
-                }
-            }
-
-            if (Game.PlayerPerspectives != null)
-            {
-                foreach (long PerspectiveId in Game.PlayerPerspectives.Ids)
-                {
-                    PlayerPerspective GamePlayPerspective = PlayerPerspectives.GetGame_PlayerPerspectives(PerspectiveId);
-                }
-            }
-
-            if (Game.Themes != null)
-            {
-                foreach (long ThemeId in Game.Themes.Ids)
-                {
-                    Theme GameTheme = Themes.GetGame_Themes(ThemeId);
-                }
-            }
-
                 if (Game.AgeRatings != null)
                 {
                     foreach (long AgeRatingId in Game.AgeRatings.Ids)
@@ -184,19 +136,7 @@ namespace gaseous_server.Classes.Metadata
                         AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
                     }
                 }
-            AgeGroups.GetAgeGroup(Game);
 
-            if (Game.ReleaseDates != null)
-            {
-                foreach (long ReleaseDateId in Game.ReleaseDates.Ids)
-                {
-                    ReleaseDate GameReleaseDate = ReleaseDates.GetReleaseDates(ReleaseDateId);
-                }
-            }
-
-            // optional metadata - usually downloaded as needed
-            if (getAllMetadata == true)
-            {
                 if (Game.AlternativeNames != null)
                 {
                     foreach (long AlternativeNameId in Game.AlternativeNames.Ids)
@@ -209,14 +149,7 @@ namespace gaseous_server.Classes.Metadata
                 {
                     foreach (long ArtworkId in Game.Artworks.Ids)
                     {
-                        try
+                        Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
-                        {
-                            Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game), forceRefresh);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch artwork id: " + ArtworkId, ex);
-                        }
                     }
                 }
 
@@ -263,6 +196,14 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
+                if (Game.Genres != null)
+                {
+                    foreach (long GenreId in Game.Genres.Ids)
+                    {
+                        Genre GameGenre = Genres.GetGenres(GenreId);
+                    }
+                }
+
                 if (Game.InvolvedCompanies != null)
                 {
                     foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
@@ -271,6 +212,22 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
+                if (Game.GameModes != null)
+                {
+                    foreach (long gameModeId in Game.GameModes.Ids)
+                    {
+                        GameMode gameMode = GameModes.GetGame_Modes(gameModeId);
+                    }
+                }
+
+                if (Game.MultiplayerModes != null)
+                {
+                    foreach (long multiplayerModeId in Game.MultiplayerModes.Ids)
+                    {
+                        MultiplayerMode multiplayerMode = MultiplayerModes.GetGame_MultiplayerModes(multiplayerModeId);
+                    }
+                }
+
                 if (Game.Platforms != null)
                 {
                     foreach (long PlatformId in Game.Platforms.Ids)
@@ -279,18 +236,27 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
+                if (Game.PlayerPerspectives != null)
+                {
+                    foreach (long PerspectiveId in Game.PlayerPerspectives.Ids)
+                    {
+                        PlayerPerspective GamePlayPerspective = PlayerPerspectives.GetGame_PlayerPerspectives(PerspectiveId);
+                    }
+                }
+
                 if (Game.Screenshots != null)
                 {
                     foreach (long ScreenshotId in Game.Screenshots.Ids)
                     {
-                        try
+                        Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
-                        {
-                        Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game), forceRefresh);
                     }
-                        catch (Exception ex)
-                        {
-                            Logging.Log(Logging.LogType.Critical, "Game Metadata", "Unable to fetch screenshot id: " + ScreenshotId, ex);
                 }
+
+                if (Game.Themes != null)
+                {
+                    foreach (long ThemeId in Game.Themes.Ids)
+                    {
+                        Theme GameTheme = Themes.GetGame_Themes(ThemeId);
                     }
                 }
 
@@ -313,211 +279,45 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Game> GetObjectFromServer(string WhereClause)
         {
             // get Game metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: fieldList + " " + WhereClause + ";");
-            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)
         {
-            // search local first
+            Task<Game[]> games = _SearchForGame(SearchString, PlatformId, searchType);
-            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[]> _SearchForGameDatabase(string SearchString, long PlatformId, SearchType searchType)
+        private static async Task<Game[]> _SearchForGame(string SearchString, long PlatformId, SearchType searchType)
-        {
-            string whereClause = "";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-
-            bool allowSearch = true;
-            switch (searchType)
-            {
-                case SearchType.searchNoPlatform:
-                    whereClause = "MATCH(`Name`) AGAINST (@gamename)";
-                    dbDict.Add("platformid", PlatformId);
-                    dbDict.Add("gamename", SearchString);
-
-                    allowSearch = AllowNoPlatformSearch;
-                    break;
-                case SearchType.search:
-                    whereClause = "PlatformsId = @platformid AND MATCH(`Name`) AGAINST (@gamename)";
-                    dbDict.Add("platformid", PlatformId);
-                    dbDict.Add("gamename", SearchString);
-                    break;
-                case SearchType.wherefuzzy:
-                    whereClause = "PlatformsId = @platformid AND `Name` LIKE @gamename";
-                    dbDict.Add("platformid", PlatformId);
-                    dbDict.Add("gamename", "%" + SearchString + "%");
-                    break;
-                case SearchType.where:
-                    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)Common.ReturnValueIfNull(row["Name"], ""),
-                        Slug = (string)Common.ReturnValueIfNull(row["Slug"], ""),
-                        Summary = (string)Common.ReturnValueIfNull(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; ";
+            searchBody += "fields id,name,slug,platforms,summary; ";
-            bool allowSearch = true;
             switch (searchType)
             {
                 case SearchType.searchNoPlatform:
-                    searchBody = "search \"" + SearchString + "\"; ";
+                    searchBody += "search \"" + SearchString + "\"; ";
-
-                    allowSearch = AllowNoPlatformSearch;
                     break;
                 case SearchType.search:
-                    searchBody = "search \"" + SearchString + "\"; where platforms = (" + PlatformId + ");";
+                    searchBody += "search \"" + SearchString + "\"; ";
+                    searchBody += "where platforms = (" + PlatformId + ");";
                     break;
                 case SearchType.wherefuzzy:
-                    searchBody = "where platforms = (" + PlatformId + ") & name ~ *\"" + SearchString + "\"*;";
+                    searchBody += "where platforms = (" + PlatformId + ") & name ~ *\"" + SearchString + "\"*;";
                     break;
                 case SearchType.where:
-                    searchBody = "where platforms = (" + PlatformId + ") & name ~ \"" + SearchString + "\";";
+                    searchBody += "where platforms = (" + PlatformId + ") & name ~ \"" + SearchString + "\";";
                     break;
             }
             
-            // check search cache
-            Game[]? games = Communications.GetSearchCache<Game[]?>(searchFields, searchBody);
 
-            if (games == null)
-            {   
-                // cache miss
             // get Game metadata
-                Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Game>(IGDBClient.Endpoints.Games, query: searchBody);
-                Game[]? results = new Game[0];
-                if (allowSearch == true)
-                {
-                    results = await comms.APIComm<Game>(IGDBClient.Endpoints.Games, searchFields, searchBody);
-
-                    Communications.SetSearchCache<Game[]?>(searchFields, searchBody, results);
-                }
 
             return results;
         }
-            else
-            {
-                return games.ToArray();
-            }
-        }
-
-        public static List<KeyValuePair<long, string>> GetAvailablePlatforms(long GameId)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT DISTINCT Games_Roms.PlatformId, Platform.`Name` FROM Games_Roms LEFT JOIN Platform ON Games_Roms.PlatformId = Platform.Id WHERE Games_Roms.GameId = @gameid ORDER BY Platform.`Name`;";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("gameid", GameId);
-            DataTable data = db.ExecuteCMD(sql, dbDict);
-
-            List<KeyValuePair<long, string>> platforms = new List<KeyValuePair<long, string>>();
-            foreach (DataRow row in data.Rows)
-            {
-                KeyValuePair<long, string> valuePair = new KeyValuePair<long, string>((long)row["PlatformId"], (string)row["Name"]);
-				platforms.Add(valuePair);
-            }
-
-            return platforms;
-        }
 
         public enum SearchType
         {
@@ -526,42 +326,5 @@ namespace gaseous_server.Classes.Metadata
             search = 2,
             searchNoPlatform = 3
         }
-
-        public class MinimalGameItem
-        {
-            public MinimalGameItem(Game gameObject)
-            {
-                this.Id = gameObject.Id;
-                this.Name = gameObject.Name;
-                this.TotalRating = gameObject.TotalRating;
-                this.TotalRatingCount = gameObject.TotalRatingCount;
-                this.Cover = gameObject.Cover;
-                this.Artworks = gameObject.Artworks;
-                this.FirstReleaseDate = gameObject.FirstReleaseDate;
-
-                // compile age ratings
-                this.AgeRatings = new List<AgeRating>();
-                if (gameObject.AgeRatings != null)
-                {
-                    foreach (long ageRatingId in gameObject.AgeRatings.Ids)
-                    {
-                        AgeRating? rating = Classes.Metadata.AgeRatings.GetAgeRatings(ageRatingId);
-                        if (rating != null)
-                        {
-                            this.AgeRatings.Add(rating);
-                        }
-                    }
-                }
-            }
-
-            public long? Id { get; set; }
-            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

@@ -1,7 +1,9 @@
 using System;
+using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-
+using MySqlX.XDevAPI.Common;
+using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -13,6 +15,12 @@ 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))
@@ -74,7 +82,7 @@ namespace gaseous_server.Classes.Metadata
                     }
                     catch (Exception ex)
                     {
-                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
                         returnValue = Storage.GetCacheValue<Genre>(returnValue, "id", (long)searchValue);
                     }
                     break;
@@ -97,8 +105,7 @@ namespace gaseous_server.Classes.Metadata
         private static async Task<Genre> GetObjectFromServer(string WhereClause)
         {
             // get Genres metadata
-            Communications comms = new Communications();
+            var results = await igdb.QueryAsync<Genre>(IGDBClient.Endpoints.Genres, query: fieldList + " " + WhereClause + ";");
-            var results = await comms.APIComm<Genre>(IGDBClient.Endpoints.Genres, fieldList, WhereClause);
             var result = results.First();
 
             return result;