fix: updated PlatformMap.json file with more platforms and fixed SNES extensions

* Improve metadata first load performance (#46)

* fix: reduces the number of full metadata calls - speeding up imports #45

* chore(deps): update EmulatorJS

* fix: added visual feed back

.github/dependabot.yml

@@ -9,3 +9,9 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    allow:
+      - dependency-name: "gaseous-server/wwwroot/emulators/EmulatorJS"
+    schedule:
+      interval: "weekly"

.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

.github/workflows/BuildDockerOnTag-Prerelease.yml

@@ -1,38 +0,0 @@
-name: Build Pre-release Docker Image
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+-preview.[0-9]'
-      - 'v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: 'true'
-      - name: Install dotnet tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-      - name: Set tag to version  
-        run: dotnet TagToVersion -t ${{ github.ref }}
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          platforms: linux/amd64 #,linux/arm64
-          push: true
-          tags: gaseousgames/gaseousserver:${{ github.ref_name}}

.github/workflows/BuildDockerOnTag.yml

@@ -1,34 +1,33 @@
-name: Build Release Docker Image
+name: Build Docker Image on New Tag
 
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - '*'
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      -
+        name: Checkout
         uses: actions/checkout@v3
         with:
           submodules: 'true'
-      - name: Install dotnet tool
-        run: dotnet tool install -g dotnetCampus.TagToVersion
-      - name: Set tag to version  
-        run: dotnet TagToVersion -t ${{ github.ref }}
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Set up QEMU
+      -
+        name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
+      -
+        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
+      -
+        name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
+      -
+        name: Build and push
         uses: docker/build-push-action@v4
         with:
           context: .

.github/workflows/codeql.yml

@@ -1,85 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "main", "branch-v*.*.*" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
-  schedule:
-    - cron: '21 11 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners
-    # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'csharp', 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
-        # Use only 'java' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      
-    - name: Sign in to Nuget
-      run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-        
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/dotnet.yml

@@ -1,24 +0,0 @@
-name: .NET
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 7.0.x
-      - name: Sign in to Nuget
-        run: dotnet nuget add source --username michael-j-green --password ${{ secrets.NUGETKEY }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/gaseous-project/index.json"
-      - name: Restore dependencies
-        run: dotnet restore
-      - name: Build
-        run: dotnet build --no-restore

.gitignore

@@ -403,5 +403,3 @@ ASALocalRun/
 
 # Local History for Visual Studio
 .localhistory/
-gaseous-server/.DS_Store
-gaseous-server/wwwroot/emulators/EmulatorJS

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gaseous-server/wwwroot/emulators/EmulatorJS"]
+	path = gaseous-server/wwwroot/emulators/EmulatorJS
+	url = https://github.com/EmulatorJS/EmulatorJS.git

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-michael.green@mrgtech.net.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

Directory.Build.props

@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="build\Version.props" />
-</Project>

Dockerfile

@@ -9,12 +9,6 @@ RUN dotnet restore "gaseous-server/gaseous-server.csproj"
 # Build and publish a release
 RUN dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained false -c Release -o out
 
-# download and unzip EmulatorJS from CDN
-RUN apt-get update && apt-get install -y p7zip-full
-RUN mkdir -p out/wwwroot/emulators/EmulatorJS
-RUN wget https://cdn.emulatorjs.org/releases/4.0.9.7z
-RUN 7z x -y -oout/wwwroot/emulators/EmulatorJS 4.0.9.7z
-
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:7.0
 WORKDIR /App

Gaseous.sln

@@ -1,8 +1,18 @@
-
+
 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-identifier-testapp", "gaseous-identifier\gaseous-identifier-testapp.csproj", "{F5C42134-5372-430A-A9AE-1871981850DB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-signature-parser", "gaseous-signature-parser\gaseous-signature-parser.csproj", "{DAEBBB82-5051-43FD-A406-F9D64A38F468}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-romsignatureobject", "gaseous-romsignatureobject\gaseous-romsignatureobject.csproj", "{9DCD243D-37CE-4562-8411-B5242B687D4F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-signature-ingestor", "gaseous-signature-ingestor\gaseous-signature-ingestor.csproj", "{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}"
+EndProject
+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}"
@@ -27,14 +37,34 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5C42134-5372-430A-A9AE-1871981850DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08699C93-15CD-4E39-9053-D3C8056CE938}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAEBBB82-5051-43FD-A406-F9D64A38F468}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFCEC386-033F-4772-A45B-D33579F2E5EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{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
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DCD243D-37CE-4562-8411-B5242B687D4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86DF6E45-2C2B-4C30-AEC1-E7EF8C5CEA7D}.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,25 +1,13 @@
 # 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.
-
-## Warning
-
-This project is currently not suitable for being exposed to the internet.
-1. there is currently no authentication support, meaning anyone could trash your library
-2. the server has not been hardened for exposure to the internet - so there maybe unknown vulnerabilities
-
-If you expose the server to the internet, **you do so at your own risk**.
+This is the server for the Gaseous system. All your games and metadata are stored within.
 
 ## Screenshots
 ![Library](./screenshots/Library.png)
 ![Game](./screenshots/Game.png)
-![Emulator](./screenshots/Emulator.png)
 
 ## Requirements
-* MariaDB 11.1.2 or 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.
+* MySQL Server 8+
 * Internet Game Database API Key. See: https://api-docs.igdb.com/#account-creation
 
 ## Third Party Projects
@@ -30,11 +18,6 @@ The following projects are used by Gaseous
 * https://github.com/kamranayub/igdb-dotnet
 * https://github.com/EmulatorJS/EmulatorJS
 
-## Discord Server
-[![Join our Discord server!](https://invite.casperiv.dev/?inviteCode=Nhu7wpT3k4&format=svg)](https://discord.gg/Nhu7wpT3k4)
-
-# Setup
-
 ## Configuration File
 When Gaseous-Server is started for the first time, it creates a configuration file at ~/.gaseous-server/config.json if it doesn't exist. Some values can be filled in using environment variables (such as in the case of using docker).
 
@@ -67,108 +50,51 @@ When Gaseous-Server is started for the first time, it creates a configuration fi
   },
   "LoggingConfiguration": {
     "DebugLogging": false,
-    "LogRetention": 7
+    "LogFormat": "text"
   }
 }
 
 ```
 
-## Docker
-### Deploy with the prebuilt Docker image
+## Deploy with Docker
 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```
+3. Run the command "docker-compose up -d"
 4. Connect to the host on port 5198
 
-### Build and deploy a Docker image from source
+## Build and Deploy with Docker
 Dockerfile and docker-compose-build.yml files have been provided to make deployment of the server as easy as possible.
-1. Clone the repo with ```git clone https://github.com/gaseous-project/gaseous-server.git```
+1. Clone the repo with "git clone https://github.com/gaseous-project/gaseous-server.git"
 2. Change into the gaseous-server directory
-3. Open the docker-compose-{database}-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
-4. Run the command ```docker-compose --file docker-compose-{database}-build.yml up -d```
+3. Open the docker-compose-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+4. Run the command "docker-compose up --file docker-compose-build.yml -d"
 5. 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
-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.
-4. Clone the repo with ```git clone https://github.com/gaseous-project/gaseous-server.git```
-5. Change into the gaseous-server directory
-6. As the main branch is the development branch, you might want to change to a stable version - these are tagged with a version number. For example to change to the 1.5.0 release, use the command ```git checkout v1.5.0```
-    * Check the releases page for the version you would like to run: https://github.com/gaseous-project/gaseous-server/releases
-7. Download the emulator files from ```https://cdn.emulatorjs.org/releases/4.0.9.zip``` and extract the files to ```gaseous-server/wwwroot/emulators/EmulatorJS```
-8. Create a directory in the home directory of the user that will run the server. For example, if running as the user ```gaseous```, create the directory ```/home/gaseous/.gaseous-server```
-9. Change into the ```.gaseous-server``` directory created in the previous step
-10. Copy the JSON from the config file above into a new file named ```config.json```
-11. Update the database section with the database server hostname, username, password, and port
-12. Compile the server by changing back to the repo cloned earlier and executing:
-    * ```dotnet restore "gaseous-server/gaseous-server.csproj"```
-    * ```dotnet publish "gaseous-server/gaseous-server.csproj" --use-current-runtime --self-contained false -c Release -o <output directory>```
-    * replace ```<output directory>``` with the directory of your choosing. The compiled application will be copied there. For this example we'll use ```/opt/gaseous-server```
-13. The server can then be started by executing ```dotnet /opt/gaseous-server/gaseous-server.dll```
-    * If you would like the server to run on a different ip address and port (for example 0.0.0.0:8080), add the --urls argument: ```dotnet /opt/gaseous-server/gaseous-server.dll --urls http://0.0.0.0:8080```
-
-**Note**: The above instructions were tested on macOS Ventura, and Ubuntu 22.04.3. There was a report that Debian 11 had an issue with the git submodule commands (see: https://github.com/gaseous-project/gaseous-server/issues/71). This was possibly due to an older git package.
-
-### Updating from source
-1. Stop the server
-2. Switch to the source directory
-3. Update your repo:
-    * If running from the main branch, run ```git pull``` to update the repo
-    * If running from another branch or tag, run:
-      * ```git fetch```
-      * ```git checkout <branch or tag name>```
-4. Run steps 12 and 13 from the above Build guide
-
-# Adding Content
-While games can be added to the server without them, it is recommended adding some signature DAT files beforehand to allow for better matching of ROMs to games.
+## Adding Content
+While games can be added to the server without them, it is recommended adding some signature DAT files beforehand to allow for better matching of ROM to game.
 
 These signature DAT files contain a list of titles with hashes for many of the ROM images that have been found by the community.
 
-Currently supported DAT's:
-* TOSEC: https://www.tosecdev.org/downloads/category/56-2023-01-23
-* MAME Arcade and MAME Mess: https://www.progettosnaps.net/dats/MAME
+Currently only TOSEC is supported, though more will be added.
 
-If there are other DAT's you'd like to see support for, please raise an issue with a link to the DAT's.
-
-## Adding signature DAT files
-### TOSEC
+### Adding signature DAT files
 1. Download the DAT files from the source website. For example; from https://www.tosecdev.org/downloads/category/56-2023-01-23
 2. Extract the archive
 3. Copy the DAT files to ~/.gaseous-server/Data/Signatures/TOSEC/
 
-### MAME Arcade
-1. Download the DAT files from the source website. For example; from https://www.progettosnaps.net/dats/MAME
-2. Extract the archive
-3. Copy the file name "MAME 0.257 (arcade).dat" files to ~/.gaseous-server/Data/Signatures/MAME Arcade/
+### Adding game image files
+1. Ensure your game image file is unzipped, and clearly named. Attempting a search for the game name on https://www.igdb.com can help with file naming. If a hash search is unsuccessful, Gaseous will fall back to attempting to search by the file name.
+2. Copy the file to ~/.gaseous-server/Data/Import
 
-### MAME MESS
-1. Download the DAT files from the source website. For example; from https://www.progettosnaps.net/dats/MAME
-2. Extract the archive
-3. Copy the file name "MAME 0.257 (mess).dat" files to ~/.gaseous-server/Data/Signatures/MAME MESS/
-
-# Adding Game Images
-1. Files can be presented as either stand alone files, or as zip files - currently 7z is unsupported.
-2. Name the file appropriately.
-   * Attempting a search for the game name on https://www.igdb.com can help with file naming. If a hash search is unsuccessful, Gaseous will fall back to attempting to search by the file name.
-3. Add the file to the server:
-   * Click the Upload button in the top right of the main Gaseous web page, and drag the files into the modal. The files will be uploaded and analyzed.
-   * Copy the file to ~/.gaseous-server/Data/Import
-
-# Game Image Title Matching
 Image to game matching follows the following order of operations, stopping the process at the first match:
 ### Get the file signature
 1. Attempt a hash search
 2. Attempt to search the signature database for a rom matching the file name - sometimes the hash can not be matched as a highscore table for example was saved to the image
 3. Attempt to parse the file name - clues such as the extension being used to define which platform the file belongs to are used to create a search criteria
 
-**Note**: If the file being scanned is a zip, the file will be extracted and searched. The first file whose signature can be found will be used to match the entire zip archive - be sure that the zip only contains files related to one game.
-
 ### Create a list of search candidates
-Before beginning, remove any version numbers, and anything in the search string that is between ()
+Before beginning, remove any version numbers.
 1. Add the full name of the image
 2. Add the name of the image with any " - " replaced by ": "
 3. Add the name of the image with text after a " - " removed
@@ -179,8 +105,5 @@ Loop through each of the search candidates searching using:
 1. "where" - exact match as the search candidate
 2. "wherefuzzy" - partial match using wildcards
 3. "search" - uses a more flexible search method
-4. "searchNoPlatform" - uses the "search" method, but does not constrain the search to the determined platform
 
-**Note**: If more than one result is found, the seach will loop through the returned results:
-* If an exact (case-insensitive) match is found, that result is used for the match
-* If still no match, the image will be set as "Unknown" as there is no way for Gaseous to know which title is the correct one.
+Note: that if more than one result is found, the image will be set as "Unknown" as there is no way for Gaseous to know which title is the correct one.

build/Version.props

@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version>1.5.0</Version>
-  </PropertyGroup>
-</Project>

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-identifier/Program.cs

@@ -0,0 +1,183 @@
+// parse command line
+using System.Security.Cryptography;
+using System.Text;
+using System.Xml;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using gaseous_romsignatureobject;
+using gaseous_signature_parser.parsers;
+
+string[] commandLineArgs = Environment.GetCommandLineArgs();
+
+string scanPath = "./";
+string tosecXML = "";
+
+string inArgument = "";
+foreach (string commandLineArg in commandLineArgs)
+{
+    if (commandLineArg != commandLineArgs[0])
+    {
+        if (inArgument == "")
+        {
+            switch (commandLineArg.ToLower())
+            {
+                case "-scanpath":
+                    inArgument = commandLineArg.ToLower();
+                    break;
+                case "-tosecpath":
+                    inArgument = commandLineArg.ToLower();
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            switch (inArgument)
+            {
+                case "-scanpath":
+                    scanPath = commandLineArg;
+                    break;
+                case "-tosecpath":
+                    tosecXML = commandLineArg;
+                    break;
+                default:
+                    break;
+            }
+            inArgument = "";
+        }
+    }
+}
+
+scanPath = Path.GetFullPath(scanPath);
+Console.WriteLine("ROM search path: " + scanPath);
+
+List<RomSignatureObject> romSignatures = new List<RomSignatureObject>();
+System.Collections.ArrayList availablePlatforms = new System.Collections.ArrayList();
+
+// load TOSEC XML files
+if (tosecXML != null && tosecXML.Length > 0)
+{
+    tosecXML = Path.GetFullPath(tosecXML);
+    Console.WriteLine("TOSEC is enabled");
+    Console.WriteLine("TOSEC XML search path: " + tosecXML);
+
+    string[] tosecPathContents = Directory.GetFiles(tosecXML);
+    int lastCLILineLength = 0;
+    for (UInt16 i = 0; i < tosecPathContents.Length; ++i)
+    {
+        string tosecXMLFile = tosecPathContents[i];
+
+        TosecParser tosecParser = new TosecParser();
+        RomSignatureObject tosecObject = tosecParser.Parse(tosecXMLFile);
+
+        string statusOutput = i + " / " + tosecPathContents.Length + " : " + Path.GetFileName(tosecXMLFile);
+        Console.Write("\r " + statusOutput.PadRight(lastCLILineLength, ' ') + "\r");
+        lastCLILineLength = statusOutput.Length;
+
+        foreach (RomSignatureObject.Game gameRom in tosecObject.Games)
+        {
+            if (!availablePlatforms.Contains(gameRom.System))
+            {
+                availablePlatforms.Add(gameRom.System);
+            }
+        }
+
+        romSignatures.Add(tosecObject);
+    }
+    Console.WriteLine("");
+} else
+{
+    Console.WriteLine("TOSEC is disabled.");
+}
+Console.WriteLine(romSignatures.Count + " TOSEC files loaded");
+
+// Summarise signatures
+if (availablePlatforms.Count > 0)
+{
+    availablePlatforms.Sort();
+    Console.WriteLine("Platforms loaded:");
+    foreach (string platform in availablePlatforms)
+    {
+        Console.WriteLine(" * " + platform);
+    }
+}
+
+Console.WriteLine("Examining files");
+string[] romPathContents = Directory.GetFiles(scanPath);
+foreach (string romFile in romPathContents)
+{
+    Console.WriteLine("Checking " + romFile);
+
+    var stream = File.OpenRead(romFile);
+
+    var md5 = MD5.Create();
+    byte[] md5HashByte = md5.ComputeHash(stream);
+    string md5Hash = BitConverter.ToString(md5HashByte).Replace("-", "").ToLowerInvariant();
+
+    var sha1 = SHA1.Create();
+    byte[] sha1HashByte = sha1.ComputeHash(stream);
+    string sha1Hash = BitConverter.ToString(sha1HashByte).Replace("-", "").ToLowerInvariant();
+
+    bool gameFound = false;
+    foreach (RomSignatureObject tosecList in romSignatures)
+    {
+        foreach (RomSignatureObject.Game gameObject in tosecList.Games)
+        {
+            foreach (RomSignatureObject.Game.Rom romObject in gameObject.Roms)
+            {
+                if (romObject.Md5 != null)
+                {
+                    if (md5Hash == romObject.Md5.ToLowerInvariant())
+                    {
+                        // match
+                        gameFound = true;
+                    }
+                }
+                if (romObject.Sha1 != null)
+                {
+                    if (md5Hash == romObject.Sha1.ToLowerInvariant())
+                    {
+                        // match
+                        gameFound = true;
+                    }
+                }
+                if (gameFound == true)
+                {
+                    Console.WriteLine(romObject.Name);
+
+                    RomSignatureObject.Game gameSignature = gameObject;
+                    gameSignature.Roms.Clear();
+                    gameSignature.Roms.Add(romObject);
+
+                    var jsonSerializerSettings = new JsonSerializerSettings();
+                    jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+                    jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
+                    Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameSignature, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings));
+                    break;
+                }
+            }
+            if (gameFound == true) { break; }
+        }
+        if (gameFound == true) { break; }
+    }
+    if (gameFound == false)
+    {
+        Console.WriteLine("File not found in TOSEC library");
+    }
+}
+
+string SearchTitle = "California Games";
+foreach (RomSignatureObject romSignatureObject in romSignatures)
+{
+    foreach (RomSignatureObject.Game gameObject in romSignatureObject.Games)
+    {
+        if (gameObject.Name == SearchTitle)
+        {
+            var jsonSerializerSettings = new JsonSerializerSettings();
+            jsonSerializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+            jsonSerializerSettings.NullValueHandling = NullValueHandling.Ignore;
+            Console.WriteLine(Newtonsoft.Json.JsonConvert.SerializeObject(gameObject, Newtonsoft.Json.Formatting.Indented, jsonSerializerSettings));
+        }
+    }
+}

gaseous-identifier/gaseous-identifier-testapp.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <RootNamespace>gaseous_identifier</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Newtonsoft.Json" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\gaseous-romsignatureobject\gaseous-romsignatureobject.csproj" />
+    <ProjectReference Include="..\gaseous-signature-parser\gaseous-signature-parser.csproj" />
+  </ItemGroup>
+</Project>

gaseous-romsignatureobject/RomSignatureObject.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+
+namespace gaseous_romsignatureobject
+{
+    /// <summary>
+    /// Object returned by all signature engines containing metadata about the ROM's in the data files
+    ///
+    /// This class was based on the TOSEC dataset, so may need to be expanded as new signature engines are added
+    /// </summary>
+	public class RomSignatureObject
+    {
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+        public string? Category { get; set; }
+        public string? Version { get; set; }
+        public string? Author { get; set; }
+        public string? Email { get; set; }
+        public string? Homepage { get; set; }
+        public Uri? Url { get; set; }
+        public string? SourceType { get; set; }
+        public string SourceMd5 { get; set; } = "";
+        public string SourceSHA1 { get; set; } = "";
+
+        public List<Game> Games { get; set; } = new List<Game>();
+
+        public class Game
+        {
+            public string? Name { get; set; }
+            public string? Description { get; set; }
+            public string? Year { get; set; }
+            public string? Publisher { get; set; }
+            public DemoTypes Demo { get; set; }
+            public string? System { get; set; }
+            public string? SystemVariant { get; set; }
+            public string? Video { get; set; }
+            public string? Country { get; set; }
+            public string? Language { get; set; }
+            public string? Copyright { get; set; }
+            public List<Rom> Roms { get; set; } = new List<Rom>();
+            public int RomCount
+            {
+                get
+                {
+                    return Roms.Count();
+                }
+            }
+
+            public enum DemoTypes
+            {
+                NotDemo = 0,
+                demo = 1,
+                demo_kiosk = 2,
+                demo_playable = 3,
+                demo_rolling = 4,
+                demo_slideshow = 5
+            }
+
+            public class Rom
+            {
+                public string? Name { get; set; }
+                public UInt64? Size { get; set; }
+                public string? Crc { get; set; }
+                public string? Md5 { get; set; }
+                public string? Sha1 { get; set; }
+
+                public string? DevelopmentStatus { get; set; }
+
+                public List<string> flags { get; set; } = new List<string>();
+
+                public RomTypes RomType { get; set; }
+                public string? RomTypeMedia { get; set; }
+                public string? MediaLabel { get; set; }
+
+                public SignatureSourceType SignatureSource { get; set; }
+
+                public enum SignatureSourceType
+                {
+                    None = 0,
+                    TOSEC = 1
+                }
+
+                public enum RomTypes
+                {
+                    /// <summary>
+                    /// Media type is unknown
+                    /// </summary>
+                    Unknown = 0,
+
+                    /// <summary>
+                    /// Optical media
+                    /// </summary>
+                    Disc = 1,
+
+                    /// <summary>
+                    /// Magnetic media
+                    /// </summary>
+                    Disk = 2,
+
+                    /// <summary>
+                    /// Individual files
+                    /// </summary>
+                    File = 3,
+
+                    /// <summary>
+                    /// Individual pars
+                    /// </summary>
+                    Part = 4,
+
+                    /// <summary>
+                    /// Tape base media
+                    /// </summary>
+                    Tape = 5,
+
+                    /// <summary>
+                    /// Side of the media
+                    /// </summary>
+                    Side = 6
+                }
+            }
+
+        }
+    }
+}
+

gaseous-romsignatureobject/gaseous-romsignatureobject.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <RootNamespace>gaseous_romsignatureobject</RootNamespace>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+</Project>

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; Delete from GameState where UserId = @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
 {
@@ -15,9 +16,11 @@ namespace gaseous_server.Classes
         {
             foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
             {
-                if (platformMapping.Bios != null)
+                if (platformMapping.WebEmulator != null)
                 {
-                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBiosItem in platformMapping.Bios)
+                    if (platformMapping.WebEmulator.Bios != null)
+                    {
+                        foreach (Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem emulatorBiosItem in platformMapping.WebEmulator.Bios)
                         {
                             if (emulatorBiosItem.hash.ToLower() == MD5.ToLower())
                             {
@@ -26,6 +29,7 @@ namespace gaseous_server.Classes
                         }
                     }
                 }
+            }
 
             return null;
         }
@@ -65,11 +69,13 @@ namespace gaseous_server.Classes
 
             foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
             {
-                if (platformMapping.Bios != null)
+                if (platformMapping.WebEmulator != null)
+                    {
+                    if (platformMapping.WebEmulator.Bios != null)
                     {
                         IGDB.Models.Platform platform = Metadata.Platforms.GetPlatform(platformMapping.IGDBId);
 
-                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBios in platformMapping.Bios)
+                        foreach (Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem emulatorBios in platformMapping.WebEmulator.Bios)
                         {
                             BiosItem biosItem = new BiosItem
                             {
@@ -78,16 +84,18 @@ namespace gaseous_server.Classes
                                 platformname = platform.Name,
                                 description = emulatorBios.description,
                                 filename = emulatorBios.filename,
-                            hash = emulatorBios.hash.ToLower()
+                                region = emulatorBios.region,
+                                hash = emulatorBios.hash
                             };
                             biosItems.Add(biosItem);
                         }
                     }
                 }
+            }
             return biosItems;
         }
 
-        public class BiosItem : Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem
+        public class BiosItem : Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem
         {
             public long platformid { get; set; }
             public string platformslug { get; set; }

gaseous-server/Classes/Collections.cs

@@ -1,874 +0,0 @@
-using System;
-using System.Data;
-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 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;
-        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);
-            string sql = "SELECT * FROM RomCollections ORDER BY `Name`";
-
-            DataTable data = db.ExecuteCMD(sql);
-
-            List<CollectionItem> collectionItems = new List<CollectionItem>();
-
-            foreach(DataRow row in data.Rows) {
-                collectionItems.Add(BuildCollectionItem(row));
-            }
-
-            return collectionItems;
-        }
-
-        public static CollectionItem GetCollection(long Id) {
-            Database db = new 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);
-			DataTable romDT = db.ExecuteCMD(sql, dbDict);
-
-			if (romDT.Rows.Count > 0)
-			{
-				DataRow row = romDT.Rows[0];
-				CollectionItem collectionItem = BuildCollectionItem(row);
-
-				return collectionItem;
-			}
-			else
-			{
-				throw new Exception("Unknown Collection Id");
-			}
-        }
-
-        public static CollectionItem NewCollection(CollectionItem item)
-        {
-            Database db = new 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);";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("name", item.Name);
-            dbDict.Add("description", item.Description);
-            dbDict.Add("platforms", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Platforms, new List<long>())));
-            dbDict.Add("genres", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Genres, new List<long>())));
-            dbDict.Add("players", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Players, new List<long>())));
-            dbDict.Add("playerperspectives", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.PlayerPerspectives, new List<long>())));
-            dbDict.Add("themes", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Themes, new List<long>())));
-            dbDict.Add("minimumrating", Common.ReturnValueIfNull(item.MinimumRating, -1));
-            dbDict.Add("maximumrating", Common.ReturnValueIfNull(item.MaximumRating, -1));
-            dbDict.Add("maximumromsperplatform", Common.ReturnValueIfNull(item.MaximumRomsPerPlatform, -1));
-            dbDict.Add("maximumbytesperplatform", Common.ReturnValueIfNull(item.MaximumBytesPerPlatform, -1));
-            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);
-            long CollectionId = (long)romDT.Rows[0][0];
-
-            CollectionItem collectionItem = GetCollection(CollectionId);
-
-            StartCollectionItemBuild(CollectionId);
-
-            return collectionItem;
-        }
-
-        public static CollectionItem EditCollection(long Id, CollectionItem item, bool ForceRebuild = true)
-        {
-            Database db = new 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";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("id", Id);
-            dbDict.Add("name", item.Name);
-            dbDict.Add("description", item.Description);
-            dbDict.Add("platforms", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Platforms, new List<long>())));
-            dbDict.Add("genres", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Genres, new List<long>())));
-            dbDict.Add("players", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Players, new List<long>())));
-            dbDict.Add("playerperspectives", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.PlayerPerspectives, new List<long>())));
-            dbDict.Add("themes", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.Themes, new List<long>())));
-            dbDict.Add("minimumrating", Common.ReturnValueIfNull(item.MinimumRating, -1));
-            dbDict.Add("maximumrating", Common.ReturnValueIfNull(item.MaximumRating, -1));
-            dbDict.Add("maximumromsperplatform", Common.ReturnValueIfNull(item.MaximumRomsPerPlatform, -1));
-            dbDict.Add("maximumbytesperplatform", Common.ReturnValueIfNull(item.MaximumBytesPerPlatform, -1));
-            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("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);
-            if (ForceRebuild == true) 
-            {
-                dbDict.Add("builtstatus", CollectionItem.CollectionBuildStatus.WaitingForBuild);
-                if (File.Exists(CollectionZipFile))
-                {
-                    Logging.Log(Logging.LogType.Warning, "Collections", "Deleting existing build of collection: " + item.Name);
-                    File.Delete(CollectionZipFile);
-                }
-            }
-            else
-            {
-                if (File.Exists(CollectionZipFile))
-                {
-                    dbDict.Add("builtstatus", CollectionItem.CollectionBuildStatus.Completed);
-                }
-                else
-                {
-                    dbDict.Add("builtstatus", CollectionItem.CollectionBuildStatus.NoStatus);
-                }
-            }
-            db.ExecuteCMD(sql, dbDict);
-            
-            CollectionItem collectionItem = GetCollection(Id);
-
-            if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild)
-            {
-                StartCollectionItemBuild(Id);
-            }
-
-            return collectionItem;
-        }
-
-        public static void DeleteCollection(long Id)
-        {
-            Database db = new 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);
-            db.ExecuteCMD(sql, dbDict);
-
-            string CollectionZipFile = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ".zip");
-            if (File.Exists(CollectionZipFile))
-            {
-                File.Delete(CollectionZipFile);
-            }
-        }
-
-        public static void StartCollectionItemBuild(long Id)
-        {
-            CollectionItem collectionItem = GetCollection(Id);
-
-            if (collectionItem.BuildStatus != CollectionItem.CollectionBuildStatus.Building)
-            {
-                // set collection item to waitingforbuild
-                Database db = new 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);
-                dbDict.Add("bs", CollectionItem.CollectionBuildStatus.WaitingForBuild);
-                db.ExecuteCMD(sql, dbDict);
-
-                // start background task
-                ProcessQueue.QueueItem queueItem = new ProcessQueue.QueueItem(ProcessQueue.QueueItemType.CollectionCompiler, 1, false, true);
-                queueItem.Options = Id;
-                queueItem.ForceExecute();
-                ProcessQueue.QueueItems.Add(queueItem);
-            }
-        }
-
-        public static CollectionContents GetCollectionContent(CollectionItem collectionItem) {
-            List<CollectionContents.CollectionPlatformItem> collectionPlatformItems = new List<CollectionContents.CollectionPlatformItem>();
-
-            // get platforms
-            List<long> platformids = new List<long>();
-            platformids.AddRange(collectionItem.Platforms);
-
-            List<long>? DynamicPlatforms = new List<long>();
-            DynamicPlatforms.AddRange(collectionItem.Platforms);
-
-            List<Platform> platforms = new List<Platform>();
-
-            // add platforms with an inclusion status
-            foreach (CollectionItem.AlwaysIncludeItem alwaysIncludeItem in collectionItem.AlwaysInclude) 
-            {
-                if (
-                        alwaysIncludeItem.InclusionState == CollectionItem.AlwaysIncludeStatus.AlwaysInclude ||
-                        alwaysIncludeItem.InclusionState == CollectionItem.AlwaysIncludeStatus.AlwaysExclude
-                    )
-                    {
-                        if (!platformids.Contains(alwaysIncludeItem.PlatformId))
-                        {
-                            platformids.Add(alwaysIncludeItem.PlatformId);
-                        }
-                }
-            }
-
-            // add dynamic platforms
-            if (DynamicPlatforms.Count > 0) {
-                foreach (long PlatformId in platformids) {
-                    platforms.Add(Platforms.GetPlatform(PlatformId));
-                }
-            } else {
-                // get all platforms to pull from
-                Dictionary<string, List<Filters.FilterItem>> FilterDict = Filters.Filter(AgeGroups.AgeRestrictionGroupings.Adult, true);
-                List<Classes.Filters.FilterItem> filteredPlatforms = (List<Classes.Filters.FilterItem>)FilterDict["platforms"];
-                foreach (Filters.FilterItem filterItem in filteredPlatforms) {
-                    platforms.Add(Platforms.GetPlatform(filterItem.Id));
-                }
-            }
-
-            // build collection
-            List<CollectionContents.CollectionPlatformItem> platformItems = new List<CollectionContents.CollectionPlatformItem>();
-
-            foreach (Platform platform in platforms) {
-                long TotalRomSize = 0;
-                long TotalGameCount = 0;
-
-                bool isDynamic = false;
-                if (DynamicPlatforms.Contains((long)platform.Id))
-                {
-                    isDynamic = true;
-                }
-                else if (DynamicPlatforms.Count == 0)
-                {
-                    isDynamic = true;
-                }
-
-                List<Game> games = new List<Game>();
-                if (isDynamic == true)
-                {
-                    games = GamesController.GetGames("",
-                        platform.Id.ToString(),
-                        string.Join(",", collectionItem.Genres),
-                        string.Join(",", collectionItem.Players),
-                        string.Join(",", collectionItem.PlayerPerspectives),
-                        string.Join(",", collectionItem.Themes),
-                        collectionItem.MinimumRating,
-                        collectionItem.MaximumRating
-                    );
-                }
-
-                CollectionContents.CollectionPlatformItem collectionPlatformItem = new CollectionContents.CollectionPlatformItem(platform);
-                collectionPlatformItem.Games = new List<CollectionContents.CollectionPlatformItem.CollectionGameItem>();
-
-                // add titles with an inclusion status
-                foreach (CollectionItem.AlwaysIncludeItem alwaysIncludeItem in collectionItem.AlwaysInclude) 
-                {
-                    if (
-                        (
-                            alwaysIncludeItem.InclusionState == CollectionItem.AlwaysIncludeStatus.AlwaysInclude ||
-                            alwaysIncludeItem.InclusionState == CollectionItem.AlwaysIncludeStatus.AlwaysExclude
-                        ) && alwaysIncludeItem.PlatformId == platform.Id
-                        ) 
-                        {
-                            Game AlwaysIncludeGame = Games.GetGame(alwaysIncludeItem.GameId, false, false, false);
-                            CollectionContents.CollectionPlatformItem.CollectionGameItem gameItem = new CollectionContents.CollectionPlatformItem.CollectionGameItem(AlwaysIncludeGame);
-                            gameItem.InclusionStatus = new CollectionItem.AlwaysIncludeItem();
-                            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;
-
-                            collectionPlatformItem.Games.Add(gameItem);
-                    }
-                }
-
-                foreach (Game game in games) {
-                    bool gameAlreadyInList = false;
-                    foreach (CollectionContents.CollectionPlatformItem.CollectionGameItem existingGame in collectionPlatformItem.Games) 
-                    {
-                        if (existingGame.Id == game.Id) 
-                        {
-                            gameAlreadyInList = true;
-                        }
-                    }
-
-                    if (gameAlreadyInList == false)
-                    {
-                        CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem = new CollectionContents.CollectionPlatformItem.CollectionGameItem(game);
-
-                        List<Roms.GameRomItem> gameRoms = Roms.GetRoms((long)game.Id, (long)platform.Id).GameRomItems;
-                        
-                        bool AddGame = false;
-
-                        // calculate total rom size for the game
-                        long GameRomSize = 0;
-                        foreach (Roms.GameRomItem gameRom in gameRoms) {
-                            GameRomSize += (long)gameRom.Size;
-                        }
-                        if (collectionItem.MaximumBytesPerPlatform > 0) {
-                            if ((TotalRomSize + GameRomSize) < collectionItem.MaximumBytesPerPlatform) {
-                                AddGame = true;
-                            }
-                        }
-                        else 
-                        {
-                            AddGame = true;
-                        }
-
-                        if (AddGame == true) {
-                            TotalRomSize += GameRomSize;
-
-                            bool AddRoms = false;
-
-                            if (collectionItem.MaximumRomsPerPlatform > 0) { 
-                                if (TotalGameCount < collectionItem.MaximumRomsPerPlatform) {
-                                    AddRoms = true;
-                                }
-                            }
-                            else
-                            {
-                                AddRoms = true;
-                            }
-
-                            if (AddRoms == true) {
-                                TotalGameCount += 1;
-                                collectionGameItem.Roms = gameRoms;
-                                collectionPlatformItem.Games.Add(collectionGameItem);
-                            }
-                        }
-                    }
-                }
-
-                collectionPlatformItem.Games.Sort((x, y) => x.Name.CompareTo(y.Name));
-
-                if (collectionPlatformItem.Games.Count > 0)
-                {
-                    bool AddPlatform = false;
-                    if (collectionItem.MaximumCollectionSizeInBytes > 0)
-                    {
-                        if (TotalRomSize < collectionItem.MaximumCollectionSizeInBytes)
-                        {
-                            AddPlatform = true;
-                        }
-                    }
-                    else
-                    {
-                        AddPlatform = true;
-                    }
-
-                    if (AddPlatform == true)
-                    {
-                        collectionPlatformItems.Add(collectionPlatformItem);
-                    }
-                }
-            }
-
-            collectionPlatformItems.Sort((x, y) => x.Name.CompareTo(y.Name));
-
-            CollectionContents collectionContents = new CollectionContents();
-            collectionContents.Collection = collectionPlatformItems;
-
-            return collectionContents;
-        }
-
-        public static void CompileCollections(long CollectionId)
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-
-            CollectionItem collectionItem = GetCollection(CollectionId);
-            if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild)
-            {
-                Logging.Log(Logging.LogType.Information, "Collections", "Beginning build of collection: " + collectionItem.Name);
-
-                // set starting
-                string sql = "UPDATE RomCollections SET BuiltStatus=@bs WHERE Id=@id";
-                Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                dbDict.Add("id", collectionItem.Id);
-                dbDict.Add("bs", CollectionItem.CollectionBuildStatus.Building);
-                db.ExecuteCMD(sql, dbDict);
-
-                List<CollectionContents.CollectionPlatformItem> collectionPlatformItems = GetCollectionContent(collectionItem).Collection;
-                string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, collectionItem.Id + collectionItem.ArchiveExtension);
-                string ZipFileTempPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, collectionItem.Id.ToString());
-
-                try
-                {
-                    
-                    // clean up if needed
-                    if (File.Exists(ZipFilePath))
-                    {
-                        Logging.Log(Logging.LogType.Warning, "Collections", "Deleting existing build of collection: " + collectionItem.Name);
-                        File.Delete(ZipFilePath);
-                    }
-
-                    if (Directory.Exists(ZipFileTempPath))
-                    {
-                        Directory.Delete(ZipFileTempPath, true);
-                    }
-
-                    // gather collection files
-                    Directory.CreateDirectory(ZipFileTempPath);
-                    string ZipBiosPath = Path.Combine(ZipFileTempPath, "BIOS");
-
-                    // get the games
-                    foreach (CollectionContents.CollectionPlatformItem collectionPlatformItem in collectionPlatformItems)
-                    {
-                        // get platform bios files if present
-                        if (collectionItem.IncludeBIOSFiles == true)
-                        {
-                            List<Bios.BiosItem> bios = Bios.GetBios(collectionPlatformItem.Id, true);
-                            if (!Directory.Exists(ZipBiosPath)) {
-                                Directory.CreateDirectory(ZipBiosPath);
-                            }
-
-                            foreach (Bios.BiosItem biosItem in bios) 
-                            {
-                                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);
-                                }
-                            }
-                        }
-
-                        // create platform directory
-                        string ZipPlatformPath = "";
-                        switch (collectionItem.FolderStructure)
-                        {
-                            case CollectionItem.FolderStructures.Gaseous:
-                                ZipPlatformPath = Path.Combine(ZipFileTempPath, collectionPlatformItem.Slug);
-                                break;
-
-                            case CollectionItem.FolderStructures.RetroPie:
-                                try
-                                {
-                                    PlatformMapping.PlatformMapItem platformMapItem = PlatformMapping.GetPlatformMap(collectionPlatformItem.Id);
-                                    ZipPlatformPath = Path.Combine(ZipFileTempPath, "roms", platformMapItem.RetroPieDirectoryName);
-                                }
-                                catch
-                                {
-                                    ZipPlatformPath = Path.Combine(ZipFileTempPath, collectionPlatformItem.Slug);
-                                }
-
-                                break;
-
-                        }
-                        if (!Directory.Exists(ZipPlatformPath))
-                        {
-                            Directory.CreateDirectory(ZipPlatformPath);
-                        }
-
-                        foreach (CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem in collectionPlatformItem.Games)
-                        {
-                            bool includeGame = false;
-                            if (collectionGameItem.InclusionStatus == null)
-                            {
-                                includeGame = true;
-                            }
-                            else
-                            {
-                                if (collectionGameItem.InclusionStatus.InclusionState == CollectionItem.AlwaysIncludeStatus.AlwaysInclude)
-                                {
-                                    includeGame = true;
-                                }
-                            }
-
-                            if (includeGame == true)
-                            {
-                                string ZipGamePath = "";
-                                switch (collectionItem.FolderStructure)
-                                {
-                                    case CollectionItem.FolderStructures.Gaseous:
-                                        // create game directory
-                                        ZipGamePath = Path.Combine(ZipPlatformPath, collectionGameItem.Slug);
-                                        if (!Directory.Exists(ZipGamePath))
-                                        {
-                                            Directory.CreateDirectory(ZipGamePath);
-                                        }
-                                        break;
-
-                                    case CollectionItem.FolderStructures.RetroPie:
-                                        ZipGamePath = ZipPlatformPath;
-                                        break;
-                                }                                    
-                                
-                                // copy in roms
-                                foreach (Roms.GameRomItem gameRomItem in collectionGameItem.Roms)
-                                {
-                                    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);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // 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))
-                    {
-                        Logging.Log(Logging.LogType.Information, "Collections", "Cleaning up");
-                        Directory.Delete(ZipFileTempPath, true);
-                    }
-
-                    // set completed
-                    dbDict["bs"] = CollectionItem.CollectionBuildStatus.Completed;
-                    db.ExecuteCMD(sql, dbDict);
-                }
-                catch (Exception ex)
-                {
-                    // clean up
-                    if (Directory.Exists(ZipFileTempPath))
-                    {
-                        Directory.Delete(ZipFileTempPath, true);
-                    }
-
-                    if (File.Exists(ZipFilePath))
-                    {
-                        File.Delete(ZipFilePath);
-                    }
-
-                    // set failed
-                    dbDict["bs"] = CollectionItem.CollectionBuildStatus.Failed;
-                    db.ExecuteCMD(sql, dbDict);
-
-                    Logging.Log(Logging.LogType.Critical, "Collection Builder", "Collection building has failed", ex);
-                }
-            }
-        }
-
-        private static CollectionItem BuildCollectionItem(DataRow row) {
-            string strPlatforms = (string)Common.ReturnValueIfNull(row["Platforms"], "[ ]");
-            string strGenres = (string)Common.ReturnValueIfNull(row["Genres"], "[ ]");
-            string strPlayers = (string)Common.ReturnValueIfNull(row["Players"], "[ ]");
-            string strPlayerPerspectives = (string)Common.ReturnValueIfNull(row["PlayerPerspectives"], "[ ]");
-            string strThemes = (string)Common.ReturnValueIfNull(row["Themes"], "[ ]");
-            string strAlwaysInclude = (string)Common.ReturnValueIfNull(row["AlwaysInclude"], "[ ]");
-
-            CollectionItem item = new CollectionItem();
-            item.Id = (long)row["Id"];
-            item.Name = (string)row["Name"];
-            item.Description = (string)row["Description"];
-            item.Platforms = Newtonsoft.Json.JsonConvert.DeserializeObject<List<long>>(strPlatforms);
-            item.Genres = Newtonsoft.Json.JsonConvert.DeserializeObject<List<long>>(strGenres);
-            item.Players = Newtonsoft.Json.JsonConvert.DeserializeObject<List<long>>(strPlayers);
-            item.PlayerPerspectives = Newtonsoft.Json.JsonConvert.DeserializeObject<List<long>>(strPlayerPerspectives);
-            item.Themes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<long>>(strThemes);
-            item.MinimumRating = (int)Common.ReturnValueIfNull(row["MinimumRating"], -1);
-            item.MaximumRating = (int)Common.ReturnValueIfNull(row["MaximumRating"], -1);
-            item.MaximumRomsPerPlatform = (int)Common.ReturnValueIfNull(row["MaximumRomsPerPlatform"], (int)-1);
-            item.MaximumBytesPerPlatform = (long)Common.ReturnValueIfNull(row["MaximumBytesPerPlatform"], (long)-1);
-            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);
-
-            return item;
-        }
-
-        public class CollectionItem
-        {
-            public CollectionItem()
-            {
-
-            }
-
-            public long Id { get; set; }
-            public string Name { get; set; }
-            public string Description { get; set; }
-            public List<long>? Platforms { get; set; }
-            public List<long>? Genres { get; set; }
-            public List<long>? Players { get; set; }
-            public List<long>? PlayerPerspectives { get; set; }
-            public List<long>? Themes { get; set; }
-            public int MinimumRating { get; set; }
-            public int MaximumRating { get; set; }
-            public int? MaximumRomsPerPlatform { get; set; }
-            public long? MaximumBytesPerPlatform { get; set; }
-            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]
-            public CollectionBuildStatus BuildStatus
-            {
-                get
-                {
-                    if (_BuildStatus == CollectionBuildStatus.Completed)
-                    {
-                        if (File.Exists(Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ArchiveExtension)))
-                        {
-                            return CollectionBuildStatus.Completed;
-                        }
-                        else
-                        {
-                            return CollectionBuildStatus.NoStatus;
-                        }
-                    }
-                    else
-                    {
-                        return _BuildStatus;
-                    }
-                }
-                set
-                {
-                    _BuildStatus = value;
-                }
-            }
-            private CollectionBuildStatus _BuildStatus { get; set; }
-
-            [JsonIgnore]
-            public long CollectionBuiltSizeBytes
-            {
-                get
-                {
-                    if (BuildStatus == CollectionBuildStatus.Completed)
-                    {
-                        string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ArchiveExtension);
-                        if (File.Exists(ZipFilePath))
-                        {
-                            FileInfo fi = new FileInfo(ZipFilePath);
-                            return fi.Length;
-                        }
-                        else
-                        {
-                            return 0;
-                        }
-                    }
-                    else
-                    {
-                        return 0;
-                    }
-                }
-            }
-
-            public enum CollectionBuildStatus
-            {
-                NoStatus = 0,
-                WaitingForBuild = 1,
-                Building = 2,
-                Completed = 3,
-                Failed = 4
-            }
-
-            public enum FolderStructures
-            {
-                Gaseous = 0,
-                RetroPie = 1
-            }
-
-            public enum ArchiveTypes
-            {
-                Zip = 0,
-                RAR = 1,
-                SevenZip = 2
-            }
-
-            public class AlwaysIncludeItem
-            {
-                public long PlatformId { get; set; }
-                public long GameId { get; set; }
-                public AlwaysIncludeStatus InclusionState { get; set; }
-            }
-
-            public enum AlwaysIncludeStatus
-            {
-                None = 0,
-                AlwaysInclude = 1,
-                AlwaysExclude = 2
-            }
-        }
-
-        public class CollectionContents {
-            [JsonIgnore]
-            public List<CollectionPlatformItem> Collection { get; set; }
-
-            [JsonIgnore]
-            public long CollectionProjectedSizeBytes
-            {
-                get
-                {
-                    long CollectionSize = 0;
-
-                    List<CollectionPlatformItem> collectionPlatformItems = new List<CollectionPlatformItem>();
-
-                    if (Collection != null)
-                    {
-                        collectionPlatformItems = Collection;
-                    }
-
-                    foreach (CollectionPlatformItem platformItem in collectionPlatformItems)
-                    {
-                        CollectionSize += platformItem.RomSize;
-                    }
-
-                    return CollectionSize;
-                }
-            }
-
-            public class CollectionPlatformItem {
-                public CollectionPlatformItem(IGDB.Models.Platform platform) {
-                    string[] PropertyWhitelist = new string[] { "Id", "Name", "Slug" };
-
-                    PropertyInfo[] srcProperties = typeof(IGDB.Models.Platform).GetProperties();
-                    PropertyInfo[] dstProperties = typeof(CollectionPlatformItem).GetProperties();
-                    foreach (PropertyInfo srcProperty in srcProperties) {
-                        if (PropertyWhitelist.Contains<string>(srcProperty.Name))
-                        {
-                            foreach (PropertyInfo dstProperty in dstProperties)
-                            {
-                                if (srcProperty.Name == dstProperty.Name)
-                                {
-                                    dstProperty.SetValue(this, srcProperty.GetValue(platform));
-                                }
-                            }
-                        }
-                    }
-                }
-
-                public long Id { get; set; }
-                public string Name { get; set; }
-                public string Slug { get; set; }
-
-                public List<CollectionGameItem> Games { get; set; }
-
-                public int RomCount {
-                    get {
-                        int Counter = 0;
-                        foreach (CollectionGameItem Game in Games) {
-                            Counter += 1;
-                        }
-
-                        return Counter;
-                    }
-                }
-
-                public long RomSize {
-                    get {
-                        long Size = 0;
-                        foreach (CollectionGameItem Game in Games) {
-                            foreach (Roms.GameRomItem Rom in Game.Roms) {
-                                Size += (long)Rom.Size;
-                            }
-                        }
-
-                        return Size;
-                    }
-                }
-
-                public class CollectionGameItem {
-                    public CollectionGameItem(IGDB.Models.Game game) {
-                        string[] PropertyWhitelist = new string[] { "Id", "Name", "Slug", "Cover" };
-                        PropertyInfo[] srcProperties = typeof(IGDB.Models.Game).GetProperties();
-                        PropertyInfo[] dstProperties = typeof(CollectionPlatformItem.CollectionGameItem).GetProperties();
-                        foreach (PropertyInfo srcProperty in srcProperties) {
-                            if (PropertyWhitelist.Contains<string>(srcProperty.Name))
-                            {
-                                foreach (PropertyInfo dstProperty in dstProperties)
-                                {
-                                    if (srcProperty.Name == dstProperty.Name)
-                                    {
-                                        if (srcProperty.GetValue(game) != null) {
-                                            string compareName = srcProperty.PropertyType.Name.ToLower().Split("`")[0];
-                                            switch(compareName) {
-                                                case "identityorvalue":
-                                                    string newObjectValue = Newtonsoft.Json.JsonConvert.SerializeObject(srcProperty.GetValue(game));
-                                                    Dictionary<string, object> newDict = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(newObjectValue);
-                                                    dstProperty.SetValue(this, newDict["Id"]);
-                                                    break;
-                                                default:
-                                                    dstProperty.SetValue(this, srcProperty.GetValue(game));
-                                                    break;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    public long Id { get; set; }
-                    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; }
-
-                    public List<Roms.GameRomItem> Roms { get; set; }
-
-                    public long RomSize {
-                    get {
-                        long Size = 0;
-                        foreach (Roms.GameRomItem Rom in Roms) {
-                            Size += (long)Rom.Size;
-                        }
-                    
-                        return Size;
-                    }
-                }
-                }
-            }
-        }
-    }
-}

gaseous-server/Classes/Database.cs

@@ -1,476 +0,0 @@
-using System;
-using System.Data;
-using System.Data.SqlClient;
-using System.Diagnostics;
-using System.Reflection;
-using MySqlConnector;
-
-namespace gaseous_server.Classes
-{
-	public class Database
-	{
-		public Database()
-		{
-
-		}
-
-		public Database(databaseType Type, string ConnectionString)
-		{
-			_ConnectorType = Type;
-			_ConnectionString = ConnectionString;
-		}
-
-		public enum databaseType
-		{
-			MySql
-		}
-
-		string _ConnectionString = "";
-
-		public string ConnectionString
-		{
-			get
-			{
-				return _ConnectionString;
-			}
-			set
-			{
-				_ConnectionString = value;
-			}
-		}
-
-		databaseType? _ConnectorType = null;
-
-		public databaseType? ConnectorType
-		{
-			get
-			{
-				return _ConnectorType;
-			}
-			set
-			{
-				_ConnectorType = value;
-			}
-		}
-
-		public void InitDB()
-		{
-            // load resources
-            var assembly = Assembly.GetExecutingAssembly();
-
-            switch (_ConnectorType)
-			{
-				case databaseType.MySql:
-					// check if the database exists first - first run must have permissions to create a database
-					string sql = "CREATE DATABASE IF NOT EXISTS `" + Config.DatabaseConfiguration.DatabaseName + "`;";
-					Dictionary<string, object> dbDict = new Dictionary<string, object>();
-					Logging.Log(Logging.LogType.Information, "Database", "Creating database if it doesn't exist");
-					ExecuteCMD(sql, dbDict, 30, "server=" + Config.DatabaseConfiguration.HostName + ";port=" + Config.DatabaseConfiguration.Port + ";userid=" + Config.DatabaseConfiguration.UserName + ";password=" + Config.DatabaseConfiguration.Password);
-
-					// check if schema version table is in place - if not, create the schema version table
-					sql = "SELECT TABLE_SCHEMA, TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" + Config.DatabaseConfiguration.DatabaseName + "' AND TABLE_NAME = 'schema_version';";
-					DataTable SchemaVersionPresent = ExecuteCMD(sql, dbDict);
-					if (SchemaVersionPresent.Rows.Count == 0)
-					{
-                        // no schema table present - create it
-                        Logging.Log(Logging.LogType.Information, "Database", "Schema version table doesn't exist. Creating it.");
-                        sql = "CREATE TABLE `schema_version` (`schema_version` INT NOT NULL, PRIMARY KEY (`schema_version`)); INSERT INTO `schema_version` (`schema_version`) VALUES (0);";
-						ExecuteCMD(sql, dbDict);
-					}
-
-                    for (int i = 1000; i < 10000; i++)
-					{
-						string resourceName = "gaseous_server.Support.Database.MySQL.gaseous-" + i + ".sql";
-						string dbScript = "";
-
-						string[] resources = Assembly.GetExecutingAssembly().GetManifestResourceNames();
-						if (resources.Contains(resourceName))
-						{
-							using (Stream stream = assembly.GetManifestResourceStream(resourceName))
-							using (StreamReader reader = new StreamReader(stream))
-							{
-                                dbScript = reader.ReadToEnd();
-
-								// apply script
-								sql = "SELECT schema_version FROM schema_version;";
-								dbDict = new Dictionary<string, object>();
-								DataTable SchemaVersion = ExecuteCMD(sql, dbDict);
-								if (SchemaVersion.Rows.Count == 0)
-								{
-                                    // something is broken here... where's the table?
-                                    Logging.Log(Logging.LogType.Critical, "Database", "Schema table missing! This shouldn't happen!");
-                                    throw new Exception("schema_version table is missing!");
-								}
-								else
-								{
-									int SchemaVer = (int)SchemaVersion.Rows[0][0];
-                                    Logging.Log(Logging.LogType.Information, "Database", "Schema version is " + SchemaVer);
-                                    if (SchemaVer < i)
-									{
-										try
-										{
-											// run pre-upgrade code
-											DatabaseMigration.PreUpgradeScript(i, _ConnectorType);
-											
-											// apply schema!
-											Logging.Log(Logging.LogType.Information, "Database", "Updating schema to version " + i);
-											ExecuteCMD(dbScript, dbDict, 180);
-
-											sql = "UPDATE schema_version SET schema_version=@schemaver";
-											dbDict = new Dictionary<string, object>();
-											dbDict.Add("schemaver", i);
-											ExecuteCMD(sql, dbDict);
-
-											// run post-upgrade code
-											DatabaseMigration.PostUpgradeScript(i, _ConnectorType);
-										}
-										catch (Exception ex)
-										{
-											Logging.Log(Logging.LogType.Critical, "Database", "Schema upgrade failed! Unable to continue.", ex);
-											System.Environment.Exit(1);
-										}
-									}
-								}
-							}
-						}
-                    }
-                    Logging.Log(Logging.LogType.Information, "Database", "Database setup complete");
-                    break;
-			}
-		}
-
-        public DataTable ExecuteCMD(string Command)
-		{
-			Dictionary<string, object> dbDict = new Dictionary<string, object>();
-			return _ExecuteCMD(Command, dbDict, 30, "");
-		}
-
-        public DataTable ExecuteCMD(string Command, Dictionary<string, object> Parameters)
-        {
-            return _ExecuteCMD(Command, Parameters, 30, "");
-        }
-
-        public DataTable ExecuteCMD(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-        {
-			return _ExecuteCMD(Command, Parameters, Timeout, ConnectionString);
-        }
-
-		public List<Dictionary<string, object>> ExecuteCMDDict(string Command)
-		{
-			Dictionary<string, object> dbDict = new Dictionary<string, object>();
-			return _ExecuteCMDDict(Command, dbDict, 30, "");
-		}
-
-        public List<Dictionary<string, object>> ExecuteCMDDict(string Command, Dictionary<string, object> Parameters)
-        {
-            return _ExecuteCMDDict(Command, Parameters, 30, "");
-        }
-
-        public List<Dictionary<string, object>> ExecuteCMDDict(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-        {
-			return _ExecuteCMDDict(Command, Parameters, Timeout, ConnectionString);
-        }
-
-		private List<Dictionary<string, object>> _ExecuteCMDDict(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-		{
-			DataTable dataTable = _ExecuteCMD(Command, Parameters, Timeout, ConnectionString);
-
-			// convert datatable to dictionary
-			List<Dictionary<string, object?>> rows = new List<Dictionary<string, object?>>();
-
-			foreach (DataRow dataRow in dataTable.Rows)
-			{
-				Dictionary<string, object?> row = new Dictionary<string, object?>();
-				for (int i = 0; i < dataRow.Table.Columns.Count; i++)
-				{
-					string columnName = dataRow.Table.Columns[i].ColumnName;
-					if (dataRow[i] == System.DBNull.Value)
-					{
-						row.Add(columnName, null);
-					}
-					else
-					{
-						row.Add(columnName, dataRow[i].ToString());
-					}
-				}
-				rows.Add(row);
-			}
-
-			return rows;
-		}
-
-        private DataTable _ExecuteCMD(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-        {
-            if (ConnectionString == "") { ConnectionString = _ConnectionString; }
-            switch (_ConnectorType)
-            {
-                case databaseType.MySql:
-                    MySQLServerConnector conn = new MySQLServerConnector(ConnectionString);
-                    return (DataTable)conn.ExecCMD(Command, Parameters, Timeout);
-                default:
-                    return new DataTable();
-            }
-        }
-
-		public int ExecuteNonQuery(string Command)
-		{
-			Dictionary<string, object> dbDict = new Dictionary<string, object>();
-			return _ExecuteNonQuery(Command, dbDict, 30, "");
-		}
-
-        public int ExecuteNonQuery(string Command, Dictionary<string, object> Parameters)
-        {
-            return _ExecuteNonQuery(Command, Parameters, 30, "");
-        }
-
-        public int ExecuteNonQuery(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-        {
-			return _ExecuteNonQuery(Command, Parameters, Timeout, ConnectionString);
-        }
-
-        private int _ExecuteNonQuery(string Command, Dictionary<string, object> Parameters, int Timeout = 30, string ConnectionString = "")
-        {
-            if (ConnectionString == "") { ConnectionString = _ConnectionString; }
-            switch (_ConnectorType)
-            {
-                case databaseType.MySql:
-                    MySQLServerConnector conn = new MySQLServerConnector(ConnectionString);
-					int retVal = conn.ExecNonQuery(Command, Parameters, Timeout); 
-                    return retVal;
-                default:
-                    return 0;
-            }
-        }
-
-        public void ExecuteTransactionCMD(List<SQLTransactionItem> CommandList, int Timeout = 60)
-        {
-            object conn;
-            switch (_ConnectorType)
-            {
-                case databaseType.MySql:
-                    {
-                        var commands = new List<Dictionary<string, object>>();
-                        foreach (SQLTransactionItem CommandItem in CommandList)
-                        {
-                            var nCmd = new Dictionary<string, object>();
-                            nCmd.Add("sql", CommandItem.SQLCommand);
-                            nCmd.Add("values", CommandItem.Parameters);
-                            commands.Add(nCmd);
-                        }
-
-                        conn = new MySQLServerConnector(_ConnectionString);
-                        ((MySQLServerConnector)conn).TransactionExecCMD(commands, Timeout);
-                        break;
-                    }
-            }
-        }
-
-		public int GetDatabaseSchemaVersion()
-		{
-			switch (_ConnectorType)
-			{
-				case databaseType.MySql:
-					string sql = "SELECT schema_version FROM schema_version;";
-					DataTable SchemaVersion = ExecuteCMD(sql);
-					if (SchemaVersion.Rows.Count == 0)
-					{
-						return 0;
-					}
-					else
-					{
-						return (int)SchemaVersion.Rows[0][0];
-					}
-					
-				default:
-					return 0;
-
-			}
-		}
-
-		public bool TestConnection()
-		{
-			switch (_ConnectorType)
-            {
-                case databaseType.MySql:
-                    MySQLServerConnector conn = new MySQLServerConnector(_ConnectionString);
-                    return conn.TestConnection();
-                default:
-                    return false;
-            }
-		}
-
-        public class SQLTransactionItem
-        {
-			public SQLTransactionItem()
-			{
-
-			}
-
-			public SQLTransactionItem(string SQLCommand, Dictionary<string, object> Parameters)
-			{
-				this.SQLCommand = SQLCommand;
-				this.Parameters = Parameters;
-			}
-
-            public string? SQLCommand;
-            public Dictionary<string, object>? Parameters = new Dictionary<string, object>();
-        }
-
-        private partial class MySQLServerConnector
-		{
-			private string DBConn = "";
-
-			public MySQLServerConnector(string ConnectionString)
-			{
-				DBConn = ConnectionString;
-			}
-
-			public DataTable ExecCMD(string SQL, Dictionary<string, object> Parameters, int Timeout)
-			{
-				DataTable RetTable = new DataTable();
-
-                Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
-                using (MySqlConnection conn = new MySqlConnection(DBConn))
-				{
-					conn.Open();
-
-					MySqlCommand cmd = new MySqlCommand
-					{
-						Connection = conn,
-						CommandText = SQL,
-						CommandTimeout = Timeout
-					};
-
-					foreach (string Parameter in Parameters.Keys)
-					{
-						cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
-					}
-
-					try
-					{
-						Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
-						if (Parameters.Count > 0)
-						{
-							string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value)));
-							Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
-						}
-						RetTable.Load(cmd.ExecuteReader());
-					} catch (Exception ex) {
-						Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
-						Trace.WriteLine("Error executing " + SQL);
-						Trace.WriteLine("Full exception: " + ex.ToString());
-					}
-
-					Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true);
-					conn.Close();
-				}
-
-				return RetTable;
-			}
-
-			public int ExecNonQuery(string SQL, Dictionary< string, object> Parameters, int Timeout)
-			{
-				int result = 0;
-
-                Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
-                using (MySqlConnection conn = new MySqlConnection(DBConn))
-				{
-					conn.Open();
-
-					MySqlCommand cmd = new MySqlCommand
-					{
-						Connection = conn,
-						CommandText = SQL,
-						CommandTimeout = Timeout
-					};
-
-					foreach (string Parameter in Parameters.Keys)
-					{
-						cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
-					}
-
-					try
-					{
-						Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
-						if (Parameters.Count > 0)
-						{
-							string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value)));
-							Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
-						}
-						result = cmd.ExecuteNonQuery();
-					} catch (Exception ex) {
-						Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
-						Trace.WriteLine("Error executing " + SQL);
-						Trace.WriteLine("Full exception: " + ex.ToString());
-					}
-
-					Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true);
-					conn.Close();
-				}
-
-				return result;
-			}
-
-            public void TransactionExecCMD(List<Dictionary<string, object>> Parameters, int Timeout)
-            {
-                using (MySqlConnection conn = new MySqlConnection(DBConn))
-                {
-					conn.Open();
-					var command = conn.CreateCommand();
-					MySqlTransaction transaction;
-					transaction = conn.BeginTransaction();
-					command.Connection = conn;
-					command.Transaction = transaction;
-					foreach (Dictionary<string, object> Parameter in Parameters)
-					{
-						var cmd = buildcommand(conn, Parameter["sql"].ToString(), (Dictionary<string, object>)Parameter["values"], Timeout);
-						cmd.Transaction = transaction;
-						cmd.ExecuteNonQuery();
-					}
-
-					transaction.Commit();
-					conn.Close();
-				}
-            }
-
-            private MySqlCommand buildcommand(MySqlConnection Conn, string SQL, Dictionary<string, object> Parameters, int Timeout)
-            {
-                var cmd = new MySqlCommand();
-                cmd.Connection = Conn;
-                cmd.CommandText = SQL;
-                cmd.CommandTimeout = Timeout;
-                {
-                    var withBlock = cmd.Parameters;
-                    if (Parameters is object)
-                    {
-                        if (Parameters.Count > 0)
-                        {
-                            foreach (string param in Parameters.Keys)
-                                withBlock.AddWithValue(param, Parameters[param]);
-                        }
-                    }
-                }
-
-                return cmd;
-            }
-
-			public bool TestConnection()
-			{
-				using (MySqlConnection conn = new MySqlConnection(DBConn))
-				{
-					try
-					{
-						conn.Open();
-						conn.Close();
-						return true;
-					}
-					catch
-					{
-						return false;
-					}
-				}
-			}
-        }
-    }
-}
-

gaseous-server/Classes/DatabaseMigration.cs

@@ -1,163 +0,0 @@
-using System;
-using System.Data;
-
-namespace gaseous_server.Classes
-{
-	public static class DatabaseMigration
-	{
-        public static List<int> BackgroundUpgradeTargetSchemaVersions = new List<int>();
-
-        public static void PreUpgradeScript(int TargetSchemaVersion, Database.databaseType? DatabaseType) 
-        {
-
-        }
-
-        public static void PostUpgradeScript(int TargetSchemaVersion, Database.databaseType? DatabaseType) 
-        {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-
-            switch(DatabaseType)
-            {
-                case Database.databaseType.MySql:
-                    switch (TargetSchemaVersion)
-                    {
-                        case 1002:
-                            // this is a safe background task
-                            BackgroundUpgradeTargetSchemaVersions.Add(1002);
-                            break;
-                        
-                        case 1004:
-                            // needs to run on start up
-
-                            // copy root path to new libraries format
-                            string oldRoot = Path.Combine(Config.LibraryConfiguration.LibraryRootDirectory, "Library");
-                            string sql = "INSERT INTO GameLibraries (Name, Path, DefaultLibrary, DefaultPlatform) VALUES (@name, @path, @defaultlibrary, @defaultplatform); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-                            dbDict.Add("name", "Default");
-                            dbDict.Add("path", oldRoot);
-                            dbDict.Add("defaultlibrary", 1);
-                            dbDict.Add("defaultplatform", 0);
-                            DataTable data = db.ExecuteCMD(sql, dbDict);
-
-                            // apply the new library id to the existing roms
-                            sql = "UPDATE Games_Roms SET LibraryId=@libraryid;";
-                            dbDict.Clear();
-                            dbDict.Add("libraryid", data.Rows[0][0]);
-                            db.ExecuteCMD(sql, dbDict);
-                            break;
-
-                    }
-                    break;
-            }
-        }
-
-        public static void UpgradeScriptBackgroundTasks()
-        {
-            foreach (int TargetSchemaVersion in BackgroundUpgradeTargetSchemaVersions)
-            {
-                switch (TargetSchemaVersion)
-                {
-                    case 1002:
-                        MySql_1002_MigrateMetadataVersion();
-                        break;
-                }
-            }
-        }
-
-        public static void MySql_1002_MigrateMetadataVersion() {
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-
-            // update signature roms to v2
-            sql = "SELECT Id, Flags, Attributes, IngestorVersion FROM Signatures_Roms WHERE IngestorVersion = 1";
-            DataTable data = db.ExecuteCMD(sql);
-            if (data.Rows.Count > 0)
-            {
-                Logging.Log(Logging.LogType.Information, "Signature Ingestor - Database Update", "Updating " + data.Rows.Count + " database entries");
-                int Counter = 0;
-                int LastCounterCheck = 0;
-                foreach (DataRow row in data.Rows) 
-                {
-                    List<string> Flags = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>((string)Common.ReturnValueIfNull(row["flags"], "[]"));
-                    List<KeyValuePair<string, object>> Attributes = new List<KeyValuePair<string, object>>();
-                    foreach (string Flag in Flags)
-                    {
-                        if (Flag.StartsWith("a"))
-                        {
-                            Attributes.Add(
-                                new KeyValuePair<string, object>(
-                                    "a",
-                                    Flag
-                                )
-                            );
-                        }
-                        else
-                        {
-                            string[] FlagCompare = Flag.Split(' ');
-                            switch (FlagCompare[0].Trim().ToLower())
-                            {
-                                case "cr":
-                                // cracked
-                                case "f":
-                                // fixed
-                                case "h":
-                                // hacked
-                                case "m":
-                                // modified
-                                case "p":
-                                // pirated
-                                case "t":
-                                // trained
-                                case "tr":
-                                // translated
-                                case "o":
-                                // overdump
-                                case "u":
-                                // underdump
-                                case "v":
-                                // virus
-                                case "b":
-                                // bad dump
-                                case "a":
-                                // alternate
-                                case "!":
-                                    // known verified dump
-                                    // -------------------
-                                    string shavedToken = Flag.Substring(FlagCompare[0].Trim().Length).Trim();
-                                    Attributes.Add(new KeyValuePair<string, object>(
-                                        FlagCompare[0].Trim().ToLower(),
-                                        shavedToken
-                                    ));
-                                    break;
-                            }
-                        }
-                    }
-
-                    string AttributesJson;
-                    if (Attributes.Count > 0)
-                    {
-                        AttributesJson = Newtonsoft.Json.JsonConvert.SerializeObject(Attributes);
-                    }
-                    else
-                    {
-                        AttributesJson = "[]";
-                    }
-
-                    string updateSQL = "UPDATE Signatures_Roms SET Attributes=@attributes, IngestorVersion=2 WHERE Id=@id";
-                    dbDict = new Dictionary<string, object>();
-                    dbDict.Add("attributes", AttributesJson);
-                    dbDict.Add("id", (int)row["Id"]);
-                    db.ExecuteCMD(updateSQL, dbDict);
-
-                    if ((Counter - LastCounterCheck) > 10) 
-                    {
-                        LastCounterCheck = Counter;
-                        Logging.Log(Logging.LogType.Information, "Signature Ingestor - Database Update", "Updating " + Counter + " / " + data.Rows.Count + " database entries");
-                    }
-                    Counter += 1;
-                }
-            }
-        }
-    }
-}

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,29 @@
 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_server.Models;
-using IGDB.Models;
-using NuGet.Common;
-using NuGet.LibraryModel;
+using gaseous_tools;
+using MySqlX.XDevAPI;
+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);
-
-                Logging.Log(Logging.LogType.Information, "Import Games", "Found " + importContents.Length + " files to process in import directory: " + ImportPath);
+				string[] importContents_Files = Directory.GetFiles(ImportPath);
+                string[] importContents_Directories = Directory.GetDirectories(ImportPath);
 
 				// import files first
-                int importCount = 1;
-				foreach (string importContent in importContents) {
-                    SetStatus(importCount, importContents.Length, "Importing file: " + importContent);
-
-					ImportGameFile(importContent, null);
-
-                    importCount += 1;
+				foreach (string importContent in importContents_Files) {
+					ImportGame.ImportGameFile(importContent);
 				}
-                ClearStatus();
-
-                DeleteOrphanedDirectories(ImportPath);
             }
 			else
 			{
@@ -46,17 +32,29 @@ 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, bool IsDirectory = false, bool ForceImport = false)
+		{
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 
-            if (Common.SkippableFiles.Contains<string>(Path.GetFileName(GameFileImportPath), StringComparer.OrdinalIgnoreCase))
+			string[] SkippableFiles = {
+				".DS_STORE",
+				"desktop.ini"
+			};
+            if (SkippableFiles.Contains<string>(Path.GetFileName(GameFileImportPath), StringComparer.OrdinalIgnoreCase))
 			{ 
                 Logging.Log(Logging.LogType.Debug, "Import Game", "Skipping item " + GameFileImportPath);
             }
 			else
+			{
+				//Logging.Log(Logging.LogType.Information, "Import Game", "Processing item " + GameFileImportPath);
+				if (IsDirectory == false)
 				{
 					FileInfo fi = new FileInfo(GameFileImportPath);
                     Common.hashObject hash = new Common.hashObject(GameFileImportPath);
@@ -73,55 +71,28 @@ 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);
-
-                            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");
+                                Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping");
                             }
                         }
                         else
                         {
                             Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
 
-                        FileSignature fileSignature = new FileSignature();
-                        gaseous_server.Models.Signatures_Games discoveredSignature = fileSignature.GetFileSignature(GameLibrary.GetDefaultLibrary, hash, fi, GameFileImportPath);
+                            Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
 
                             // get discovered platform
-                        IGDB.Models.Platform? determinedPlatform = null;
-                        if (OverridePlatform == null)
-                        {
-                            determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
+                            IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
                             if (determinedPlatform == null)
                             {
                                 determinedPlatform = new IGDB.Models.Platform();
                             }
-                        }
-                        else
-                        {
-                            determinedPlatform = OverridePlatform;
-                            discoveredSignature.Flags.IGDBPlatformId = (long)determinedPlatform.Id;
-                            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 +119,139 @@ 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.LibraryRootDirectory, "Temp", 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
-                    try
+                    FileInfo zfi = new FileInfo(file);
+                    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);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logging.Log(Logging.LogType.Warning, "Import Game", "Provided game id resulted in a failed game lookup", ex);
-                    }
+                        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 = Models.Signatures_Games.RomItem.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)
@@ -195,17 +275,6 @@ namespace gaseous_server.Classes
                     else if (games.Length > 0)
                     {
                         Logging.Log(Logging.LogType.Information, "Import Game", "  " + games.Length + " search results found");
-
-                        // quite likely we've found sequels and alternate types
-                        foreach (Game game in games) {
-                            if (game.Name == SearchCandidate) {
-                                // found game title matches the search candidate
-                                determinedGame = Metadata.Games.GetGame((long)games[0].Id, false, false, false);
-                                Logging.Log(Logging.LogType.Information, "Import Game", "Found exact match!");
-                                GameFound = true;
-                                break;
-                            }
-                        }
                     }
                     else
                     {
@@ -271,17 +340,11 @@ namespace gaseous_server.Classes
             GameName = Regex.Replace(GameName, @"v(\d+\.)?(\d+\.)?(\*|\d+)$", "").Trim();
             GameName = Regex.Replace(GameName, @"Rev (\d+\.)?(\d+\.)?(\*|\d+)$", "").Trim();
 
-            // assumption: no games have () in their titles so we'll remove them
-            int idx = GameName.IndexOf('(');
-            if (idx >= 0) {
-                GameName = GameName.Substring(0, idx);
-            }
-
             List<string> SearchCandidates = new List<string>();
-            SearchCandidates.Add(GameName.Trim());
+            SearchCandidates.Add(GameName);
             if (GameName.Contains(" - "))
             {
-                SearchCandidates.Add(GameName.Replace(" - ", ": ").Trim());
+                SearchCandidates.Add(GameName.Replace(" - ", ": "));
                 SearchCandidates.Add(GameName.Substring(0, GameName.IndexOf(" - ")).Trim());
             }
             if (GameName.Contains(": "))
@@ -294,9 +357,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 +367,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, Flags, RomType, RomTypeMedia, MediaLabel, Path, MetadataSource) VALUES (@platformid, @gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @flags, @romtype, @romtypemedia, @medialabel, @path, @metadatasource); 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, Flags=@flags, RomType=@romtype, RomTypeMedia=@romtypemedia, MediaLabel=@medialabel, MetadataSource=@metadatasource WHERE Id=@id;";
                 dbDict.Add("id", UpdateId);
             }
             dbDict.Add("platformid", Common.ReturnValueIfNull(determinedPlatform.Id, 0));
@@ -319,24 +382,21 @@ namespace gaseous_server.Classes
             dbDict.Add("crc", Common.ReturnValueIfNull(discoveredSignature.Rom.Crc, ""));
             dbDict.Add("developmentstatus", Common.ReturnValueIfNull(discoveredSignature.Rom.DevelopmentStatus, ""));
             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)
+            if (discoveredSignature.Rom.flags != null)
             {
-                if (discoveredSignature.Rom.Attributes.Count > 0)
+                if (discoveredSignature.Rom.flags.Count > 0)
                 {
-                    dbDict.Add("attributes", Newtonsoft.Json.JsonConvert.SerializeObject(discoveredSignature.Rom.Attributes));
+                    dbDict.Add("flags", Newtonsoft.Json.JsonConvert.SerializeObject(discoveredSignature.Rom.flags));
                 }
                 else
                 {
-                    dbDict.Add("attributes", "[ ]");
+                    dbDict.Add("flags", "[ ]");
                 }
             }
             else
             {
-                dbDict.Add("attributes", "[ ]");
+                dbDict.Add("flags", "[ ]");
             }
             dbDict.Add("romtype", (int)discoveredSignature.Rom.RomType);
             dbDict.Add("romtypemedia", Common.ReturnValueIfNull(discoveredSignature.Rom.RomTypeMedia, ""));
@@ -354,10 +414,7 @@ namespace gaseous_server.Classes
             }
 
             // move to destination
-            if (library.IsDefaultLibrary == true)
-            {
             MoveGameFile(romId);
-            }
 
             return romId;
         }
@@ -381,7 +438,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 +476,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 +494,14 @@ namespace gaseous_server.Classes
             }
         }
 
-		public void OrganiseLibrary()
+		public static void OrganiseLibrary()
 		{
-            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting default library organisation");
-
-            GameLibrary.LibraryItem library = GameLibrary.GetDefaultLibrary;
+            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting library organisation");
 
             // move rom files to their new location
-            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM Games_Roms WHERE LibraryId = @libraryid";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("libraryid", library.Id);
-            DataTable romDT = db.ExecuteCMD(sql, dbDict);
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM Games_Roms";
+            DataTable romDT = db.ExecuteCMD(sql);
 
             if (romDT.Rows.Count > 0)
 			{
@@ -461,121 +514,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);
-
-                string[] files = Directory.GetFiles(directory);
-                string[] directories = Directory.GetDirectories(directory);
-                
-                if (files.Length == 0 &&
-                    directories.Length == 0)
+                if (Directory.GetFiles(directory).Length == 0 &&
+                    Directory.GetDirectories(directory).Length == 0)
                 {
                     Directory.Delete(directory, false);
                 }
             }
         }
 
-        public void LibraryScan(GameLibrary.LibraryItem? singleLibrary = null)
+        public static void LibraryScan()
         {
-            int maxWorkers = Config.MetadataConfiguration.MaxLibraryScanWorkers;
-
-            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);
+            Logging.Log(Logging.LogType.Information, "Library Scan", "Starting library scan");
 
             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;";
-            Dictionary<string, object> dupDict = new Dictionary<string, object>();
-            dupDict.Add("libraryid", library.Id);
-            db.ExecuteCMD(duplicateSql, dupDict);
+            string duplicateSql = "DELETE r1 FROM Games_Roms r1 INNER JOIN Games_Roms r2 WHERE r1.Id > r2.Id AND r1.MD5 = r2.MD5;";
+            db.ExecuteCMD(duplicateSql);
 
-            string sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
-            dbDict.Add("libraryid", library.Id);
-            DataTable dtRoms = db.ExecuteCMD(sql, dbDict);
+            string sql = "SELECT * FROM Games_Roms ORDER BY `name`";
+            DataTable dtRoms = db.ExecuteCMD(sql);
 
             // clean out database entries in the import folder
             if (dtRoms.Rows.Count > 0)
@@ -585,29 +553,24 @@ 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";
+                        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";
                         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`";
-            dtRoms = db.ExecuteCMD(sql, dbDict);
+            sql = "SELECT * FROM Games_Roms ORDER BY `name`";
+            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);
-            int StatusCount = 0;
+            string[] LibraryFiles = Directory.GetFiles(Config.LibraryConfiguration.LibraryDataDirectory, "*.*", SearchOption.AllDirectories);
             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 +592,91 @@ 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();
-                        gaseous_server.Models.Signatures_Games sig = fileSignature.GetFileSignature(library, hash, fi, LibraryFile);
+                    Models.Signatures_Games sig = GetFileSignature(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;
-                            
-                            if (sig.Flags.IGDBPlatformId == null || sig.Flags.IGDBPlatformId == 0 )
+                    IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(sig.Flags.IGDBPlatformId);
+                    if (determinedPlatform == null)
                     {
-                                // no platform discovered in the signature
-                                PlatformId = library.DefaultPlatformId;
+                        determinedPlatform = new IGDB.Models.Platform();
                     }
-                            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);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logging.Log(Logging.LogType.Warning, "Library Scan", "An error occurred while matching orphaned file: " + LibraryFile + ". Skipping.", ex);
+                    StoreROM(hash, determinedGame, determinedPlatform, sig, LibraryFile);
                 }
             }
-                }
-                StatusCount += 1;
-            }
-            ClearStatus();
 
-            sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
-            dtRoms = db.ExecuteCMD(sql, dbDict);
+            sql = "SELECT * FROM Games_Roms ORDER BY `name`";
+            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"];
+                    Classes.Roms.GameRomItem.SourceType romMetadataSource = (Classes.Roms.GameRomItem.SourceType)(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);
+                    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 == Roms.GameRomItem.SourceType.None)
                         {
+                            Common.hashObject hash = new Common.hashObject
+                            {
+                                md5hash = "",
+                                sha1hash = ""
+                            };
+                            FileInfo fi = new FileInfo(romPath);
+
+                            Models.Signatures_Games sig = GetFileSignature(hash, fi, romPath);
+                            if (sig.Rom.SignatureSource != Models.Signatures_Games.RomItem.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);
+                        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; }
-        }
-    }
-}
-