Fixed typo in rematcher code (#192)

* Include ROM's without a signature match in rematcher efforts

* Rematcher will now execute on all titles if manually started

* Fixed typo in rematcher code

.github/workflows/BuildDockerOnTag-Prerelease.yml

@@ -0,0 +1,38 @@
+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-Release.yml

@@ -1,39 +1,34 @@
-name: Build Docker Image on New Tag
+name: Build Release Docker Image
 
 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
-        name: Install dotnet tool
         run: dotnet tool install -g dotnetCampus.TagToVersion
-      -
+      - name: Set tag to version  
-        name: Set tag to version  
         run: dotnet TagToVersion -t ${{ github.ref }}
-      -
+      - name: Sign in to Nuget
-        name: Set up QEMU
+        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
-        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

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

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

Gaseous.sln

@@ -1,18 +1,8 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 25.0.1704.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-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}"
@@ -37,34 +27,14 @@ 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,6 +1,14 @@
 # Gaseous Server
 
-This is the server for the Gaseous system. All your games and metadata are stored within.
+This is the server for the Gaseous system. It offers ROM and title management, as well as some basic in browser emulation of those ROM's.
+
+## Warning
+
+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**.
 
 ## Screenshots
 ![Library](./screenshots/Library.png)
@@ -8,7 +16,10 @@ This is the server for the Gaseous system. All your games and metadata are store
 ![Emulator](./screenshots/Emulator.png)
 
 ## Requirements
-* MySQL Server 8+
+* 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.
 * Internet Game Database API Key. See: https://api-docs.igdb.com/#account-creation
 
 ## Third Party Projects
@@ -22,6 +33,8 @@ The following projects are used by Gaseous
 ## 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).
 
@@ -54,51 +67,116 @@ When Gaseous-Server is started for the first time, it creates a configuration fi
   },
   "LoggingConfiguration": {
     "DebugLogging": false,
-    "LogFormat": "text"
+    "LogRetention": 7
   }
 }
 
 ```
 
-## Deploy with Docker
+## Docker
+### Deploy with the prebuilt Docker image
 Dockerfile and docker-compose.yml files have been provided to make deployment of the server as easy as possible.
-1. Download the docker-compose.yml file
+1. Download the docker-compose-{database}.yml file for the database type you would like to use.
 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 with Docker
+### Build and deploy a Docker image from source
 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-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+3. Clone the submodules with the command ```git submodule update --init```
-4. Run the command "docker-compose up --file docker-compose-build.yml -d"
+4. Open the docker-compose-{database}-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
-5. Connect to the host on port 5198
+5. Run the command ```docker-compose --file docker-compose-{database}-build.yml up -d```
+6. Connect to the host on port 5198
 
-## Adding Content
+## Source
-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.
+### 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. Clone the submodules with the command ```git submodule update --init --recursive```
+    * This command will clone the code that the server uses from other projects (currently only 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.
+
+If the git submodule commands aren't working, you can:
+1. change to the ```gaseous-server/wwwroot/emulators``` directory
+2. delete the ```EmulatorJS``` directory
+3. clone the EmulatorJS repository with ```git clone https://github.com/EmulatorJS/EmulatorJS.git```
+
+### 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. Update the submodules with ```git submodule update --recursive```
+5. 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.
 
 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 only TOSEC is supported, though more will be added.
+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
 
-### Adding signature DAT files
+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
 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/
 
-### Adding game image files
+### MAME Arcade
-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.
+1. Download the DAT files from the source website. For example; from https://www.progettosnaps.net/dats/MAME
-2. Copy the file to ~/.gaseous-server/Data/Import
+2. Extract the archive
+3. Copy the file name "MAME 0.257 (arcade).dat" files to ~/.gaseous-server/Data/Signatures/MAME Arcade/
 
+### 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.
+Before beginning, remove any version numbers, and anything in the search string that is between ()
 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
@@ -109,5 +187,8 @@ 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: 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.
+**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.

docker-compose-mariadb-build.yml

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

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+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; }
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,371 @@
+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);
+            }
+
+            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);
+                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);
+                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());
+
+            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";
+            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);
+
+            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;
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,14 @@
+// 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/UserViewModel.cs

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

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

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

@@ -0,0 +1,17 @@
+// 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,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
-using gaseous_tools;
 
 namespace gaseous_server.Classes
 {
@@ -16,16 +15,13 @@ namespace gaseous_server.Classes
         {
             foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
             {
-                if (platformMapping.WebEmulator != null)
+                if (platformMapping.Bios != null)
                 {
-                    if (platformMapping.WebEmulator.Bios != null)
+                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBiosItem in platformMapping.Bios)
                     {
-                        foreach (Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem emulatorBiosItem in platformMapping.WebEmulator.Bios)
+                        if (emulatorBiosItem.hash.ToLower() == MD5.ToLower())
                         {
-                            if (emulatorBiosItem.hash.ToLower() == MD5.ToLower())
+                            return platformMapping;
-                            {
-                                return platformMapping;
-                            }
                         }
                     }
                 }
@@ -69,33 +65,29 @@ namespace gaseous_server.Classes
 
             foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
             {
-                if (platformMapping.WebEmulator != null)
+                if (platformMapping.Bios != null)
-                    {
+                {
-                    if (platformMapping.WebEmulator.Bios != null)
+                    IGDB.Models.Platform platform = Metadata.Platforms.GetPlatform(platformMapping.IGDBId);
-                    {
-                        IGDB.Models.Platform platform = Metadata.Platforms.GetPlatform(platformMapping.IGDBId);
 
-                        foreach (Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem emulatorBios in platformMapping.WebEmulator.Bios)
+                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBios in platformMapping.Bios)
+                    {
+                        BiosItem biosItem = new BiosItem
                         {
-                            BiosItem biosItem = new BiosItem
+                            platformid = platformMapping.IGDBId,
-                            {
+                            platformslug = platform.Slug,
-                                platformid = platformMapping.IGDBId,
+                            platformname = platform.Name,
-                                platformslug = platform.Slug,
+                            description = emulatorBios.description,
-                                platformname = platform.Name,
+                            filename = emulatorBios.filename,
-                                description = emulatorBios.description,
+                            hash = emulatorBios.hash.ToLower()
-                                filename = emulatorBios.filename,
+                        };
-                                region = emulatorBios.region,
+                        biosItems.Add(biosItem);
-                                hash = emulatorBios.hash
-                            };
-                            biosItems.Add(biosItem);
-                        }
                     }
                 }
             }
             return biosItems;
         }
 
-        public class BiosItem : Models.PlatformMapping.PlatformMapItem.WebEmulatorItem.EmulatorBiosItem
+        public class BiosItem : Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem
         {
             public long platformid { get; set; }
             public string platformslug { get; set; }

gaseous-server/Classes/Collections.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using gaseous_server.Classes.Metadata;
 using gaseous_server.Controllers;
-using gaseous_tools;
+using gaseous_server.Models;
 using IGDB.Models;
 using Newtonsoft.Json;
 
@@ -20,7 +20,7 @@ namespace gaseous_server.Classes
 		}
 
         public static List<CollectionItem> GetCollections() {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "SELECT * FROM RomCollections ORDER BY `Name`";
 
             DataTable data = db.ExecuteCMD(sql);
@@ -35,7 +35,7 @@ namespace gaseous_server.Classes
         }
 
         public static CollectionItem GetCollection(long Id) {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            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);
@@ -56,8 +56,8 @@ namespace gaseous_server.Classes
 
         public static CollectionItem NewCollection(CollectionItem item)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            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, BuiltStatus) VALUES (@name, @description, @platforms, @genres, @players, @playerperspectives, @themes, @minimumrating, @maximumrating, @maximumromsperplatform, @maximumbytesperplatform, @maximumcollectionsizeinbytes, @builtstatus); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+            string sql = "INSERT INTO RomCollections (`Name`, Description, Platforms, Genres, Players, PlayerPerspectives, Themes, MinimumRating, MaximumRating, MaximumRomsPerPlatform, MaximumBytesPerPlatform, MaximumCollectionSizeInBytes, FolderStructure, IncludeBIOSFiles, AlwaysInclude, BuiltStatus) VALUES (@name, @description, @platforms, @genres, @players, @playerperspectives, @themes, @minimumrating, @maximumrating, @maximumromsperplatform, @maximumbytesperplatform, @maximumcollectionsizeinbytes, @folderstructure, @includebiosfiles, @alwaysinclude, @builtstatus); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("name", item.Name);
             dbDict.Add("description", item.Description);
@@ -71,6 +71,9 @@ namespace gaseous_server.Classes
             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("builtstatus", CollectionItem.CollectionBuildStatus.WaitingForBuild);
             DataTable romDT = db.ExecuteCMD(sql, dbDict);
             long CollectionId = (long)romDT.Rows[0][0];
@@ -82,10 +85,10 @@ namespace gaseous_server.Classes
             return collectionItem;
         }
 
-        public static CollectionItem EditCollection(long Id, CollectionItem item)
+        public static CollectionItem EditCollection(long Id, CollectionItem item, bool ForceRebuild = true)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            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, BuiltStatus=@builtstatus WHERE Id=@id";
+            string sql = "UPDATE RomCollections SET `Name`=@name, Description=@description, Platforms=@platforms, Genres=@genres, Players=@players, PlayerPerspectives=@playerperspectives, Themes=@themes, MinimumRating=@minimumrating, MaximumRating=@maximumrating, MaximumRomsPerPlatform=@maximumromsperplatform, MaximumBytesPerPlatform=@maximumbytesperplatform, MaximumCollectionSizeInBytes=@maximumcollectionsizeinbytes, FolderStructure=@folderstructure, IncludeBIOSFiles=@includebiosfiles, AlwaysInclude=@alwaysinclude, BuiltStatus=@builtstatus WHERE Id=@id";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", Id);
             dbDict.Add("name", item.Name);
@@ -100,25 +103,46 @@ namespace gaseous_server.Classes
             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("builtstatus", CollectionItem.CollectionBuildStatus.WaitingForBuild);
+            dbDict.Add("folderstructure", Common.ReturnValueIfNull(item.FolderStructure, CollectionItem.FolderStructures.Gaseous));
-            db.ExecuteCMD(sql, dbDict);
+            dbDict.Add("includebiosfiles", Common.ReturnValueIfNull(item.IncludeBIOSFiles, 0));
+            dbDict.Add("alwaysinclude", Newtonsoft.Json.JsonConvert.SerializeObject(Common.ReturnValueIfNull(item.AlwaysInclude, new List<CollectionItem.AlwaysIncludeItem>())));
             
             string CollectionZipFile = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, Id + ".zip");
-            if (File.Exists(CollectionZipFile))
+            if (ForceRebuild == true) 
             {
-                File.Delete(CollectionZipFile);
+                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);
 
-            StartCollectionItemBuild(Id);
+            if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild)
+            {
+                StartCollectionItemBuild(Id);
+            }
 
             return collectionItem;
         }
 
         public static void DeleteCollection(long Id)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            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);
@@ -138,7 +162,7 @@ namespace gaseous_server.Classes
             if (collectionItem.BuildStatus != CollectionItem.CollectionBuildStatus.Building)
             {
                 // set collection item to waitingforbuild
-                Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                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);
@@ -146,13 +170,10 @@ namespace gaseous_server.Classes
                 db.ExecuteCMD(sql, dbDict);
 
                 // start background task
-                foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)
+                ProcessQueue.QueueItem queueItem = new ProcessQueue.QueueItem(ProcessQueue.QueueItemType.CollectionCompiler, 1, false, true);
-                {
+                queueItem.Options = Id;
-                    if (qi.ItemType == ProcessQueue.QueueItemType.CollectionCompiler) { 
+                queueItem.ForceExecute();
-                        qi.ForceExecute();
+                ProcessQueue.QueueItems.Add(queueItem);
-                        break;
-                    }
-                }
             }
         }
 
@@ -160,15 +181,38 @@ namespace gaseous_server.Classes
             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>();
-            if (collectionItem.Platforms.Count > 0) {
+
-                foreach (long PlatformId in collectionItem.Platforms) {
+            // 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
                 FilterController filterController = new FilterController();
-                platforms.AddRange((List<Platform>)filterController.Filter()["platforms"]);
+                platforms.AddRange((List<FilterController.FilterPlatform>)filterController.Filter()["platforms"]);
             }
 
             // build collection
@@ -178,64 +222,114 @@ namespace gaseous_server.Classes
                 long TotalRomSize = 0;
                 long TotalGameCount = 0;
 
-                List<Game> games = GamesController.GetGames("",
+                bool isDynamic = false;
-                    platform.Id.ToString(),
+                if (DynamicPlatforms.Contains((long)platform.Id))
-                    string.Join(",", collectionItem.Genres),
+                {
-                    string.Join(",", collectionItem.Players),
+                    isDynamic = true;
-                    string.Join(",", collectionItem.PlayerPerspectives),
+                }
-                    string.Join(",", collectionItem.Themes),
+                else if (DynamicPlatforms.Count == 0)
-                    collectionItem.MinimumRating,
+                {
-                    collectionItem.MaximumRating
+                    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>();
 
-                foreach (Game game in games) {
+                // add titles with an inclusion status
-                    CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem = new CollectionContents.CollectionPlatformItem.CollectionGameItem(game);
+                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;
 
-                    List<Roms.GameRomItem> gameRoms = Roms.GetRoms((long)game.Id, (long)platform.Id);
+                            collectionPlatformItem.Games.Add(gameItem);
-                    
-                    bool AddGame = false;
-
-                    // calculate total rom size for the game
-                    long GameRomSize = 0;
-                    foreach (Roms.GameRomItem gameRom in gameRoms) {
-                        GameRomSize += gameRom.Size;
                     }
-                    if (collectionItem.MaximumBytesPerPlatform > 0) {
+                }
-                        if ((TotalRomSize + GameRomSize) < collectionItem.MaximumBytesPerPlatform) {
+
-                            AddGame = true;
+                foreach (Game game in games) {
+                    bool gameAlreadyInList = false;
+                    foreach (CollectionContents.CollectionPlatformItem.CollectionGameItem existingGame in collectionPlatformItem.Games) 
+                    {
+                        if (existingGame.Id == game.Id) 
+                        {
+                            gameAlreadyInList = true;
                         }
                     }
-                    else 
+
+                    if (gameAlreadyInList == false)
                     {
-                        AddGame = true;
+                        CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem = new CollectionContents.CollectionPlatformItem.CollectionGameItem(game);
-                    }
 
-                    if (AddGame == true) {
+                        List<Roms.GameRomItem> gameRoms = Roms.GetRoms((long)game.Id, (long)platform.Id).GameRomItems;
-                        TotalRomSize += GameRomSize;
                         
-                        bool AddRoms = false;
+                        bool AddGame = false;
 
-                        if (collectionItem.MaximumRomsPerPlatform > 0) { 
+                        // calculate total rom size for the game
-                            if (TotalGameCount < collectionItem.MaximumRomsPerPlatform) {
+                        long GameRomSize = 0;
-                                AddRoms = true;
+                        foreach (Roms.GameRomItem gameRom in gameRoms) {
+                            GameRomSize += gameRom.Size;
+                        }
+                        if (collectionItem.MaximumBytesPerPlatform > 0) {
+                            if ((TotalRomSize + GameRomSize) < collectionItem.MaximumBytesPerPlatform) {
+                                AddGame = true;
                             }
                         }
                         else 
                         {
-                            AddRoms = true;
+                            AddGame = true;
                         }
 
-                        if (AddRoms == true) {
+                        if (AddGame == true) {
-                            TotalGameCount += 1;
+                            TotalRomSize += GameRomSize;
-                            collectionGameItem.Roms = gameRoms;
+
-                            collectionPlatformItem.Games.Add(collectionGameItem);
+                            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;
@@ -258,64 +352,133 @@ namespace gaseous_server.Classes
                 }
             }
 
+            collectionPlatformItems.Sort((x, y) => x.Name.CompareTo(y.Name));
+
             CollectionContents collectionContents = new CollectionContents();
             collectionContents.Collection = collectionPlatformItems;
+
             return collectionContents;
         }
 
-        public static void CompileCollections()
+        public static void CompileCollections(long CollectionId)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
-            List<CollectionItem> collectionItems = GetCollections();
+            CollectionItem collectionItem = GetCollection(CollectionId);
-            foreach (CollectionItem collectionItem in collectionItems)
+            if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild)
             {
-                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 + ".zip");
+                string ZipFileTempPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, collectionItem.Id.ToString());
+
+                try
                 {
-                    // 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;
+                    // clean up if needed
-                    string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, collectionItem.Id + ".zip");
+                    if (File.Exists(ZipFilePath))
-                    string ZipFileTempPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, collectionItem.Id.ToString());
-
-                    try
                     {
+                        Logging.Log(Logging.LogType.Warning, "Collections", "Deleting existing build of collection: " + collectionItem.Name);
+                        File.Delete(ZipFilePath);
+                    }
 
-                        // clean up if needed
+                    if (Directory.Exists(ZipFileTempPath))
-                        if (File.Exists(ZipFilePath))
+                    {
+                        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)
                         {
-                            File.Delete(ZipFilePath);
+                            List<Bios.BiosItem> bios = Bios.GetBios(collectionPlatformItem.Id, true);
-                        }
+                            if (!Directory.Exists(ZipBiosPath)) {
-
+                                Directory.CreateDirectory(ZipBiosPath);
-                        if (Directory.Exists(ZipFileTempPath))
-                        {
-                            Directory.Delete(ZipFileTempPath, true);
-                        }
-
-                        // gather collection files
-                        Directory.CreateDirectory(ZipFileTempPath);
-
-                        foreach (CollectionContents.CollectionPlatformItem collectionPlatformItem in collectionPlatformItems)
-                        {
-                            // create platform directory
-                            string ZipPlatformPath = Path.Combine(ZipFileTempPath, collectionPlatformItem.Slug);
-                            if (!Directory.Exists(ZipPlatformPath))
-                            {
-                                Directory.CreateDirectory(ZipPlatformPath);
                             }
 
-                            foreach (CollectionContents.CollectionPlatformItem.CollectionGameItem collectionGameItem in collectionPlatformItem.Games)
+                            foreach (Bios.BiosItem biosItem in bios) 
                             {
-                                // create game directory
+                                if (File.Exists(biosItem.biosPath))
-                                string ZipGamePath = Path.Combine(ZipPlatformPath, collectionGameItem.Slug);
-                                if (!Directory.Exists(ZipGamePath))
                                 {
-                                    Directory.CreateDirectory(ZipGamePath);
+                                    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
@@ -323,44 +486,47 @@ namespace gaseous_server.Classes
                                 {
                                     if (File.Exists(gameRomItem.Path))
                                     {
+                                        Logging.Log(Logging.LogType.Information, "Collections", "Copying ROM: " + gameRomItem.Name);
                                         File.Copy(gameRomItem.Path, Path.Combine(ZipGamePath, gameRomItem.Name));
                                     }
                                 }
                             }
                         }
-
-                        // compress to zip
-                        ZipFile.CreateFromDirectory(ZipFileTempPath, ZipFilePath, CompressionLevel.SmallestSize, false);
-
-                        // clean up
-                        if (Directory.Exists(ZipFileTempPath))
-                        {
-                            Directory.Delete(ZipFileTempPath, true);
-                        }
-
-                        // set completed
-                        dbDict["bs"] = CollectionItem.CollectionBuildStatus.Completed;
-                        db.ExecuteCMD(sql, dbDict);
                     }
-                    catch (Exception ex)
+
+                    // compress to zip
+                    Logging.Log(Logging.LogType.Information, "Collections", "Compressing collection");
+                    ZipFile.CreateFromDirectory(ZipFileTempPath, ZipFilePath, CompressionLevel.SmallestSize, false);
+
+                    // clean up
+                    if (Directory.Exists(ZipFileTempPath))
                     {
-                        // clean up
+                        Logging.Log(Logging.LogType.Information, "Collections", "Cleaning up");
-                        if (Directory.Exists(ZipFileTempPath))
+                        Directory.Delete(ZipFileTempPath, true);
-                        {
-                            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);
                     }
+
+                    // 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);
                 }
             }
         }
@@ -371,6 +537,7 @@ namespace gaseous_server.Classes
             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"];
@@ -386,6 +553,9 @@ namespace gaseous_server.Classes
             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.AlwaysInclude = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CollectionItem.AlwaysIncludeItem>>(strAlwaysInclude);
             item.BuildStatus = (CollectionItem.CollectionBuildStatus)(int)Common.ReturnValueIfNull(row["BuiltStatus"], 0);
 
             return item;
@@ -411,6 +581,9 @@ namespace gaseous_server.Classes
             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 List<AlwaysIncludeItem> AlwaysInclude { get; set; }
 
             [JsonIgnore]
             public CollectionBuildStatus BuildStatus
@@ -473,6 +646,26 @@ namespace gaseous_server.Classes
                 Completed = 3,
                 Failed = 4
             }
+
+            public enum FolderStructures
+            {
+                Gaseous = 0,
+                RetroPie = 1
+            }
+
+            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 {
@@ -588,6 +781,8 @@ namespace gaseous_server.Classes
                     public string Slug { get; set; }
                     public long Cover { get; set;}
 
+                    public CollectionItem.AlwaysIncludeItem InclusionStatus { get; set; }
+
                     public List<Roms.GameRomItem> Roms { get; set; }
 
                     public long RomSize {

gaseous-server/Classes/Common.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Security.Cryptography;
 
-namespace gaseous_tools
+namespace gaseous_server.Classes
 {
 	public class Common
 	{
@@ -61,7 +61,7 @@ namespace gaseous_tools
 			{
 				get
 				{
-					return _md5hash;
+					return _md5hash.ToLower();
 				}
 				set
 				{
@@ -73,7 +73,7 @@ namespace gaseous_tools
 			{
 				get
 				{
-					return _sha1hash;
+					return _sha1hash.ToLower();
 				}
 				set
 				{
@@ -99,6 +99,17 @@ namespace gaseous_tools
             }
             return size;
         }
+
+		public static string[] SkippableFiles = {
+				".DS_STORE",
+				"desktop.ini"
+			};
+		
+		public static string NormalizePath(string path)
+		{
+			return Path.GetFullPath(new Uri(path).LocalPath)
+					.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+		}
     }
 }
 

gaseous-server/Classes/Config.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Data;
-using Google.Protobuf.WellKnownTypes;
 using Newtonsoft.Json;
 using IGDB.Models;
 
-namespace gaseous_tools
+namespace gaseous_server.Classes
 {
     public static class Config
     {
@@ -34,6 +33,14 @@ namespace gaseous_tools
             }
         }
 
+        public static string PlatformMappingFile
+        {
+            get
+            {
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".gaseous-server", "platformmap.json");
+            }
+        }
+
         public static ConfigFile.Database DatabaseConfiguration
         {
             get
@@ -74,7 +81,9 @@ namespace gaseous_tools
         {
             get
             {
-                string logPathName = Path.Combine(LogPath, "Log " + DateTime.Now.ToUniversalTime().ToString("yyyyMMdd") + ".txt");
+                string logFileExtension = "txt";
+                
+                string logPathName = Path.Combine(LogPath, "Server Log " + DateTime.Now.ToUniversalTime().ToString("yyyyMMdd") + "." + logFileExtension);
                 return logPathName;
             }
         }
@@ -173,7 +182,7 @@ namespace gaseous_tools
             else
             {
                 Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                string sql = "SELECT * FROM Settings WHERE Setting = @SettingName";
+                string sql = "SELECT Value FROM Settings WHERE Setting = @SettingName";
                 Dictionary<string, object> dbDict = new Dictionary<string, object>();
                 dbDict.Add("SettingName", SettingName);
                 dbDict.Add("Value", DefaultValue);
@@ -303,6 +312,16 @@ namespace gaseous_tools
                         return dbConnString;
                     }
                 }
+
+                [JsonIgnore]
+                public string ConnectionStringNoDatabase
+                {
+                    get
+                    {
+                        string dbConnString = "server=" + HostName + ";port=" + Port + ";userid=" + UserName + ";password=" + Password + ";";
+                        return dbConnString;
+                    }
+                }
             }
 
             public class Library
@@ -327,11 +346,27 @@ namespace gaseous_tools
                     }
                 }
 
-                public string LibraryDataDirectory
+                public string LibraryImportErrorDirectory
                 {
                     get
                     {
-                        return Path.Combine(LibraryRootDirectory, "Library");
+                        return Path.Combine(LibraryRootDirectory, "Import Errors");
+                    }
+                }
+
+                public string LibraryImportDuplicatesDirectory
+                {
+                    get
+                    {
+                        return Path.Combine(LibraryImportErrorDirectory, "Duplicates");
+                    }
+                }
+
+                public string LibraryImportGeneralErrorDirectory
+                {
+                    get
+                    {
+                        return Path.Combine(LibraryImportErrorDirectory, "Error");
                     }
                 }
 
@@ -375,6 +410,14 @@ namespace gaseous_tools
                     }
                 }
 
+                public string LibraryMediaGroupDirectory
+                {
+                    get
+                    {
+                        return Path.Combine(LibraryRootDirectory, "Media Groups");
+                    }
+                }
+
                 public string LibraryMetadataDirectory_Platform(Platform platform)
                 {
                     string MetadataPath = Path.Combine(LibraryMetadataDirectory, "Platforms", platform.Slug);
@@ -404,26 +447,16 @@ namespace gaseous_tools
                     }
                 }
 
-                public string LibrarySignatureImportDirectory_TOSEC
-                {
-                    get
-                    {
-                        return Path.Combine(LibrarySignatureImportDirectory, "TOSEC");
-                    }
-                }
-
                 public void InitLibrary()
                 {
                     if (!Directory.Exists(LibraryRootDirectory)) { Directory.CreateDirectory(LibraryRootDirectory); }
                     if (!Directory.Exists(LibraryImportDirectory)) { Directory.CreateDirectory(LibraryImportDirectory); }
-                    if (!Directory.Exists(LibraryDataDirectory)) { Directory.CreateDirectory(LibraryDataDirectory); }
                     if (!Directory.Exists(LibraryBIOSDirectory)) { Directory.CreateDirectory(LibraryBIOSDirectory); }
                     if (!Directory.Exists(LibraryUploadDirectory)) { Directory.CreateDirectory(LibraryUploadDirectory); }
                     if (!Directory.Exists(LibraryMetadataDirectory)) { Directory.CreateDirectory(LibraryMetadataDirectory); }
                     if (!Directory.Exists(LibraryTempDirectory)) { Directory.CreateDirectory(LibraryTempDirectory); }
                     if (!Directory.Exists(LibraryCollectionsDirectory)) { Directory.CreateDirectory(LibraryCollectionsDirectory); }
                     if (!Directory.Exists(LibrarySignatureImportDirectory)) { Directory.CreateDirectory(LibrarySignatureImportDirectory); }
-                    if (!Directory.Exists(LibrarySignatureImportDirectory_TOSEC)) { Directory.CreateDirectory(LibrarySignatureImportDirectory_TOSEC); }
                 }
             }
 
@@ -467,7 +500,8 @@ namespace gaseous_tools
             {
                 public bool DebugLogging = false;
 
-                public LoggingFormat LogFormat = Logging.LoggingFormat.Json;
+                // log retention in days
+                public int LogRetention = 7;
 
                 public enum LoggingFormat
                 {

gaseous-server/Classes/Database.cs

@@ -3,10 +3,9 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Diagnostics;
 using System.Reflection;
-using MySql.Data.MySqlClient;
+using MySqlConnector;
-using static gaseous_tools.Database;
 
-namespace gaseous_tools
+namespace gaseous_server.Classes
 {
 	public class Database
 	{
@@ -69,7 +68,7 @@ namespace gaseous_tools
 					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 = 'gaseous' AND TABLE_NAME = 'schema_version';";
+					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)
 					{
@@ -81,7 +80,7 @@ namespace gaseous_tools
 
                     for (int i = 1000; i < 10000; i++)
 					{
-						string resourceName = "gaseous_tools.Database.MySQL.gaseous-" + i + ".sql";
+						string resourceName = "gaseous_server.Support.Database.MySQL.gaseous-" + i + ".sql";
 						string dbScript = "";
 
 						string[] resources = Assembly.GetExecutingAssembly().GetManifestResourceNames();
@@ -108,14 +107,20 @@ namespace gaseous_tools
                                     Logging.Log(Logging.LogType.Information, "Database", "Schema version is " + SchemaVer);
                                     if (SchemaVer < i)
 									{
+										// run pre-upgrade code
+										DatabaseMigration.PreUpgradeScript(i, _ConnectorType);
+										
                                         // apply schema!
-                                        Logging.Log(Logging.LogType.Information, "Database", "Schema update available - applying");
+                                        Logging.Log(Logging.LogType.Information, "Database", "Updating schema to version " + i);
                                         ExecuteCMD(dbScript, dbDict);
 
 										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);
 									}
 								}
 							}
@@ -142,6 +147,50 @@ namespace gaseous_tools
 			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; }
@@ -155,6 +204,35 @@ namespace gaseous_tools
             }
         }
 
+		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);
+                    return (int)conn.ExecNonQuery(Command, Parameters, Timeout);
+                default:
+                    return 0;
+            }
+        }
+
         public void ExecuteTransactionCMD(List<SQLTransactionItem> CommandList, int Timeout = 60)
         {
             object conn;
@@ -178,6 +256,40 @@ namespace gaseous_tools
             }
         }
 
+		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()
@@ -208,7 +320,7 @@ namespace gaseous_tools
 			{
 				DataTable RetTable = new DataTable();
 
-                Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database");
+                Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
                 MySqlConnection conn = new MySqlConnection(DBConn);
 				conn.Open();
 
@@ -226,11 +338,11 @@ namespace gaseous_tools
 
 				try
 				{
-                    Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'");
+                    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);
+						Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
 					}
                     RetTable.Load(cmd.ExecuteReader());
 				} catch (Exception ex) {
@@ -239,12 +351,53 @@ namespace gaseous_tools
 					Trace.WriteLine("Full exception: " + ex.ToString());
 				}
 
-				Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection");
+				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);
+                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)
             {
                 var conn = new MySqlConnection(DBConn);
@@ -286,6 +439,20 @@ namespace gaseous_tools
                 return cmd;
             }
 
+			public bool TestConnection()
+			{
+				MySqlConnection conn = new MySqlConnection(DBConn);
+				try
+				{
+					conn.Open();
+					conn.Close();
+					return true;
+				}
+				catch
+				{
+					return false;
+				}
+			}
         }
     }
 }

gaseous-server/Classes/DatabaseMigration.cs

@@ -0,0 +1,163 @@
+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/GameLibrary.cs

@@ -0,0 +1,176 @@
+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.")
+            {}
+        }
+
+        // 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"]));
+
+                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);
+                }
+
+                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];
+
+            return GetLibrary(newLibraryId);
+        }
+
+        public static void DeleteLibrary(int LibraryId)
+        {
+            if (GetLibrary(LibraryId).IsDefaultLibrary == false)
+            {
+                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);
+            }
+            else
+            {
+                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;
+            }
+
+            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

@@ -4,9 +4,9 @@ using System.IO.Compression;
 using System.Security.Policy;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using gaseous_tools;
+using gaseous_server.Classes.Metadata;
-using MySqlX.XDevAPI;
+using IGDB.Models;
-using Org.BouncyCastle.Utilities.IO.Pem;
+using NuGet.Common;
 using static gaseous_server.Classes.Metadata.Games;
 
 namespace gaseous_server.Classes
@@ -22,8 +22,13 @@ namespace gaseous_server.Classes
 
 				// import files first
 				foreach (string importContent in importContents_Files) {
-					ImportGame.ImportGameFile(importContent);
+					ImportGame.ImportGameFile(importContent, null);
 				}
+
+                // import sub directories
+                foreach (string importDir in importContents_Directories) {
+                    Classes.ImportGames importGames = new Classes.ImportGames(importDir);
+                }
             }
 			else
 			{
@@ -37,83 +42,101 @@ namespace gaseous_server.Classes
 
 	public class ImportGame
 	{
-        public static void ImportGameFile(string GameFileImportPath, bool IsDirectory = false, bool ForceImport = false)
+        public static void ImportGameFile(string GameFileImportPath, IGDB.Models.Platform? OverridePlatform)
 		{
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 
-			string[] SkippableFiles = {
+            if (Common.SkippableFiles.Contains<string>(Path.GetFileName(GameFileImportPath), StringComparer.OrdinalIgnoreCase))
-				".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);
+                FileInfo fi = new FileInfo(GameFileImportPath);
-				if (IsDirectory == false)
+                Common.hashObject hash = new Common.hashObject(GameFileImportPath);
-				{
-					FileInfo fi = new FileInfo(GameFileImportPath);
-                    Common.hashObject hash = new Common.hashObject(GameFileImportPath);
 
-                    Models.PlatformMapping.PlatformMapItem? IsBios = Classes.Bios.BiosHashSignatureLookup(hash.md5hash);
+                Models.PlatformMapping.PlatformMapItem? IsBios = Classes.Bios.BiosHashSignatureLookup(hash.md5hash);
 
-                    if (IsBios == null)
+                if (IsBios == null)
+                {
+                    // file is a rom
+                    // check to make sure we don't already have this file imported
+                    sql = "SELECT COUNT(Id) AS count FROM Games_Roms WHERE MD5=@md5 AND SHA1=@sha1";
+                    dbDict.Add("md5", hash.md5hash);
+                    dbDict.Add("sha1", hash.sha1hash);
+                    DataTable importDB = db.ExecuteCMD(sql, dbDict);
+                    if ((Int64)importDB.Rows[0]["count"] > 0)
                     {
-                        // file is a rom
+                        // import source was the import directory
-                        // check to make sure we don't already have this file imported
+                        if (GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryImportDirectory))
-                        sql = "SELECT COUNT(Id) AS count FROM Games_Roms WHERE MD5=@md5 AND SHA1=@sha1";
-                        dbDict.Add("md5", hash.md5hash);
-                        dbDict.Add("sha1", hash.sha1hash);
-                        DataTable importDB = db.ExecuteCMD(sql, dbDict);
-                        if ((Int64)importDB.Rows[0]["count"] > 0)
                         {
-                            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))
                             {
-                                Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping");
+                                Directory.CreateDirectory(targetPath);
                             }
+                            File.Move(GameFileImportPath, targetPathWithFileName, true);
                         }
-                        else
+                        
+                        // import source was the upload directory
+                        if (GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryUploadDirectory))
                         {
-                            Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
+                            Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping import");
-
-                            Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
-
-                            // get discovered platform
-                            IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
-                            if (determinedPlatform == null)
-                            {
-                                determinedPlatform = new IGDB.Models.Platform();
-                            }
-
-                            IGDB.Models.Game determinedGame = SearchForGame(discoveredSignature.Game.Name, discoveredSignature.Flags.IGDBPlatformId);
-
-                            // add to database
-                            StoreROM(hash, determinedGame, determinedPlatform, discoveredSignature, GameFileImportPath);
                         }
                     }
                     else
                     {
-                        // file is a bios
+                        Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
-                        if (IsBios.WebEmulator != null)
+
+                        Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
+
+                        // get discovered platform
+                        IGDB.Models.Platform? determinedPlatform = null;
+                        if (OverridePlatform == null)
                         {
-                            foreach (Classes.Bios.BiosItem biosItem in Classes.Bios.GetBios())
+                            determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
+                            if (determinedPlatform == null)
                             {
-                                if (biosItem.Available == false && biosItem.hash == hash.md5hash)
+                                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.Game.Name, discoveredSignature.Flags.IGDBPlatformId);
+
+                        // add to database
+                        StoreROM(GameLibrary.GetDefaultLibrary, hash, determinedGame, determinedPlatform, discoveredSignature, GameFileImportPath);
+                    }
+                }
+                else
+                {
+                    // file is a bios
+                    if (IsBios.WebEmulator != null)
+                    {
+                        foreach (Classes.Bios.BiosItem biosItem in Classes.Bios.GetBios())
+                        {
+                            if (biosItem.Available == false && biosItem.hash == hash.md5hash)
+                            {
+                                string biosPath = biosItem.biosPath.Replace(biosItem.filename, "");
+                                if (!Directory.Exists(biosPath))
                                 {
-                                    string biosPath = biosItem.biosPath.Replace(biosItem.filename, "");
+                                    Directory.CreateDirectory(biosPath);
-                                    if (!Directory.Exists(biosPath))
-                                    {
-                                        Directory.CreateDirectory(biosPath);
-                                    }
-
-                                    File.Move(GameFileImportPath, biosItem.biosPath, true);
-
-                                    break;
                                 }
+
+                                File.Move(GameFileImportPath, biosItem.biosPath, true);
+
+                                break;
                             }
                         }
                     }
@@ -131,24 +154,42 @@ namespace gaseous_server.Classes
                 // extract the zip file and search the contents
                 string ExtractPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, Path.GetRandomFileName());
                 if (!Directory.Exists(ExtractPath)) { Directory.CreateDirectory(ExtractPath); }
-                ZipFile.ExtractToDirectory(GameFileImportPath, ExtractPath);
+                try
-
-                // loop through contents until we find the first signature match
-                foreach (string file in Directory.GetFiles(ExtractPath))
                 {
-                    FileInfo zfi = new FileInfo(file);
+                    ZipFile.ExtractToDirectory(GameFileImportPath, ExtractPath);
-                    Common.hashObject zhash = new Common.hashObject(file);
 
-                    Models.Signatures_Games zDiscoveredSignature = _GetFileSignature(zhash, zfi, file);
+                    // loop through contents until we find the first signature match
-                    zDiscoveredSignature.Rom.Name = Path.ChangeExtension(zDiscoveredSignature.Rom.Name, ".zip");
+                    foreach (string file in Directory.GetFiles(ExtractPath))
-
-                    if (zDiscoveredSignature.Score > discoveredSignature.Score)
                     {
-                        discoveredSignature = zDiscoveredSignature;
+                        FileInfo zfi = new FileInfo(file);
+                        Common.hashObject zhash = new Common.hashObject(file);
 
-                        break;
+                        Models.Signatures_Games zDiscoveredSignature = _GetFileSignature(zhash, zfi, file);
+                        zDiscoveredSignature.Rom.Name = Path.ChangeExtension(zDiscoveredSignature.Rom.Name, ".zip");
+
+                        if (zDiscoveredSignature.Score > discoveredSignature.Score)
+                        {
+                            if (
+                                zDiscoveredSignature.Rom.SignatureSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.MAMEArcade || 
+                                zDiscoveredSignature.Rom.SignatureSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.MAMEMess
+                            )
+                            {
+                                zDiscoveredSignature.Rom.Name = zDiscoveredSignature.Game.Description + ".zip";
+                            }
+                            zDiscoveredSignature.Rom.Crc = discoveredSignature.Rom.Crc;
+                            zDiscoveredSignature.Rom.Md5 = discoveredSignature.Rom.Md5;
+                            zDiscoveredSignature.Rom.Sha1 = discoveredSignature.Rom.Sha1;
+                            zDiscoveredSignature.Rom.Size = discoveredSignature.Rom.Size;
+                            discoveredSignature = zDiscoveredSignature;
+
+                            break;
+                        }
                     }
                 }
+                catch (Exception ex)
+                {
+                    Logging.Log(Logging.LogType.Critical, "Get Signature", "Error processing zip file: " + GameFileImportPath, ex);
+                }
 
                 if (Directory.Exists(ExtractPath)) { Directory.Delete(ExtractPath, true); }
             }
@@ -238,7 +279,7 @@ namespace gaseous_server.Classes
                     ri.Md5 = hash.md5hash;
                     ri.Sha1 = hash.sha1hash;
                     ri.Size = fi.Length;
-                    ri.SignatureSource = Models.Signatures_Games.RomItem.SignatureSourceType.None;
+                    ri.SignatureSource = gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None;
                 }
             }
 
@@ -275,6 +316,17 @@ 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
                     {
@@ -340,11 +392,17 @@ 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);
+            SearchCandidates.Add(GameName.Trim());
             if (GameName.Contains(" - "))
             {
-                SearchCandidates.Add(GameName.Replace(" - ", ": "));
+                SearchCandidates.Add(GameName.Replace(" - ", ": ").Trim());
                 SearchCandidates.Add(GameName.Substring(0, GameName.IndexOf(" - ")).Trim());
             }
             if (GameName.Contains(": "))
@@ -357,9 +415,9 @@ namespace gaseous_server.Classes
             return SearchCandidates;
         }
 
-        public static long StoreROM(Common.hashObject hash, IGDB.Models.Game determinedGame, IGDB.Models.Platform determinedPlatform, Models.Signatures_Games discoveredSignature, string GameFileImportPath, long UpdateId = 0)
+        public static long StoreROM(GameLibrary.LibraryItem library, Common.hashObject hash, IGDB.Models.Game determinedGame, IGDB.Models.Platform determinedPlatform, Models.Signatures_Games discoveredSignature, string GameFileImportPath, long UpdateId = 0)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             string sql = "";
 
@@ -367,10 +425,10 @@ namespace gaseous_server.Classes
 
             if (UpdateId == 0)
             {
-                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);";
+                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);";
             } else
             {
-                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;";
+                sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid, Name=@name, Size=@size, DevelopmentStatus=@developmentstatus, Attributes=@Attributes, RomType=@romtype, RomTypeMedia=@romtypemedia, MediaLabel=@medialabel, MetadataSource=@metadatasource, MetadataGameName=@metadatagamename, MetadataVersion=@metadataversion WHERE Id=@id;";
                 dbDict.Add("id", UpdateId);
             }
             dbDict.Add("platformid", Common.ReturnValueIfNull(determinedPlatform.Id, 0));
@@ -382,21 +440,24 @@ 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.flags != null)
+            if (discoveredSignature.Rom.Attributes != null)
             {
-                if (discoveredSignature.Rom.flags.Count > 0)
+                if (discoveredSignature.Rom.Attributes.Count > 0)
                 {
-                    dbDict.Add("flags", Newtonsoft.Json.JsonConvert.SerializeObject(discoveredSignature.Rom.flags));
+                    dbDict.Add("attributes", Newtonsoft.Json.JsonConvert.SerializeObject(discoveredSignature.Rom.Attributes));
                 }
                 else
                 {
-                    dbDict.Add("flags", "[ ]");
+                    dbDict.Add("attributes", "[ ]");
                 }
             }
             else
             {
-                dbDict.Add("flags", "[ ]");
+                dbDict.Add("attributes", "[ ]");
             }
             dbDict.Add("romtype", (int)discoveredSignature.Rom.RomType);
             dbDict.Add("romtypemedia", Common.ReturnValueIfNull(discoveredSignature.Rom.RomTypeMedia, ""));
@@ -414,7 +475,10 @@ namespace gaseous_server.Classes
             }
 
             // move to destination
-            MoveGameFile(romId);
+            if (library.IsDefaultLibrary == true)
+            {
+                MoveGameFile(romId);
+            }
 
             return romId;
         }
@@ -438,7 +502,7 @@ namespace gaseous_server.Classes
 			{
 				gameSlug = game.Slug;
 			}
-			string DestinationPath = Path.Combine(Config.LibraryConfiguration.LibraryDataDirectory, gameSlug, platformSlug);
+			string DestinationPath = Path.Combine(GameLibrary.GetDefaultLibrary.Path, gameSlug, platformSlug);
 			if (!Directory.Exists(DestinationPath))
 			{
 				Directory.CreateDirectory(DestinationPath);
@@ -476,7 +540,7 @@ namespace gaseous_server.Classes
 						File.Move(romPath, DestinationPath);
 
 						// update the db
-						Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+						Database db = new 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);
@@ -496,12 +560,16 @@ namespace gaseous_server.Classes
 
 		public static void OrganiseLibrary()
 		{
-            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting library organisation");
+            Logging.Log(Logging.LogType.Information, "Organise Library", "Starting default library organisation");
+
+            GameLibrary.LibraryItem library = GameLibrary.GetDefaultLibrary;
 
             // move rom files to their new location
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM Games_Roms";
+            string sql = "SELECT * FROM Games_Roms WHERE LibraryId = @libraryid";
-            DataTable romDT = db.ExecuteCMD(sql);
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("libraryid", library.Id);
+            DataTable romDT = db.ExecuteCMD(sql, dbDict);
 
             if (romDT.Rows.Count > 0)
 			{
@@ -514,12 +582,12 @@ namespace gaseous_server.Classes
 			}
 
 			// clean up empty directories
-			DeleteOrphanedDirectories(Config.LibraryConfiguration.LibraryDataDirectory);
+			DeleteOrphanedDirectories(GameLibrary.GetDefaultLibrary.Path);
 
-            Logging.Log(Logging.LogType.Information, "Organise Library", "Finsihed library organisation");
+            Logging.Log(Logging.LogType.Information, "Organise Library", "Finsihed default library organisation");
         }
 
-        private static void DeleteOrphanedDirectories(string startLocation)
+        public static void DeleteOrphanedDirectories(string startLocation)
         {
             foreach (var directory in Directory.GetDirectories(startLocation))
             {
@@ -534,148 +602,207 @@ namespace gaseous_server.Classes
 
         public static void LibraryScan()
         {
-            Logging.Log(Logging.LogType.Information, "Library Scan", "Starting library scan");
+            foreach (GameLibrary.LibraryItem library in GameLibrary.GetLibraries)
-
-            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;";
-            db.ExecuteCMD(duplicateSql);
-
-            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)
             {
-                for (var i = 0; i < dtRoms.Rows.Count; i++)
+                Logging.Log(Logging.LogType.Information, "Library Scan", "Starting library scan. Library " + library.Name);
+
+                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+                Logging.Log(Logging.LogType.Information, "Library Scan", "Looking for duplicate library files to clean up");
+                string duplicateSql = "DELETE r1 FROM Games_Roms r1 INNER JOIN Games_Roms r2 WHERE r1.Id > r2.Id AND r1.MD5 = r2.MD5 AND r1.LibraryId=@libraryid AND r2.LibraryId=@libraryid;";
+                Dictionary<string, object> dupDict = new Dictionary<string, object>();
+                dupDict.Add("libraryid", library.Id);
+                db.ExecuteCMD(duplicateSql, dupDict);
+
+                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);
+
+                // clean out database entries in the import folder
+                if (dtRoms.Rows.Count > 0)
                 {
-                    long romId = (long)dtRoms.Rows[i]["Id"];
+                    for (var i = 0; i < dtRoms.Rows.Count; i++)
-                    string romPath = (string)dtRoms.Rows[i]["Path"];
-
-                    if (!romPath.StartsWith(Config.LibraryConfiguration.LibraryDataDirectory))
                     {
-                        Logging.Log(Logging.LogType.Information, "Library Scan", " Deleting database entry for files with incorrect directory " + romPath);
+                        long romId = (long)dtRoms.Rows[i]["Id"];
-                        string deleteSql = "DELETE FROM Games_Roms WHERE Id=@id";
+                        string romPath = (string)dtRoms.Rows[i]["Path"];
-                        Dictionary<string, object> deleteDict = new Dictionary<string, object>();
-                        deleteDict.Add("Id", romId);
-                        db.ExecuteCMD(deleteSql, deleteDict);
-                    }
-                }
-            }
 
-            sql = "SELECT * FROM Games_Roms ORDER BY `name`";
+                        if (!romPath.StartsWith(library.Path))
-            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(Config.LibraryConfiguration.LibraryDataDirectory, "*.*", SearchOption.AllDirectories);
-            foreach (string LibraryFile in LibraryFiles)
-            {
-                Common.hashObject LibraryFileHash = new Common.hashObject(LibraryFile);
-
-                // check if file is in database
-                bool romFound = false;
-                for (var i = 0; i < dtRoms.Rows.Count; i++)
-                {
-                    long romId = (long)dtRoms.Rows[i]["Id"];
-                    string romPath = (string)dtRoms.Rows[i]["Path"];
-                    string romMd5 = (string)dtRoms.Rows[i]["MD5"];
-
-                    if ((LibraryFile == romPath) || (LibraryFileHash.md5hash == romMd5))
-                    {
-                        romFound = true;
-                        break;
-                    }
-                }
-
-                if (romFound == false)
-                {
-                    // file is not in database - process it
-                    Common.hashObject hash = new Common.hashObject(LibraryFile);
-                    FileInfo fi = new FileInfo(LibraryFile);
-
-                    Models.Signatures_Games sig = GetFileSignature(hash, fi, LibraryFile);
-
-                    Logging.Log(Logging.LogType.Information, "Library Scan", " Orphaned file found in library: " + LibraryFile);
-
-                    // 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, LibraryFile);
-                }
-            }
-
-            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");
-            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"];
-                    Classes.Roms.GameRomItem.SourceType romMetadataSource = (Classes.Roms.GameRomItem.SourceType)(int)dtRoms.Rows[i]["MetadataSource"];
-
-                    Logging.Log(Logging.LogType.Information, "Library Scan", " Processing ROM at path " + romPath);
-
-                    if (File.Exists(romPath))
-                    {
-                        // 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
+                            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";
+                            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 ORDER BY `name`";
+                dtRoms = db.ExecuteCMD(sql, dbDict);
+
+                // 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);
+                foreach (string LibraryFile in LibraryFiles)
+                {
+                    if (!Common.SkippableFiles.Contains<string>(Path.GetFileName(LibraryFile), StringComparer.OrdinalIgnoreCase))
+                    {
+                        Common.hashObject LibraryFileHash = new Common.hashObject(LibraryFile);
+
+                        // check if file is in database
+                        bool romFound = false;
+                        for (var i = 0; i < dtRoms.Rows.Count; i++)
+                        {
+                            long romId = (long)dtRoms.Rows[i]["Id"];
+                            string romPath = (string)dtRoms.Rows[i]["Path"];
+                            string romMd5 = (string)dtRoms.Rows[i]["MD5"];
+
+                            if ((LibraryFile == romPath) || (LibraryFileHash.md5hash == romMd5))
                             {
-                                md5hash = "",
+                                romFound = true;
-                                sha1hash = ""
+                                break;
-                            };
-                            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))
+                        if (romFound == false)
                         {
-                            MoveGameFile(romId);
+                            // file is not in database - process it
+                            Common.hashObject hash = new Common.hashObject(LibraryFile);
+                            FileInfo fi = new FileInfo(LibraryFile);
+
+                            Models.Signatures_Games sig = GetFileSignature(hash, fi, LibraryFile);
+
+                            Logging.Log(Logging.LogType.Information, "Library Scan", " Orphaned file found in library: " + LibraryFile);
+
+                            // get discovered platform
+                            IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(sig.Flags.IGDBPlatformId);
+
+                            IGDB.Models.Game determinedGame = new Game();
+                            if (determinedPlatform == null)
+                            {
+                                if (library.DefaultPlatformId == 0)
+                                {
+                                    determinedPlatform = new IGDB.Models.Platform();
+                                    determinedGame = SearchForGame(sig.Game.Name, sig.Flags.IGDBPlatformId);
+                                }
+                                else
+                                {
+                                    determinedPlatform = Platforms.GetPlatform(library.DefaultPlatformId);
+                                    determinedGame = SearchForGame(sig.Game.Name, library.DefaultPlatformId);
+                                }
+                            }
+                            else
+                            {
+                                determinedGame = SearchForGame(sig.Game.Name, (long)determinedPlatform.Id);
+                            }
+
+                            StoreROM(library, hash, determinedGame, determinedPlatform, sig, LibraryFile);
                         }
                     }
-                    else
+                }
-                    {
-                        // file doesn't exist where it's supposed to be! delete it from the db
-                        Logging.Log(Logging.LogType.Warning, "Library Scan", " Deleting orphaned database entry for " + romPath);
 
-                        string deleteSql = "DELETE FROM Games_Roms WHERE Id = @id";
+                sql = "SELECT * FROM Games_Roms WHERE LibraryId=@libraryid ORDER BY `name`";
-                        Dictionary<string, object> deleteDict = new Dictionary<string, object>();
+                dtRoms = db.ExecuteCMD(sql, dbDict);
-                        deleteDict.Add("id", romId);
+
-                        db.ExecuteCMD(deleteSql, deleteDict);
+                // check all roms to see if their local file still exists
+                Logging.Log(Logging.LogType.Information, "Library Scan", "Checking library files exist on disk");
+                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_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType romMetadataSource = (gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType)(int)dtRoms.Rows[i]["MetadataSource"];
+
+                        Logging.Log(Logging.LogType.Information, "Library Scan", " Processing ROM at path " + romPath);
+
+                        if (File.Exists(romPath))
+                        {
+                            if (library.IsDefaultLibrary == true)
+                            {
+                                if (romPath != ComputeROMPath(romId))
+                                {
+                                    MoveGameFile(romId);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // file doesn't exist where it's supposed to be! delete it from the db
+                            Logging.Log(Logging.LogType.Warning, "Library Scan", " Deleting orphaned database entry for " + romPath);
+
+                            string deleteSql = "DELETE FROM Games_Roms WHERE Id = @id AND LibraryId = @libraryid";
+                            Dictionary<string, object> deleteDict = new Dictionary<string, object>();
+                            deleteDict.Add("id", romId);
+                            deleteDict.Add("libraryid", library.Id);
+                            db.ExecuteCMD(deleteSql, deleteDict);
+                        }
                     }
                 }
+
+                Logging.Log(Logging.LogType.Information, "Library Scan", "Library scan completed");
+            }
+        }
+
+        public static 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);
+            string sql = "";
+            if (ForceExecute == false)
+            {
+                sql = "SELECT * FROM Games_Roms WHERE (PlatformId = 0 OR GameId = 0 OR MetadataSource = 0) AND (LastMatchAttemptDate IS NULL OR LastMatchAttemptDate < @lastmatchattemptdate) LIMIT 100;";
+            }
+            else
+            {
+                sql = "SELECT * FROM Games_Roms WHERE (PlatformId = 0 OR GameId = 0 OR MetadataSource = 0);";
+            }
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("lastmatchattemptdate", DateTime.UtcNow.AddDays(-7));
+            DataTable data = db.ExecuteCMD(sql, dbDict);
+            foreach (DataRow row in data.Rows)
+            {
+                // get library
+                GameLibrary.LibraryItem library = GameLibrary.GetLibrary((int)row["LibraryId"]);
+
+                // 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
+                Models.Signatures_Games sig = GetFileSignature(hash, fi, romPath);
+
+                // determine rom 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(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);
             }
 
-            Logging.Log(Logging.LogType.Information, "Library Scan", "Library scan completed");
+            Logging.Log(Logging.LogType.Information, "Rematch Scan", "Rematch scan completed");
         }
     }
 }

gaseous-server/Classes/Logging.cs

@@ -0,0 +1,180 @@
+using System;
+using System.Data;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Metadata.Ecma335;
+namespace gaseous_server.Classes
+{
+	public class Logging
+	{
+        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)
+                {
+                    Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                    string sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate; INSERT INTO ServerLogs (EventTime, EventType, Process, Message, Exception) VALUES (@EventTime, @EventType, @Process, @Message, @Exception);";
+                    Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                    dbDict.Add("EventRententionDate", DateTime.UtcNow.AddDays(Config.LoggingConfiguration.LogRetention * -1));
+                    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());
+
+                    try
+                    {
+                        db.ExecuteCMD(sql, dbDict);
+                    }
+                    catch (Exception ex)
+                    {   
+                        LogToDisk(logItem, TraceOutput, ex);
+                    }
+                }
+                else
+                {
+                    LogToDisk(logItem, TraceOutput, null);
+                }
+            }
+        }
+
+        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(long? StartIndex, int PageNumber = 1, int PageSize = 100) 
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "";
+            if (StartIndex == null)
+            {
+                sql = "SELECT * FROM ServerLogs ORDER BY Id DESC LIMIT @PageSize OFFSET @PageNumber;";
+            }
+            else
+            {
+                sql = "SELECT * FROM ServerLogs WHERE Id < @StartIndex ORDER BY Id DESC LIMIT @PageSize OFFSET @PageNumber;";
+            }
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("StartIndex", StartIndex);
+            dbDict.Add("PageNumber", (PageNumber - 1) * PageSize);
+            dbDict.Add("PageSize", PageSize);
+            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"]
+                };
+
+                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; } = "";
+            private string _Message = "";
+            public string Message
+            {
+                get
+                {
+                    return _Message;
+                }
+                set
+                {
+                    _Message = value;
+                }
+            }
+            public string? ExceptionValue { get; set; }
+        }
+    }
+}
+

gaseous-server/Classes/Maintenance.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Data;
+using gaseous_server.Models;
+using Microsoft.VisualStudio.Web.CodeGeneration;
+
+namespace gaseous_server.Classes
+{
+	public class Maintenance
+    {
+        const int MaxFileAge = 30;
+
+        public static void RunMaintenance()
+        {
+            // delete files and directories older than 7 days in PathsToClean
+            List<string> PathsToClean = new List<string>();
+            PathsToClean.Add(Config.LibraryConfiguration.LibraryUploadDirectory);
+            PathsToClean.Add(Config.LibraryConfiguration.LibraryTempDirectory);
+
+            foreach (string PathToClean in PathsToClean)
+            {
+                Logging.Log(Logging.LogType.Information, "Maintenance", "Removing files older than " + MaxFileAge + " days from " + PathToClean);
+
+                // get content
+                // files first
+                foreach (string filePath in Directory.GetFiles(PathToClean))
+                {
+                    FileInfo fileInfo = new FileInfo(filePath);
+                    if (fileInfo.LastWriteTimeUtc.AddDays(MaxFileAge) < DateTime.UtcNow)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Maintenance", "Deleting file " + filePath);
+                        File.Delete(filePath);
+                    }
+                }
+
+                // now directories
+                foreach (string dirPath in Directory.GetDirectories(PathToClean))
+                {
+                    DirectoryInfo directoryInfo = new DirectoryInfo(dirPath);
+                    if (directoryInfo.LastWriteTimeUtc.AddDays(MaxFileAge) < DateTime.UtcNow)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Maintenance", "Deleting directory " + directoryInfo);
+                        Directory.Delete(dirPath, true);
+                    }
+                }
+            }
+
+            Logging.Log(Logging.LogType.Information, "Maintenance", "Optimising database tables");
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SHOW TABLES;";
+            DataTable tables = db.ExecuteCMD(sql);
+
+            foreach (DataRow row in tables.Rows)
+            {
+                sql = "OPTIMIZE TABLE " + row[0].ToString();
+                DataTable response = db.ExecuteCMD(sql);
+                foreach (DataRow responseRow in response.Rows)
+                {
+                    string retVal = "";
+                    for (int i = 0; i < responseRow.ItemArray.Length; i++)
+                    {
+                        retVal += responseRow.ItemArray[i] + "; ";
+                    }
+                    Logging.Log(Logging.LogType.Information, "Maintenance", "Optimizse table " + row[0].ToString() + ": " + retVal);
+                }
+            }
+        }
+    }
+}

gaseous-server/Classes/Metadata/AgeRating.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Reflection;
-using gaseous_tools;
+using System.Text.Json.Serialization;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -77,9 +75,16 @@ namespace gaseous_server.Classes.Metadata
                     UpdateSubClasses(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    UpdateSubClasses(returnValue);
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AgeRating>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AgeRating>(returnValue, "id", (long)searchValue);
@@ -147,6 +152,202 @@ namespace gaseous_server.Classes.Metadata
             public AgeRatingTitle RatingTitle { get; set; }
             public string[] Descriptions { get; set; }
         }
+
+        public class AgeGroups
+        {
+            public AgeGroups()
+            {
+
+            }
+
+            public static Dictionary<string, List<AgeGroupItem>> AgeGroupings
+            {
+                get
+                {
+                    return new Dictionary<string, List<AgeGroupItem>>{
+                        { 
+                            "Adult", new List<AgeGroupItem>{ Adult_Item, Mature_Item, Teen_Item, Child_Item } 
+                        },
+                        {
+                            "Mature", new List<AgeGroupItem>{ Mature_Item, Teen_Item, Child_Item }
+                        },
+                        {
+                            "Teen", new List<AgeGroupItem>{ Teen_Item, Child_Item }
+                        },
+                        { 
+                            "Child", new List<AgeGroupItem>{ Child_Item }
+                        }
+                    };
+                }
+            }
+
+            public static Dictionary<string, AgeGroupItem> AgeGroupingsFlat
+            {
+                get
+                {
+                    return new Dictionary<string, AgeGroupItem>{
+                        {
+                            "Adult", Adult_Item
+                        },
+                        {
+                            "Mature", Mature_Item
+                        },
+                        {
+                            "Teen", Teen_Item
+                        },
+                        {
+                            "Child", Child_Item
+                        }
+                    };
+                }
+            }
+
+            public static List<ClassificationBoardItem> ClassificationBoards
+            {
+                get
+                {
+                    ClassificationBoardItem boardItem = new ClassificationBoardItem{ 
+                        Board = AgeRatingCategory.ACB, 
+                        Classifications = new List<AgeRatingTitle>{
+                            AgeRatingTitle.ACB_G, AgeRatingTitle.ACB_M, AgeRatingTitle.ACB_MA15, AgeRatingTitle.ACB_R18, AgeRatingTitle.ACB_RC
+                        }
+                    };
+
+                    return new List<ClassificationBoardItem>{
+                        new ClassificationBoardItem{ 
+                            Board = AgeRatingCategory.ACB, 
+                            Classifications = new List<AgeRatingTitle>{
+                                AgeRatingTitle.ACB_G,
+                                AgeRatingTitle.ACB_M,
+                                AgeRatingTitle.ACB_MA15,
+                                AgeRatingTitle.ACB_R18,
+                                AgeRatingTitle.ACB_RC
+                            }
+                        },
+                        new ClassificationBoardItem{ 
+                            Board = AgeRatingCategory.CERO, 
+                            Classifications = new List<AgeRatingTitle>{
+                                AgeRatingTitle.CERO_A,
+                                AgeRatingTitle.CERO_B,
+                                AgeRatingTitle.CERO_C,
+                                AgeRatingTitle.CERO_D,
+                                AgeRatingTitle.CERO_Z
+                            }
+                        },
+                        new ClassificationBoardItem{ 
+                            Board = AgeRatingCategory.CLASS_IND, 
+                            Classifications = new List<AgeRatingTitle>{
+                                AgeRatingTitle.CLASS_IND_L,
+                                AgeRatingTitle.CLASS_IND_Ten,
+                                AgeRatingTitle.CLASS_IND_Twelve,
+                                AgeRatingTitle.CLASS_IND_Fourteen,
+                                AgeRatingTitle.CLASS_IND_Sixteen,
+                                AgeRatingTitle.CLASS_IND_Eighteen
+                            }
+                        }
+                    };
+                }
+            }
+
+            readonly static AgeGroupItem Adult_Item = new AgeGroupItem{
+                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_R18, AgeRatingTitle.ACB_RC },
+                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_Z },
+                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Eighteen },
+                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.RP, AgeRatingTitle.AO },
+                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Eighteen },
+                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Eighteen},
+                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_18}
+            };
+
+            readonly static AgeGroupItem Mature_Item = new AgeGroupItem{
+                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_M, AgeRatingTitle.ACB_MA15 },
+                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_C, AgeRatingTitle.CERO_D },
+                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Sixteen },
+                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.M },
+                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Fifteen },
+                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Sixteen},
+                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_16}
+            };
+
+            readonly static AgeGroupItem Teen_Item = new AgeGroupItem{
+                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_PG },
+                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_B },
+                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_Twelve, AgeRatingTitle.CLASS_IND_Fourteen },
+                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.T },
+                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_Twelve },
+                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Twelve},
+                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_12}
+            };
+
+            readonly static AgeGroupItem Child_Item = new AgeGroupItem{
+                ACB         = new List<AgeRatingTitle>{ AgeRatingTitle.ACB_G },
+                CERO        = new List<AgeRatingTitle>{ AgeRatingTitle.CERO_A },
+                CLASS_IND   = new List<AgeRatingTitle>{ AgeRatingTitle.CLASS_IND_L, AgeRatingTitle.CLASS_IND_Ten },
+                ESRB        = new List<AgeRatingTitle>{ AgeRatingTitle.E, AgeRatingTitle.E10 },
+                GRAC        = new List<AgeRatingTitle>{ AgeRatingTitle.GRAC_All },
+                PEGI        = new List<AgeRatingTitle>{ AgeRatingTitle.Three, AgeRatingTitle.Seven},
+                USK         = new List<AgeRatingTitle>{ AgeRatingTitle.USK_0, AgeRatingTitle.USK_6}
+            };
+
+            public class AgeGroupItem
+            {
+                public List<IGDB.Models.AgeRatingTitle> ACB { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> CERO { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> CLASS_IND { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> ESRB { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> GRAC { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> PEGI { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> USK { get; set; }
+
+                [JsonIgnore]
+                [Newtonsoft.Json.JsonIgnore]
+                public List<long> AgeGroupItemValues
+                {
+                    get
+                    {
+                        List<long> values = new List<long>();
+                        {
+                            foreach (AgeRatingTitle ageRatingTitle in ACB)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in CERO)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in CLASS_IND)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in ESRB)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in GRAC)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in PEGI)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                            foreach (AgeRatingTitle ageRatingTitle in USK)
+                            {
+                                values.Add((long)ageRatingTitle);
+                            }
+                        }
+
+                        return values;
+                    }
+                }
+            }
+
+            public class ClassificationBoardItem
+            {
+                public IGDB.Models.AgeRatingCategory Board { get; set; }
+                public List<IGDB.Models.AgeRatingTitle> Classifications { get; set; }
+            }
+        }
 	}
 }
 

gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -75,8 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AgeRatingContentDescription>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AgeRatingContentDescription>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/AlternativeNames.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -75,8 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AlternativeName>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AlternativeName>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Artworks.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -78,9 +76,16 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Artwork>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Artwork>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Collections.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -75,8 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Collection>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Collection>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Company.cs

@@ -1,5 +1,4 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -74,9 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     UpdateSubClasses(returnValue);
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    if (returnValue != null) { Storage.NewCacheValue(returnValue, true); }
+                    {
-                    UpdateSubClasses(returnValue);
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Company>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Company>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/CompanyLogos.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -80,12 +78,17 @@ namespace gaseous_server.Classes.Metadata
                     }
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                    try
-                    if (returnValue != null)
                     {
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                         Storage.NewCacheValue(returnValue, true);
                         forceImageDownload = true;
                     }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<CompanyLogo>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<CompanyLogo>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Covers.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -77,9 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                        forceImageDownload = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Cover>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Cover>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/ExternalGames.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -78,11 +76,16 @@ namespace gaseous_server.Classes.Metadata
                     }
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    if (returnValue != null)
                     {
+                        returnValue = await GetObjectFromServer(WhereClause);
                         Storage.NewCacheValue(returnValue, true);
                     }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<ExternalGame>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<ExternalGame>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Franchises.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -75,8 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Franchise>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Franchise>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/GameModes.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -68,18 +66,23 @@ namespace gaseous_server.Classes.Metadata
             }
 
             GameMode returnValue = new GameMode();
-            bool forceImageDownload = false;
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    forceImageDownload = true;
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<GameMode>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<GameMode>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/GameVideos.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -68,18 +66,23 @@ namespace gaseous_server.Classes.Metadata
             }
 
             GameVideo returnValue = new GameVideo();
-            bool forceImageDownload = false;
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<GameVideo>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<GameVideo>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Games.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Data;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -15,6 +14,12 @@ namespace gaseous_server.Classes.Metadata
 
         }
 
+        public class InvalidGameId : Exception
+        { 
+            public InvalidGameId(long Id) : base("Unable to find Game by id " + Id)
+            {}
+        }
+
         private static IGDBClient igdb = new IGDBClient(
                     // Found in Twitch Developer portal for your app
                     Config.IGDB.ClientId,
@@ -102,9 +107,17 @@ namespace gaseous_server.Classes.Metadata
                     UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
                     return returnValue;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                        UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
+                    }
                     return returnValue;
                 case Storage.CacheStatus.Current:
                     return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
@@ -115,11 +128,53 @@ namespace gaseous_server.Classes.Metadata
 
         private static void UpdateSubClasses(Game Game, bool getAllMetadata, bool followSubGames)
         {
+            // required metadata
             if (Game.Cover != null)
             {
                 Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
             }
 
+            if (Game.Genres != null)
+            {
+                foreach (long GenreId in Game.Genres.Ids)
+                {
+                    Genre GameGenre = Genres.GetGenres(GenreId);
+                }
+            }
+
+            if (Game.GameModes != null)
+            {
+                foreach (long gameModeId in Game.GameModes.Ids)
+                {
+                    GameMode gameMode = GameModes.GetGame_Modes(gameModeId);
+                }
+            }
+
+            if (Game.MultiplayerModes != null)
+            {
+                foreach (long multiplayerModeId in Game.MultiplayerModes.Ids)
+                {
+                    MultiplayerMode multiplayerMode = MultiplayerModes.GetGame_MultiplayerModes(multiplayerModeId);
+                }
+            }
+
+            if (Game.PlayerPerspectives != null)
+            {
+                foreach (long PerspectiveId in Game.PlayerPerspectives.Ids)
+                {
+                    PlayerPerspective GamePlayPerspective = PlayerPerspectives.GetGame_PlayerPerspectives(PerspectiveId);
+                }
+            }
+
+            if (Game.Themes != null)
+            {
+                foreach (long ThemeId in Game.Themes.Ids)
+                {
+                    Theme GameTheme = Themes.GetGame_Themes(ThemeId);
+                }
+            }
+
+            // optional metadata - usually downloaded as needed
             if (getAllMetadata == true)
             {
                 if (Game.AgeRatings != null)
@@ -189,14 +244,6 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
-                if (Game.Genres != null)
-                {
-                    foreach (long GenreId in Game.Genres.Ids)
-                    {
-                        Genre GameGenre = Genres.GetGenres(GenreId);
-                    }
-                }
-
                 if (Game.InvolvedCompanies != null)
                 {
                     foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
@@ -205,22 +252,6 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
-                if (Game.GameModes != null)
-                {
-                    foreach (long gameModeId in Game.GameModes.Ids)
-                    {
-                        GameMode gameMode = GameModes.GetGame_Modes(gameModeId);
-                    }
-                }
-
-                if (Game.MultiplayerModes != null)
-                {
-                    foreach (long multiplayerModeId in Game.MultiplayerModes.Ids)
-                    {
-                        MultiplayerMode multiplayerMode = MultiplayerModes.GetGame_MultiplayerModes(multiplayerModeId);
-                    }
-                }
-
                 if (Game.Platforms != null)
                 {
                     foreach (long PlatformId in Game.Platforms.Ids)
@@ -229,14 +260,6 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
-                if (Game.PlayerPerspectives != null)
-                {
-                    foreach (long PerspectiveId in Game.PlayerPerspectives.Ids)
-                    {
-                        PlayerPerspective GamePlayPerspective = PlayerPerspectives.GetGame_PlayerPerspectives(PerspectiveId);
-                    }
-                }
-
                 if (Game.Screenshots != null)
                 {
                     foreach (long ScreenshotId in Game.Screenshots.Ids)
@@ -245,14 +268,6 @@ namespace gaseous_server.Classes.Metadata
                     }
                 }
 
-                if (Game.Themes != null)
-                {
-                    foreach (long ThemeId in Game.Themes.Ids)
-                    {
-                        Theme GameTheme = Themes.GetGame_Themes(ThemeId);
-                    }
-                }
-
                 if (Game.Videos != null)
                 {
                     foreach (long GameVideoId in Game.Videos.Ids)

gaseous-server/Classes/Metadata/Genres.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -68,18 +66,23 @@ namespace gaseous_server.Classes.Metadata
             }
 
             Genre returnValue = new Genre();
-            bool forceImageDownload = false;
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Genre>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Genre>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/InvolvedCompany.cs

@@ -1,5 +1,4 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -74,9 +73,16 @@ namespace gaseous_server.Classes.Metadata
                     UpdateSubClasses(returnValue);
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    UpdateSubClasses(returnValue);
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<InvolvedCompany>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<InvolvedCompany>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/MultiplayerModes.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -68,18 +66,23 @@ namespace gaseous_server.Classes.Metadata
             }
 
             MultiplayerMode returnValue = new MultiplayerMode();
-            bool forceImageDownload = false;
             switch (cacheStatus)
             {
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    forceImageDownload = true;
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<MultiplayerMode>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<MultiplayerMode>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/PlatformLogos.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -80,12 +78,17 @@ namespace gaseous_server.Classes.Metadata
                     }
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                    try
-                    if (returnValue != null)
                     {
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
                         Storage.NewCacheValue(returnValue, true);
                         forceImageDownload = true;
                     }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<PlatformLogo>(returnValue, "id", (long)searchValue);
+                    }
                     break;  
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<PlatformLogo>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/PlatformVersions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Data;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -78,12 +77,17 @@ namespace gaseous_server.Classes.Metadata
                     }
                     return returnValue;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    if (returnValue != null)
                     {
+                        returnValue = await GetObjectFromServer(WhereClause);
                         Storage.NewCacheValue(returnValue, true);
                         UpdateSubClasses(ParentPlatform, returnValue);
                     }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<PlatformVersion>(returnValue, "id", (long)searchValue);
+                    }
                     return returnValue;
                 case Storage.CacheStatus.Current:
                     return Storage.GetCacheValue<PlatformVersion>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Platforms.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Data;
 using System.Net;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
 
@@ -22,7 +21,7 @@ namespace gaseous_server.Classes.Metadata
                     Config.IGDB.Secret
                 );
 
-        public static Platform? GetPlatform(long Id)
+        public static Platform? GetPlatform(long Id, bool forceRefresh = false)
 		{
             if (Id == 0)
             {
@@ -46,18 +45,18 @@ namespace gaseous_server.Classes.Metadata
             }
             else
             {
-                Task<Platform> RetVal = _GetPlatform(SearchUsing.id, Id);
+                Task<Platform> RetVal = _GetPlatform(SearchUsing.id, Id, forceRefresh);
                 return RetVal.Result;
             }
         }
 
-		public static Platform GetPlatform(string Slug)
+		public static Platform GetPlatform(string Slug, bool forceRefresh = false)
 		{
-			Task<Platform> RetVal = _GetPlatform(SearchUsing.slug, Slug);
+			Task<Platform> RetVal = _GetPlatform(SearchUsing.slug, Slug, forceRefresh);
 			return RetVal.Result;
 		}
 
-		private static async Task<Platform> _GetPlatform(SearchUsing searchUsing, object searchValue)
+		private static async Task<Platform> _GetPlatform(SearchUsing searchUsing, object searchValue, bool forceRefresh)
 		{
             // check database first
             Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
@@ -70,6 +69,11 @@ namespace gaseous_server.Classes.Metadata
                 cacheStatus = Storage.GetCacheStatus("Platform", (string)searchValue);
             }
 
+            if (forceRefresh == true)
+            {
+                if (cacheStatus == Storage.CacheStatus.Current) { cacheStatus = Storage.CacheStatus.Expired; }
+            }
+
             // set up where clause
             string WhereClause = "";
             switch (searchUsing)
@@ -91,12 +95,22 @@ namespace gaseous_server.Classes.Metadata
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
                     UpdateSubClasses(returnValue);
+                    AddPlatformMapping(returnValue);
                     return returnValue;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    UpdateSubClasses(returnValue);
+                        returnValue = await GetObjectFromServer(WhereClause);
-                    return returnValue;
+                        Storage.NewCacheValue(returnValue, true);
+                        UpdateSubClasses(returnValue);
+                        AddPlatformMapping(returnValue);
+                        return returnValue;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        return Storage.GetCacheValue<Platform>(returnValue, "id", (long)searchValue);
+                    }
                 case Storage.CacheStatus.Current:
                     return Storage.GetCacheValue<Platform>(returnValue, "id", (long)searchValue);
                 default:
@@ -120,6 +134,31 @@ namespace gaseous_server.Classes.Metadata
             }
         }
 
+        private static void AddPlatformMapping(Platform platform)
+        {
+            // ensure a mapping item exists for this platform
+            Models.PlatformMapping.PlatformMapItem item = new Models.PlatformMapping.PlatformMapItem();
+            try
+            {
+                Logging.Log(Logging.LogType.Information, "Platform Map", "Checking if " + platform.Name + " is in database.");
+                item = Models.PlatformMapping.GetPlatformMap((long)platform.Id);
+                // exists - skip
+                Logging.Log(Logging.LogType.Information, "Platform Map", "Skipping import of " + platform.Name + " - already in database.");
+            }
+            catch
+            {
+                Logging.Log(Logging.LogType.Information, "Platform Map", "Importing " + platform.Name + " from predefined data.");
+                // doesn't exist - add it
+                item = new Models.PlatformMapping.PlatformMapItem{
+                    IGDBId = (long)platform.Id,
+                    IGDBName = platform.Name,
+                    IGDBSlug = platform.Slug,
+                    AlternateNames = new List<string>{ platform.AlternativeName }
+                };
+                Models.PlatformMapping.WritePlatformMap(item, false, true);
+            }
+        }
+
         private enum SearchUsing
         {
             id,

gaseous-server/Classes/Metadata/PlayerPerspectives.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -77,9 +75,16 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<PlayerPerspective>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<PlayerPerspective>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Screenshots.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -78,9 +76,17 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                        forceImageDownload = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Screenshot>(returnValue, "id", (long)searchValue);
+                    }
                     break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Screenshot>(returnValue, "id", (long)searchValue);

gaseous-server/Classes/Metadata/Storage.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Data;
 using System.Reflection;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -16,14 +16,32 @@ namespace gaseous_server.Classes.Metadata
 			Expired
 		}
 
+        private static Dictionary<string, MemoryCacheObject> ObjectCache = new Dictionary<string, MemoryCacheObject>();
+
 		public static CacheStatus GetCacheStatus(string Endpoint, string Slug)
 		{
-			return _GetCacheStatus(Endpoint, "slug", Slug);
+            CacheClean();
+            if (ObjectCache.ContainsKey(Endpoint + Slug))
+            {
+                return CacheStatus.Current;
+            }
+            else
+            {
+			    return _GetCacheStatus(Endpoint, "slug", Slug);
+            }
 		}
 
         public static CacheStatus GetCacheStatus(string Endpoint, long Id)
         {
-			return _GetCacheStatus(Endpoint, "id", Id);
+            CacheClean();
+            if (ObjectCache.ContainsKey(Endpoint + Id))
+            {
+                return CacheStatus.Current;
+            }
+            else
+			{
+                return _GetCacheStatus(Endpoint, "id", Id);
+            }
         }
 
         public static CacheStatus GetCacheStatus(DataRow Row)
@@ -48,7 +66,7 @@ namespace gaseous_server.Classes.Metadata
 
         private static CacheStatus _GetCacheStatus(string Endpoint, string SearchField, object SearchValue)
 		{
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
 			string sql = "SELECT lastUpdated FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField;
 
@@ -134,6 +152,9 @@ namespace gaseous_server.Classes.Metadata
                                     newDict = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, object>>(newObjectValue);
 									newObjectValue = Newtonsoft.Json.JsonConvert.SerializeObject(newDict["Ids"]);
                                     objectDict[key.Key] = newObjectValue;
+
+                                    StoreRelations(ObjectTypeName, key.Key, (long)objectDict["Id"], newObjectValue);
+
                                     break;
 								case "int32[]":
                                     newObjectValue = Newtonsoft.Json.JsonConvert.SerializeObject(objectValue);
@@ -156,7 +177,7 @@ namespace gaseous_server.Classes.Metadata
 			}
 
             // execute sql
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			db.ExecuteCMD(sql, objectDict);
         }
 
@@ -164,7 +185,22 @@ namespace gaseous_server.Classes.Metadata
 		{
             string Endpoint = EndpointType.GetType().Name;
 
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            if (ObjectCache.ContainsKey(Endpoint + SearchValue))
+            {
+                MemoryCacheObject cacheObject = ObjectCache[Endpoint + SearchValue];
+                if (cacheObject.ExpiryTime < DateTime.UtcNow)
+                {
+                    // object has expired, remove it
+                    ObjectCache.Remove(Endpoint + SearchValue);
+                }
+                else
+                {
+                    // object is valid, return it
+                    return (T)cacheObject.Object;
+                }
+            }
+
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             string sql = "SELECT * FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField;
 
@@ -181,7 +217,11 @@ namespace gaseous_server.Classes.Metadata
             else
             {
 				DataRow dataRow = dt.Rows[0];
-                return BuildCacheObject<T>(EndpointType, dataRow);
+                object returnObject = BuildCacheObject<T>(EndpointType, dataRow);
+                ObjectCache.Add(Endpoint + SearchValue, new MemoryCacheObject{
+                    Object = returnObject
+                });
+                return (T)returnObject;
             }
         }
 
@@ -380,6 +420,75 @@ namespace gaseous_server.Classes.Metadata
 
             return EndpointType;
         }
+
+        private static void StoreRelations(string PrimaryTable, string SecondaryTable, long ObjectId, string Relations)
+        {
+            string TableName = "Relation_" + PrimaryTable + "_" + SecondaryTable;
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM information_schema.tables WHERE table_schema = '" + Config.DatabaseConfiguration.DatabaseName + "' AND table_name = '" + TableName + "';";
+            DataTable data = db.ExecuteCMD(sql);
+            if (data.Rows.Count == 0)
+            {
+                // table doesn't exist, create it
+                sql = "CREATE TABLE `" + Config.DatabaseConfiguration.DatabaseName + "`.`" + TableName + "` (`" + PrimaryTable + "Id` BIGINT NOT NULL, `" + SecondaryTable + "Id` BIGINT NOT NULL, PRIMARY KEY (`" + PrimaryTable + "Id`, `" + SecondaryTable + "Id`), INDEX `idx_PrimaryColumn` (`" + PrimaryTable + "Id` ASC) VISIBLE);";
+                db.ExecuteCMD(sql);
+            }
+            else
+            {
+                // clean existing records for this object
+                sql = "DELETE FROM " + TableName + " WHERE `" + PrimaryTable + "Id` = @objectid";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("objectid", ObjectId);
+                db.ExecuteCMD(sql, dbDict);
+            }
+
+            // insert data
+            long[] RelationValues = Newtonsoft.Json.JsonConvert.DeserializeObject<long[]>(Relations);
+            foreach (long RelationValue in RelationValues)
+            {
+                sql = "INSERT INTO " + TableName + " (`" + PrimaryTable + "Id`, `" + SecondaryTable + "Id`) VALUES (@objectid, @relationvalue);";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("objectid", ObjectId);
+                dbDict.Add("relationvalue", RelationValue);
+                db.ExecuteCMD(sql, dbDict);
+            }
+        }
+
+        private static void CacheClean()
+        {
+            try
+            {
+                if (ObjectCache == null)
+                {
+                    ObjectCache = new Dictionary<string, MemoryCacheObject>();
+                }
+                Dictionary<string, MemoryCacheObject> workCache = ObjectCache;
+                foreach (KeyValuePair<string, MemoryCacheObject> objectCache in workCache)
+                {
+                    if (objectCache.Value.ExpiryTime < DateTime.UtcNow)
+                    {
+                        ObjectCache.Remove(objectCache.Key);
+                    }
+                }
+            }
+            catch
+            {
+                ObjectCache = new Dictionary<string, MemoryCacheObject>();
+            }
+        }
+
+        private class MemoryCacheObject
+        {
+            public object Object { get; set; }
+            public DateTime CreationTime { get; } = DateTime.UtcNow;
+            public DateTime ExpiryTime 
+            {
+                get
+                {
+                    return CreationTime.AddMinutes(60);
+                }
+            }
+        }
     }
 }
 

gaseous-server/Classes/Metadata/Themes.cs

@@ -1,9 +1,7 @@
 using System;
-using gaseous_tools;
 using IGDB;
 using IGDB.Models;
-using MySqlX.XDevAPI.Common;
+
-using static gaseous_tools.Config.ConfigFile;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -77,10 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
+                    try
-                    Storage.NewCacheValue(returnValue, true);
+                    {
-                    forceImageDownload = true;
+                        returnValue = await GetObjectFromServer(WhereClause);
-                    break;
+                        Storage.NewCacheValue(returnValue, true);
+                        return returnValue;
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        return Storage.GetCacheValue<Theme>(returnValue, "id", (long)searchValue);
+                    }
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Theme>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/MetadataManagement.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using gaseous_tools;
+using gaseous_server.Models;
 
 namespace gaseous_server.Classes
 {
@@ -8,9 +8,30 @@ namespace gaseous_server.Classes
 	{
 		public static void RefreshMetadata(bool forceRefresh = false)
 		{
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT Id, `Name` FROM Game;";
+            string sql = "";
-			DataTable dt = db.ExecuteCMD(sql);
+			DataTable dt = new DataTable();
+			
+			// update platforms
+			sql = "SELECT Id, `Name` FROM Platform;";
+			dt = db.ExecuteCMD(sql);
+
+			foreach (DataRow dr in dt.Rows)
+			{
+				try
+				{
+					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for platform " + dr["name"] + " (" + dr["id"] + ")");
+					Metadata.Platforms.GetPlatform((long)dr["id"], true);
+				}
+				catch (Exception ex)
+				{
+					Logging.Log(Logging.LogType.Critical, "Metadata Refresh", "An error occurred while refreshing metadata for " + dr["name"], ex);
+				}
+			}
+
+			// update games
+			sql = "SELECT Id, `Name` FROM Game;";
+			dt = db.ExecuteCMD(sql);
 
 			foreach (DataRow dr in dt.Rows)
 			{

gaseous-server/Classes/RomMediaGroup.cs

@@ -0,0 +1,440 @@
+using System;
+using System.Data;
+using gaseous_signature_parser.models.RomSignatureObject;
+using Microsoft.VisualBasic;
+using IGDB.Models;
+using gaseous_server.Classes.Metadata;
+using System.IO.Compression;
+
+namespace gaseous_server.Classes
+{
+	public class RomMediaGroup
+    {
+        public class InvalidMediaGroupId : Exception
+        { 
+            public InvalidMediaGroupId(long Id) : base("Unable to find media group by id " + Id)
+            {}
+        }
+
+        public static GameRomMediaGroupItem CreateMediaGroup(long GameId, long PlatformId, List<long> RomIds)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "INSERT INTO RomMediaGroup (Status, PlatformId, GameId) VALUES (@status, @platformid, @gameid); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("status", GameRomMediaGroupItem.GroupBuildStatus.WaitingForBuild);
+            dbDict.Add("gameid", GameId);
+            dbDict.Add("platformid", PlatformId);
+            DataTable mgInsert = db.ExecuteCMD(sql, dbDict);
+            long mgId = (long)mgInsert.Rows[0][0];
+            foreach (long RomId in RomIds)
+            {
+                try
+                {
+                    Roms.GameRomItem gameRomItem = Roms.GetRom(RomId);
+                    if (gameRomItem.PlatformId == PlatformId)
+                    {
+                        sql = "INSERT INTO RomMediaGroup_Members (GroupId, RomId) VALUES (@groupid, @romid);";
+                        dbDict.Clear();
+                        dbDict.Add("groupid", mgId);
+                        dbDict.Add("romid", RomId);
+                        db.ExecuteCMD(sql, dbDict);
+                    }
+                    else
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Media Group", "Unable to add ROM id " + RomId + " to group. ROM platform is different from group platform.");
+                    }
+                }
+                catch (Roms.InvalidRomId irid)
+                {
+                    Logging.Log(Logging.LogType.Warning, "Media Group", "Unable to add ROM id " + RomId + " to group. ROM doesn't exist", irid);
+                }
+            }
+
+            StartMediaGroupBuild(mgId);
+
+            return GetMediaGroup(mgId);
+        }
+
+        public static GameRomMediaGroupItem GetMediaGroup(long Id)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM RomMediaGroup WHERE Id=@id;";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("id", Id);
+
+            DataTable dataTable = db.ExecuteCMD(sql, dbDict);
+
+            if (dataTable.Rows.Count == 0)
+            {
+                throw new InvalidMediaGroupId(Id);
+            }
+            else
+            {
+                GameRomMediaGroupItem mediaGroupItem = BuildMediaGroupFromRow(dataTable.Rows[0]);
+                return mediaGroupItem;
+            }
+        }
+
+        public static List<GameRomMediaGroupItem> GetMediaGroupsFromGameId(long GameId)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM RomMediaGroup WHERE GameId=@gameid;";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("gameid", GameId);
+
+            DataTable dataTable = db.ExecuteCMD(sql, dbDict);
+
+            List<GameRomMediaGroupItem> mediaGroupItems = new List<GameRomMediaGroupItem>();
+
+            foreach (DataRow row in dataTable.Rows)
+            {
+                mediaGroupItems.Add(BuildMediaGroupFromRow(row));
+            }
+
+            mediaGroupItems.Sort((x, y) => x.PlatformName.CompareTo(y.PlatformName));
+
+            return mediaGroupItems;
+        }
+
+        public static GameRomMediaGroupItem EditMediaGroup(long Id, List<long> RomIds)
+        {
+            GameRomMediaGroupItem mg = GetMediaGroup(Id);
+
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+
+            // delete roms from group
+            sql = "DELETE FROM RomMediaGroup_Members WHERE GroupId=@groupid;";
+            dbDict.Clear();
+            dbDict.Add("groupid", Id);
+            db.ExecuteCMD(sql, dbDict);
+
+            // add roms to group
+            foreach (long RomId in RomIds)
+            {
+                try
+                {
+                    Roms.GameRomItem gameRomItem = Roms.GetRom(RomId);
+                    if (gameRomItem.PlatformId == mg.PlatformId)
+                    {
+                        sql = "INSERT INTO RomMediaGroup_Members (GroupId, RomId) VALUES (@groupid, @romid);";
+                        dbDict.Clear();
+                        dbDict.Add("groupid", Id);
+                        dbDict.Add("romid", RomId);
+                        db.ExecuteCMD(sql, dbDict);
+                    }
+                    else
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Media Group", "Unable to add ROM id " + RomId + " to group. ROM platform is different from group platform.");
+                    }
+                }
+                catch (Roms.InvalidRomId irid)
+                {
+                    Logging.Log(Logging.LogType.Warning, "Media Group", "Unable to add ROM id " + RomId + " to group. ROM doesn't exist", irid);
+                }
+            }
+
+            // set group to rebuild
+            sql = "UPDATE RomMediaGroup SET Status=1 WHERE GroupId=@groupid;";
+            dbDict.Clear();
+            dbDict.Add("groupid", Id);
+            db.ExecuteCMD(sql, dbDict);
+
+            string MediaGroupZipPath = Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, Id + ".zip");
+            if (File.Exists(MediaGroupZipPath))
+            {
+                File.Delete(MediaGroupZipPath);
+            }
+
+            StartMediaGroupBuild(Id);
+
+            // return to caller
+            return GetMediaGroup(Id);
+        }
+
+        public static void DeleteMediaGroup(long Id)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "DELETE FROM RomMediaGroup WHERE Id=@id;";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("id", Id);
+            db.ExecuteCMD(sql, dbDict);
+
+            string MediaGroupZipPath = Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, Id + ".zip");
+            if (File.Exists(MediaGroupZipPath))
+            {
+                File.Delete(MediaGroupZipPath);
+            }
+        }
+
+        internal static GameRomMediaGroupItem BuildMediaGroupFromRow(DataRow row)
+        {
+            GameRomMediaGroupItem mediaGroupItem = new GameRomMediaGroupItem();
+            mediaGroupItem.Id = (long)row["Id"];
+            mediaGroupItem.Status = (GameRomMediaGroupItem.GroupBuildStatus)row["Status"];
+            mediaGroupItem.PlatformId = (long)row["PlatformId"];
+            mediaGroupItem.GameId = (long)row["GameId"];
+            mediaGroupItem.RomIds = new List<long>();
+
+            // get members
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT * FROM RomMediaGroup_Members WHERE GroupId=@id;";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            dbDict.Add("id", mediaGroupItem.Id);
+            DataTable data = db.ExecuteCMD(sql, dbDict);
+            foreach (DataRow dataRow in data.Rows)
+            {
+                mediaGroupItem.RomIds.Add((long)dataRow["RomId"]);
+            }
+
+            return mediaGroupItem;
+        }
+
+        public static void StartMediaGroupBuild(long Id)
+        {
+            GameRomMediaGroupItem mediaGroupItem = GetMediaGroup(Id);
+
+            if (mediaGroupItem.Status != GameRomMediaGroupItem.GroupBuildStatus.Building)
+            {
+                // set collection item to waitingforbuild
+                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                string sql = "UPDATE RomMediaGroup SET Status=@bs WHERE Id=@id";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("id", Id);
+                dbDict.Add("bs", GameRomMediaGroupItem.GroupBuildStatus.WaitingForBuild);
+                db.ExecuteCMD(sql, dbDict);
+
+                // start background task
+                ProcessQueue.QueueItem queueItem = new ProcessQueue.QueueItem(ProcessQueue.QueueItemType.MediaGroupCompiler, 1, false, true);
+                queueItem.Options = Id;
+                queueItem.ForceExecute();
+                ProcessQueue.QueueItems.Add(queueItem);
+            }
+        }
+
+        public static void CompileMediaGroup(long Id)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+            GameRomMediaGroupItem mediaGroupItem = GetMediaGroup(Id);
+            if (mediaGroupItem.Status == GameRomMediaGroupItem.GroupBuildStatus.WaitingForBuild)
+            {
+                Game GameObject = Games.GetGame(mediaGroupItem.GameId, false, false, false);
+                Platform PlatformObject = Platforms.GetPlatform(mediaGroupItem.PlatformId, false);
+
+                Logging.Log(Logging.LogType.Information, "Media Group", "Beginning build of media group: " + GameObject.Name + " for platform " + PlatformObject.Name);
+
+                // set starting
+                string sql = "UPDATE RomMediaGroup SET Status=@bs WHERE Id=@id";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("id", mediaGroupItem.Id);
+                dbDict.Add("bs", GameRomMediaGroupItem.GroupBuildStatus.Building);
+                db.ExecuteCMD(sql, dbDict);
+
+                string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, mediaGroupItem.Id + ".zip");
+                string ZipFileTempPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, mediaGroupItem.Id.ToString());
+
+                try
+                {
+                    // clean up if needed
+                    if (File.Exists(ZipFilePath))
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Media Group", "Deleting existing build of media group: " + GameObject.Name + " for platform " + PlatformObject.Name);
+                        File.Delete(ZipFilePath);
+                    }
+
+                    if (Directory.Exists(ZipFileTempPath))
+                    {
+                        Directory.Delete(ZipFileTempPath, true);
+                    }
+
+                    // gather media group files
+                    Directory.CreateDirectory(ZipFileTempPath);
+                    List<Roms.GameRomItem> romItems = new List<Roms.GameRomItem>();
+                    List<string> M3UFileContents = new List<string>();
+                    foreach (long RomId in mediaGroupItem.RomIds)
+                    {
+                        Roms.GameRomItem rom = Roms.GetRom(RomId);
+                        if (File.Exists(rom.Path))
+                        {
+                            Logging.Log(Logging.LogType.Information, "Media Group", "Copying ROM: " + rom.Name);
+                            File.Copy(rom.Path, Path.Combine(ZipFileTempPath, Path.GetFileName(rom.Path)));
+
+                            romItems.Add(rom);
+                        }
+                    }
+
+                    // build m3u
+                    romItems.Sort((a, b) =>
+                        {
+                            if (a.MediaDetail != null)
+                            {
+                                if (a.MediaDetail.Number != null && a.MediaDetail.Side != null)
+                                {
+                                    var firstCompare = a.MediaDetail.Number.ToString().CompareTo(b.MediaDetail.Number.ToString());
+                                    return firstCompare != 0 ? firstCompare : a.MediaDetail.Side.CompareTo(b.MediaDetail.Side);
+                                }
+                                else if (a.MediaDetail.Number != null && a.MediaDetail.Side == null)
+                                {
+                                    return a.MediaDetail.Number.ToString().CompareTo(b.MediaDetail.Number.ToString());
+                                }
+                                else if (a.MediaDetail.Number == null && a.MediaDetail.Side != null)
+                                {
+                                    return a.MediaDetail.Side.ToString().CompareTo(b.MediaDetail.Side.ToString());
+                                }
+                                else
+                                {
+                                    return a.Name.CompareTo(b.Name);
+                                }
+                            }
+                            else
+                            {
+                                return a.Name.CompareTo(b.Name);
+                            }
+                        }
+                    );
+                    foreach (Roms.GameRomItem romItem in romItems)
+                    {
+                        string M3UFileContent = "";
+                        M3UFileContent += romItem.Name;
+                        if (romItem.MediaLabel.Length == 0)
+                        {
+                            if (romItem.RomTypeMedia.Length > 0)
+                            {
+                                M3UFileContent += "|" + romItem.RomTypeMedia;
+                            }
+                        }
+                        else
+                        {
+                            M3UFileContent += "|" + romItem.MediaLabel;
+                        }
+                        M3UFileContents.Add(M3UFileContent);
+                    }
+
+                    File.WriteAllText(Path.Combine(ZipFileTempPath, GameObject.Name + ".m3u"), String.Join(Environment.NewLine, M3UFileContents));
+
+                    // compress to zip
+                    Logging.Log(Logging.LogType.Information, "Media Group", "Compressing media group");
+                    if (!Directory.Exists(Config.LibraryConfiguration.LibraryMediaGroupDirectory))
+                    {
+                        Directory.CreateDirectory(Config.LibraryConfiguration.LibraryMediaGroupDirectory);
+                    }
+                    ZipFile.CreateFromDirectory(ZipFileTempPath, ZipFilePath, CompressionLevel.SmallestSize, false);
+
+                    // clean up
+                    if (Directory.Exists(ZipFileTempPath))
+                    {
+                        Logging.Log(Logging.LogType.Information, "Media Group", "Cleaning up");
+                        Directory.Delete(ZipFileTempPath, true);
+                    }
+
+                    // set completed
+                    dbDict["bs"] = GameRomMediaGroupItem.GroupBuildStatus.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"] = GameRomMediaGroupItem.GroupBuildStatus.Failed;
+                    db.ExecuteCMD(sql, dbDict);
+
+                    Logging.Log(Logging.LogType.Critical, "Media Group", "Media Group building has failed", ex);
+                }
+            }
+        }
+
+        public class GameRomMediaGroupItem
+		{
+			public long Id { get; set; }
+			public long GameId { get; set; }
+			public long PlatformId { get; set; }
+            public string PlatformName {
+                get
+                {
+                    try
+                    {
+                        return Platforms.GetPlatform(PlatformId, false).Name;
+                    }
+                    catch
+                    {
+                        return "Unknown";
+                    }
+                }
+            }
+			public List<long> RomIds { get; set; }
+			private GroupBuildStatus _Status { get; set; }
+			public GroupBuildStatus Status {
+				get
+				{
+					if (_Status == GroupBuildStatus.Completed)
+					{
+						if (File.Exists(MediaGroupZipPath))
+						{
+							return GroupBuildStatus.Completed;
+						}
+						else
+						{
+							return GroupBuildStatus.NoStatus;
+						}
+					}
+					else
+					{
+						return _Status;
+					}
+				}
+                set
+                {
+                    _Status = value;
+                }
+			}
+			public long? Size {
+				get
+                {
+                    if (Status == GroupBuildStatus.Completed)
+                    {
+                        if (File.Exists(MediaGroupZipPath))
+                        {
+                            FileInfo fi = new FileInfo(MediaGroupZipPath);
+                            return fi.Length;
+                        }
+                        else
+                        {
+                            return 0;
+                        }
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+			}
+			internal string MediaGroupZipPath
+			{
+				get
+				{
+					return Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, Id + ".zip");
+				}
+			}
+			public enum GroupBuildStatus
+            {
+                NoStatus = 0,
+                WaitingForBuild = 1,
+                Building = 2,
+                Completed = 3,
+                Failed = 4
+            }
+		}
+    }
+}

gaseous-server/Classes/Roms.cs

@@ -1,14 +1,24 @@
 using System;
 using System.Data;
-using gaseous_tools;
+using gaseous_signature_parser.models.RomSignatureObject;
+using static gaseous_server.Classes.RomMediaGroup;
+using gaseous_server.Classes.Metadata;
 
 namespace gaseous_server.Classes
 {
 	public class Roms
 	{
-		public static List<GameRomItem> GetRoms(long GameId, long PlatformId = -1)
+		public class InvalidRomId : Exception
+        { 
+            public InvalidRomId(long Id) : base("Unable to find ROM by id " + Id)
+            {}
+        }
+
+		public static GameRomObject GetRoms(long GameId, long PlatformId = -1)
 		{
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+			GameRomObject GameRoms = new GameRomObject();
+
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", GameId);
@@ -23,23 +33,25 @@ namespace gaseous_server.Classes
 
             if (romDT.Rows.Count > 0)
             {
-				List<GameRomItem> romItems = new List<GameRomItem>();
 				foreach (DataRow romDR in romDT.Rows)
 				{
-					romItems.Add(BuildRom(romDR));
+					GameRoms.GameRomItems.Add(BuildRom(romDR));
 				}
 
-				return romItems;
+				// get rom media groups
+				GameRoms.MediaGroups = Classes.RomMediaGroup.GetMediaGroupsFromGameId(GameId);
+
+				return GameRoms;
             }
             else
             {
-                throw new Exception("Unknown Game Id");
+                throw new Games.InvalidGameId(GameId);
             }
         }
 
 		public static GameRomItem GetRom(long RomId)
 		{
-			Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+			Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "SELECT * FROM Games_Roms WHERE Id = @id";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 			dbDict.Add("id", RomId);
@@ -53,7 +65,7 @@ namespace gaseous_server.Classes
 			}
 			else
 			{
-				throw new Exception("Unknown ROM Id");
+				throw new InvalidRomId(RomId);
 			}
 		}
 
@@ -65,7 +77,7 @@ namespace gaseous_server.Classes
 			// ensure metadata for gameid is present
 			IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid WHERE Id = @id";
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", RomId);
@@ -81,21 +93,24 @@ namespace gaseous_server.Classes
 		public static void DeleteRom(long RomId)
 		{
 			GameRomItem rom = GetRom(RomId);
-			if (File.Exists(rom.Path))
+			if (rom.Library.IsDefaultLibrary == true)
 			{
-				File.Delete(rom.Path);
+				if (File.Exists(rom.Path))
-			}
+				{
+					File.Delete(rom.Path);
+				}
 
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+				Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "DELETE FROM Games_Roms WHERE Id = @id";
+				string sql = "DELETE FROM Games_Roms WHERE Id = @id";
-			Dictionary<string, object> dbDict = new Dictionary<string, object>();
+				Dictionary<string, object> dbDict = new Dictionary<string, object>();
-			dbDict.Add("id", RomId);
+				dbDict.Add("id", RomId);
-			db.ExecuteCMD(sql, dbDict);
+				db.ExecuteCMD(sql, dbDict);
+			}
         }
 
 		private static GameRomItem BuildRom(DataRow romDR)
 		{
-            GameRomItem romItem = new GameRomItem
+			GameRomItem romItem = new GameRomItem
             {
                 Id = (long)romDR["id"],
                 PlatformId = (long)romDR["platformid"],
@@ -103,16 +118,18 @@ namespace gaseous_server.Classes
                 GameId = (long)romDR["gameid"],
                 Name = (string)romDR["name"],
                 Size = (long)romDR["size"],
-                CRC = (string)romDR["crc"],
+                CRC = ((string)romDR["crc"]).ToLower(),
-                MD5 = (string)romDR["md5"],
+                MD5 = ((string)romDR["md5"]).ToLower(),
-                SHA1 = (string)romDR["sha1"],
+                SHA1 = ((string)romDR["sha1"]).ToLower(),
                 DevelopmentStatus = (string)romDR["developmentstatus"],
-                Flags = Newtonsoft.Json.JsonConvert.DeserializeObject<string[]>((string)romDR["flags"]),
+                Attributes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<KeyValuePair<string, object>>>((string)Common.ReturnValueIfNull(romDR["attributes"], "[ ]")),
                 RomType = (int)romDR["romtype"],
                 RomTypeMedia = (string)romDR["romtypemedia"],
                 MediaLabel = (string)romDR["medialabel"],
                 Path = (string)romDR["path"],
-				Source = (GameRomItem.SourceType)(Int32)romDR["metadatasource"]
+				Source = (gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType)(Int32)romDR["metadatasource"],
+				SignatureSourceGameTitle = (string)Common.ReturnValueIfNull(romDR["MetadataGameName"], ""),
+				Library = GameLibrary.GetLibrary((int)romDR["LibraryId"])
             };
 
 			// check for a web emulator and update the romItem
@@ -130,6 +147,12 @@ namespace gaseous_server.Classes
             return romItem;
         }
 
+		public class GameRomObject
+		{
+			public List<GameRomMediaGroupItem> MediaGroups { get; set; } = new List<GameRomMediaGroupItem>();
+			public List<GameRomItem> GameRomItems { get; set; } = new List<GameRomItem>();
+		}
+
 		public class GameRomItem
 		{
 			public long Id { get; set; }
@@ -145,18 +168,115 @@ namespace gaseous_server.Classes
 			public string? SHA1 { get; set; }
 			public string? DevelopmentStatus { get; set; }
 			public string[]? Flags { get; set; }
+			public List<KeyValuePair<string, object>>? Attributes { get; set;}
 			public int RomType { get; set; }
 			public string? RomTypeMedia { get; set; }
+			public MediaType? MediaDetail {
+				get
+				{
+					if (RomTypeMedia != null)
+					{
+						return new MediaType(Source, RomTypeMedia);
+					}
+					else
+					{
+						return null;
+					}
+				}
+			}
 			public string? MediaLabel { get; set; }
 			public string? Path { get; set; }
-            public SourceType Source { get; set; }
+            public RomSignatureObject.Game.Rom.SignatureSourceType Source { get; set; }
-
+			public string? SignatureSourceGameTitle { get; set;}
-            public enum SourceType
+			public GameLibrary.LibraryItem Library { get; set; }
-            {
-                None = 0,
-                TOSEC = 1
-            }
         }
+
+		public class MediaType
+		{
+			public MediaType(RomSignatureObject.Game.Rom.SignatureSourceType Source, string MediaTypeString)
+			{
+				switch (Source)
+				{
+					case RomSignatureObject.Game.Rom.SignatureSourceType.TOSEC:
+						string[] typeString = MediaTypeString.Split(" ");
+
+						string inType = "";
+						foreach (string typeStringVal in typeString)
+						{
+							if (inType == "")
+							{
+								switch (typeStringVal.ToLower())
+								{
+									case "disk":
+										Media = RomSignatureObject.Game.Rom.RomTypes.Disk;
+
+										inType = typeStringVal;
+										break;
+									case "disc":
+										Media = RomSignatureObject.Game.Rom.RomTypes.Disc;
+
+										inType = typeStringVal;
+										break;
+									case "file":
+										Media = RomSignatureObject.Game.Rom.RomTypes.File;
+
+										inType = typeStringVal;
+										break;
+									case "part":
+										Media = RomSignatureObject.Game.Rom.RomTypes.Part;
+
+										inType = typeStringVal;
+										break;
+									case "tape":
+										Media = RomSignatureObject.Game.Rom.RomTypes.Tape;
+
+										inType = typeStringVal;
+										break;
+									case "of":
+										inType = typeStringVal;
+										break;
+									case "side":
+										inType = typeStringVal;
+										break;
+								}
+							}
+							else {
+								switch (inType.ToLower())
+								{
+									case "disk":
+									case "disc":
+									case "file":
+									case "part":
+									case "tape":
+										Number = int.Parse(typeStringVal);
+										break;
+									case "of":
+										Count = int.Parse(typeStringVal);
+										break;
+									case "side":
+										Side = typeStringVal;
+										break;
+								}
+								inType = "";
+							}
+						}
+
+						break;
+
+					default:
+						break;
+
+				}
+			}
+
+			public RomSignatureObject.Game.Rom.RomTypes? Media { get; set; }
+
+			public int? Number { get; set; }
+
+			public int? Count { get; set; }
+
+			public string? Side { get; set; }
+		}
     }
 }
 

gaseous-server/Classes/SignatureIngestors/TOSEC.cs

@@ -1,234 +0,0 @@
-using System;
-using System.IO;
-using MySql.Data.MySqlClient;
-using gaseous_romsignatureobject;
-using gaseous_signature_parser.parsers;
-using gaseous_tools;
-using MySqlX.XDevAPI;
-
-namespace gaseous_server.SignatureIngestors.TOSEC
-{
-    public class TOSECIngestor
-    {
-        public void Import(string SearchPath)
-        {
-            // connect to database
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-
-            // process provided files
-            Logging.Log(Logging.LogType.Information, "Signature Ingestor - TOSEC", "Importing from " + SearchPath);
-            if (Directory.Exists(Config.LibraryConfiguration.LibrarySignatureImportDirectory_TOSEC))
-            {
-                string[] tosecPathContents = Directory.GetFiles(SearchPath);
-                Array.Sort(tosecPathContents);
-
-                string sql = "";
-                Dictionary<string, object> dbDict = new Dictionary<string, object>();
-                System.Data.DataTable sigDB;
-
-                for (UInt16 i = 0; i < tosecPathContents.Length; ++i)
-                {
-                    string tosecXMLFile = tosecPathContents[i];
-
-                    // check tosec file md5
-                    Common.hashObject hashObject = new Common.hashObject(tosecXMLFile);
-                    sql = "SELECT * FROM Signatures_Sources WHERE SourceMD5=@sourcemd5";
-                    dbDict = new Dictionary<string, object>();
-                    dbDict.Add("sourcemd5", hashObject.md5hash);
-                    sigDB = db.ExecuteCMD(sql, dbDict);
-
-                    if (sigDB.Rows.Count == 0)
-                    {
-                        try
-                        {
-                            Logging.Log(Logging.LogType.Information, "Signature Ingestor - TOSEC", "Importing file: " + tosecXMLFile);
-
-                            // start parsing file
-                            TosecParser tosecParser = new TosecParser();
-                            RomSignatureObject tosecObject = tosecParser.Parse(tosecXMLFile);
-
-                            // store in database
-
-                            // store source object
-                            bool processGames = false;
-                            if (tosecObject.SourceMd5 != null)
-                            {
-                                sql = "SELECT * FROM Signatures_Sources WHERE SourceMD5=@sourcemd5";
-                                dbDict = new Dictionary<string, object>();
-                                dbDict.Add("name", Common.ReturnValueIfNull(tosecObject.Name, ""));
-                                dbDict.Add("description", Common.ReturnValueIfNull(tosecObject.Description, ""));
-                                dbDict.Add("category", Common.ReturnValueIfNull(tosecObject.Category, ""));
-                                dbDict.Add("version", Common.ReturnValueIfNull(tosecObject.Version, ""));
-                                dbDict.Add("author", Common.ReturnValueIfNull(tosecObject.Author, ""));
-                                dbDict.Add("email", Common.ReturnValueIfNull(tosecObject.Email, ""));
-                                dbDict.Add("homepage", Common.ReturnValueIfNull(tosecObject.Homepage, ""));
-                                dbDict.Add("uri", Common.ReturnValueIfNull(tosecObject.Url, ""));
-                                dbDict.Add("sourcetype", Common.ReturnValueIfNull(tosecObject.SourceType, ""));
-                                dbDict.Add("sourcemd5", tosecObject.SourceMd5);
-                                dbDict.Add("sourcesha1", tosecObject.SourceSHA1);
-
-                                sigDB = db.ExecuteCMD(sql, dbDict);
-                                if (sigDB.Rows.Count == 0)
-                                {
-                                    // entry not present, insert it
-                                    sql = "INSERT INTO Signatures_Sources (Name, Description, Category, Version, Author, Email, Homepage, Url, SourceType, SourceMD5, SourceSHA1) VALUES (@name, @description, @category, @version, @author, @email, @homepage, @uri, @sourcetype, @sourcemd5, @sourcesha1)";
-
-                                    db.ExecuteCMD(sql, dbDict);
-
-                                    processGames = true;
-                                }
-
-                                if (processGames == true)
-                                {
-                                    for (int x = 0; x < tosecObject.Games.Count; ++x)
-                                    {
-                                        RomSignatureObject.Game gameObject = tosecObject.Games[x];
-
-                                        // set up game dictionary
-                                        dbDict = new Dictionary<string, object>();
-                                        dbDict.Add("name", Common.ReturnValueIfNull(gameObject.Name, ""));
-                                        dbDict.Add("description", Common.ReturnValueIfNull(gameObject.Description, ""));
-                                        dbDict.Add("year", Common.ReturnValueIfNull(gameObject.Year, ""));
-                                        dbDict.Add("publisher", Common.ReturnValueIfNull(gameObject.Publisher, ""));
-                                        dbDict.Add("demo", (int)gameObject.Demo);
-                                        dbDict.Add("system", Common.ReturnValueIfNull(gameObject.System, ""));
-                                        dbDict.Add("platform", Common.ReturnValueIfNull(gameObject.System, ""));
-                                        dbDict.Add("systemvariant", Common.ReturnValueIfNull(gameObject.SystemVariant, ""));
-                                        dbDict.Add("video", Common.ReturnValueIfNull(gameObject.Video, ""));
-                                        dbDict.Add("country", Common.ReturnValueIfNull(gameObject.Country, ""));
-                                        dbDict.Add("language", Common.ReturnValueIfNull(gameObject.Language, ""));
-                                        dbDict.Add("copyright", Common.ReturnValueIfNull(gameObject.Copyright, ""));
-
-                                        // store platform
-                                        int gameSystem = 0;
-                                        if (gameObject.System != null)
-                                        {
-                                            sql = "SELECT Id FROM Signatures_Platforms WHERE Platform=@platform";
-
-                                            sigDB = db.ExecuteCMD(sql, dbDict);
-                                            if (sigDB.Rows.Count == 0)
-                                            {
-                                                // entry not present, insert it
-                                                sql = "INSERT INTO Signatures_Platforms (Platform) VALUES (@platform); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-                                                sigDB = db.ExecuteCMD(sql, dbDict);
-
-                                                gameSystem = Convert.ToInt32(sigDB.Rows[0][0]);
-                                            }
-                                            else
-                                            {
-                                                gameSystem = (int)sigDB.Rows[0][0];
-                                            }
-                                        }
-                                        dbDict.Add("systemid", gameSystem);
-
-                                        // store publisher
-                                        int gamePublisher = 0;
-                                        if (gameObject.Publisher != null)
-                                        {
-                                            sql = "SELECT * FROM Signatures_Publishers WHERE Publisher=@publisher";
-
-                                            sigDB = db.ExecuteCMD(sql, dbDict);
-                                            if (sigDB.Rows.Count == 0)
-                                            {
-                                                // entry not present, insert it
-                                                sql = "INSERT INTO Signatures_Publishers (Publisher) VALUES (@publisher); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-                                                sigDB = db.ExecuteCMD(sql, dbDict);
-                                                gamePublisher = Convert.ToInt32(sigDB.Rows[0][0]);
-                                            }
-                                            else
-                                            {
-                                                gamePublisher = (int)sigDB.Rows[0][0];
-                                            }
-                                        }
-                                        dbDict.Add("publisherid", gamePublisher);
-
-                                        // store game
-                                        int gameId = 0;
-                                        sql = "SELECT * FROM Signatures_Games WHERE Name=@name AND Year=@year AND Publisherid=@publisher AND Systemid=@systemid AND Country=@country AND Language=@language";
-
-                                        sigDB = db.ExecuteCMD(sql, dbDict);
-                                        if (sigDB.Rows.Count == 0)
-                                        {
-                                            // entry not present, insert it
-                                            sql = "INSERT INTO Signatures_Games " +
-                                                "(Name, Description, Year, PublisherId, Demo, SystemId, SystemVariant, Video, Country, Language, Copyright) VALUES " +
-                                                "(@name, @description, @year, @publisherid, @demo, @systemid, @systemvariant, @video, @country, @language, @copyright); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-                                            sigDB = db.ExecuteCMD(sql, dbDict);
-
-                                            gameId = Convert.ToInt32(sigDB.Rows[0][0]);
-                                        }
-                                        else
-                                        {
-                                            gameId = (int)sigDB.Rows[0][0];
-                                        }
-
-                                        // store rom
-                                        foreach (RomSignatureObject.Game.Rom romObject in gameObject.Roms)
-                                        {
-                                            if (romObject.Md5 != null)
-                                            {
-                                                int romId = 0;
-                                                sql = "SELECT * FROM Signatures_Roms WHERE GameId=@gameid AND MD5=@md5";
-                                                dbDict = new Dictionary<string, object>();
-                                                dbDict.Add("gameid", gameId);
-                                                dbDict.Add("name", Common.ReturnValueIfNull(romObject.Name, ""));
-                                                dbDict.Add("size", Common.ReturnValueIfNull(romObject.Size, ""));
-                                                dbDict.Add("crc", Common.ReturnValueIfNull(romObject.Crc, ""));
-                                                dbDict.Add("md5", romObject.Md5);
-                                                dbDict.Add("sha1", Common.ReturnValueIfNull(romObject.Sha1, ""));
-                                                dbDict.Add("developmentstatus", Common.ReturnValueIfNull(romObject.DevelopmentStatus, ""));
-
-                                                if (romObject.flags != null)
-                                                {
-                                                    if (romObject.flags.Count > 0)
-                                                    {
-                                                        dbDict.Add("flags", Newtonsoft.Json.JsonConvert.SerializeObject(romObject.flags));
-                                                    }
-                                                    else
-                                                    {
-                                                        dbDict.Add("flags", "[ ]");
-                                                    }
-                                                }
-                                                else
-                                                {
-                                                    dbDict.Add("flags", "[ ]");
-                                                }
-                                                dbDict.Add("romtype", (int)romObject.RomType);
-                                                dbDict.Add("romtypemedia", Common.ReturnValueIfNull(romObject.RomTypeMedia, ""));
-                                                dbDict.Add("medialabel", Common.ReturnValueIfNull(romObject.MediaLabel, ""));
-                                                dbDict.Add("metadatasource", Classes.Roms.GameRomItem.SourceType.TOSEC);
-
-                                                sigDB = db.ExecuteCMD(sql, dbDict);
-                                                if (sigDB.Rows.Count == 0)
-                                                {
-                                                    // entry not present, insert it
-                                                    sql = "INSERT INTO Signatures_Roms (GameId, Name, Size, CRC, MD5, SHA1, DevelopmentStatus, Flags, RomType, RomTypeMedia, MediaLabel, MetadataSource) VALUES (@gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @flags, @romtype, @romtypemedia, @medialabel, @metadatasource); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
-                                                    sigDB = db.ExecuteCMD(sql, dbDict);
-
-
-                                                    romId = Convert.ToInt32(sigDB.Rows[0][0]);
-                                                }
-                                                else
-                                                {
-                                                    romId = (int)sigDB.Rows[0][0];
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            Logging.Log(Logging.LogType.Warning, "Signature Ingestor - TOSEC", "Invalid import file: " + tosecXMLFile, ex);
-                        }
-                    }
-                    else
-                    {
-                        Logging.Log(Logging.LogType.Debug, "Signature Ingestor - TOSEC", "Rejecting already imported file: " + tosecXMLFile);
-                    }
-                }
-            }
-        }
-    }
-}

gaseous-server/Classes/SignatureIngestors/XML.cs

@@ -0,0 +1,252 @@
+using System;
+using System.IO;
+using gaseous_server.Classes;
+using gaseous_signature_parser.models.RomSignatureObject;
+using System.Data;
+
+namespace gaseous_server.SignatureIngestors.XML
+{
+    public class XMLIngestor
+    {
+        public void Import(string SearchPath, gaseous_signature_parser.parser.SignatureParser XMLType)
+        {
+            // connect to database
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+            // process provided files
+            Logging.Log(Logging.LogType.Information, "Signature Ingestor - XML", "Importing from " + SearchPath);
+            if (!Directory.Exists(SearchPath))
+            {
+                Directory.CreateDirectory(SearchPath);
+            }
+
+            string[] PathContents = Directory.GetFiles(SearchPath);
+            Array.Sort(PathContents);
+
+            string sql = "";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            System.Data.DataTable sigDB;
+
+            for (UInt16 i = 0; i < PathContents.Length; ++i)
+            {
+                string XMLFile = PathContents[i];
+
+                // check xml file md5
+                Common.hashObject hashObject = new Common.hashObject(XMLFile);
+                sql = "SELECT * FROM Signatures_Sources WHERE SourceMD5=@sourcemd5";
+                dbDict = new Dictionary<string, object>();
+                dbDict.Add("sourcemd5", hashObject.md5hash);
+                sigDB = db.ExecuteCMD(sql, dbDict);
+
+                if (sigDB.Rows.Count == 0)
+                {
+                    try
+                    {
+                        Logging.Log(Logging.LogType.Information, "Signature Ingestor - XML", "Importing file: " + XMLFile);
+
+                        // start parsing file
+                        gaseous_signature_parser.parser Parser = new gaseous_signature_parser.parser();
+                        RomSignatureObject Object = Parser.ParseSignatureDAT(XMLFile, XMLType);
+
+                        // store in database
+                        string[] flipNameAndDescription = {
+                            "MAMEArcade",
+                            "MAMEMess"
+                        };
+
+                        // store source object
+                        bool processGames = false;
+                        if (Object.SourceMd5 != null)
+                        {
+                            sql = "SELECT * FROM Signatures_Sources WHERE SourceMD5=@sourcemd5";
+                            dbDict = new Dictionary<string, object>();
+                            string sourceUriStr = "";
+                            if (Object.Url != null)
+                            {
+                                sourceUriStr = Object.Url.ToString();
+                            }
+                            dbDict.Add("name", Common.ReturnValueIfNull(Object.Name, ""));
+                            dbDict.Add("description", Common.ReturnValueIfNull(Object.Description, ""));
+                            dbDict.Add("category", Common.ReturnValueIfNull(Object.Category, ""));
+                            dbDict.Add("version", Common.ReturnValueIfNull(Object.Version, ""));
+                            dbDict.Add("author", Common.ReturnValueIfNull(Object.Author, ""));
+                            dbDict.Add("email", Common.ReturnValueIfNull(Object.Email, ""));
+                            dbDict.Add("homepage", Common.ReturnValueIfNull(Object.Homepage, ""));
+                            dbDict.Add("uri", sourceUriStr);
+                            dbDict.Add("sourcetype", Common.ReturnValueIfNull(Object.SourceType, ""));
+                            dbDict.Add("sourcemd5", Object.SourceMd5);
+                            dbDict.Add("sourcesha1", Object.SourceSHA1);
+
+                            sigDB = db.ExecuteCMD(sql, dbDict);
+                            if (sigDB.Rows.Count == 0)
+                            {
+                                // entry not present, insert it
+                                sql = "INSERT INTO Signatures_Sources (Name, Description, Category, Version, Author, Email, Homepage, Url, SourceType, SourceMD5, SourceSHA1) VALUES (@name, @description, @category, @version, @author, @email, @homepage, @uri, @sourcetype, @sourcemd5, @sourcesha1)";
+
+                                db.ExecuteCMD(sql, dbDict);
+
+                                processGames = true;
+                            }
+
+                            if (processGames == true)
+                            {
+                                for (int x = 0; x < Object.Games.Count; ++x)
+                                {
+                                    RomSignatureObject.Game gameObject = Object.Games[x];
+
+                                    // set up game dictionary
+                                    dbDict = new Dictionary<string, object>();
+                                    if (flipNameAndDescription.Contains(Object.SourceType)) 
+                                    {
+                                        dbDict.Add("name", Common.ReturnValueIfNull(gameObject.Description, ""));
+                                        dbDict.Add("description", Common.ReturnValueIfNull(gameObject.Name, ""));
+                                    }
+                                    else
+                                    {
+                                        dbDict.Add("name", Common.ReturnValueIfNull(gameObject.Name, ""));
+                                        dbDict.Add("description", Common.ReturnValueIfNull(gameObject.Description, ""));
+                                    }
+                                    dbDict.Add("year", Common.ReturnValueIfNull(gameObject.Year, ""));
+                                    dbDict.Add("publisher", Common.ReturnValueIfNull(gameObject.Publisher, ""));
+                                    dbDict.Add("demo", (int)gameObject.Demo);
+                                    dbDict.Add("system", Common.ReturnValueIfNull(gameObject.System, ""));
+                                    dbDict.Add("platform", Common.ReturnValueIfNull(gameObject.System, ""));
+                                    dbDict.Add("systemvariant", Common.ReturnValueIfNull(gameObject.SystemVariant, ""));
+                                    dbDict.Add("video", Common.ReturnValueIfNull(gameObject.Video, ""));
+                                    dbDict.Add("country", Common.ReturnValueIfNull(gameObject.Country, ""));
+                                    dbDict.Add("language", Common.ReturnValueIfNull(gameObject.Language, ""));
+                                    dbDict.Add("copyright", Common.ReturnValueIfNull(gameObject.Copyright, ""));
+
+                                    // store platform
+                                    int gameSystem = 0;
+                                    if (gameObject.System != null)
+                                    {
+                                        sql = "SELECT Id FROM Signatures_Platforms WHERE Platform=@platform";
+
+                                        sigDB = db.ExecuteCMD(sql, dbDict);
+                                        if (sigDB.Rows.Count == 0)
+                                        {
+                                            // entry not present, insert it
+                                            sql = "INSERT INTO Signatures_Platforms (Platform) VALUES (@platform); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+                                            sigDB = db.ExecuteCMD(sql, dbDict);
+
+                                            gameSystem = Convert.ToInt32(sigDB.Rows[0][0]);
+                                        }
+                                        else
+                                        {
+                                            gameSystem = (int)sigDB.Rows[0][0];
+                                        }
+                                    }
+                                    dbDict.Add("systemid", gameSystem);
+
+                                    // store publisher
+                                    int gamePublisher = 0;
+                                    if (gameObject.Publisher != null)
+                                    {
+                                        sql = "SELECT * FROM Signatures_Publishers WHERE Publisher=@publisher";
+
+                                        sigDB = db.ExecuteCMD(sql, dbDict);
+                                        if (sigDB.Rows.Count == 0)
+                                        {
+                                            // entry not present, insert it
+                                            sql = "INSERT INTO Signatures_Publishers (Publisher) VALUES (@publisher); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+                                            sigDB = db.ExecuteCMD(sql, dbDict);
+                                            gamePublisher = Convert.ToInt32(sigDB.Rows[0][0]);
+                                        }
+                                        else
+                                        {
+                                            gamePublisher = (int)sigDB.Rows[0][0];
+                                        }
+                                    }
+                                    dbDict.Add("publisherid", gamePublisher);
+
+                                    // store game
+                                    int gameId = 0;
+                                    sql = "SELECT * FROM Signatures_Games WHERE Name=@name AND Year=@year AND Publisherid=@publisher AND Systemid=@systemid AND Country=@country AND Language=@language";
+
+                                    sigDB = db.ExecuteCMD(sql, dbDict);
+                                    if (sigDB.Rows.Count == 0)
+                                    {
+                                        // entry not present, insert it
+                                        sql = "INSERT INTO Signatures_Games " +
+                                            "(Name, Description, Year, PublisherId, Demo, SystemId, SystemVariant, Video, Country, Language, Copyright) VALUES " +
+                                            "(@name, @description, @year, @publisherid, @demo, @systemid, @systemvariant, @video, @country, @language, @copyright); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+                                        sigDB = db.ExecuteCMD(sql, dbDict);
+
+                                        gameId = Convert.ToInt32(sigDB.Rows[0][0]);
+                                    }
+                                    else
+                                    {
+                                        gameId = (int)sigDB.Rows[0][0];
+                                    }
+
+                                    // store rom
+                                    foreach (RomSignatureObject.Game.Rom romObject in gameObject.Roms)
+                                    {
+                                        if (romObject.Md5 != null || romObject.Sha1 != null)
+                                        {
+                                            int romId = 0;
+                                            sql = "SELECT * FROM Signatures_Roms WHERE GameId=@gameid AND MD5=@md5";
+                                            dbDict = new Dictionary<string, object>();
+                                            dbDict.Add("gameid", gameId);
+                                            dbDict.Add("name", Common.ReturnValueIfNull(romObject.Name, ""));
+                                            dbDict.Add("size", Common.ReturnValueIfNull(romObject.Size, ""));
+                                            dbDict.Add("crc", Common.ReturnValueIfNull(romObject.Crc, "").ToString().ToLower());
+                                            dbDict.Add("md5", Common.ReturnValueIfNull(romObject.Md5, "").ToString().ToLower());
+                                            dbDict.Add("sha1", Common.ReturnValueIfNull(romObject.Sha1, "").ToString().ToLower());
+                                            dbDict.Add("developmentstatus", Common.ReturnValueIfNull(romObject.DevelopmentStatus, ""));
+
+                                            if (romObject.Attributes != null)
+                                            {
+                                                if (romObject.Attributes.Count > 0)
+                                                {
+                                                    dbDict.Add("attributes", Newtonsoft.Json.JsonConvert.SerializeObject(romObject.Attributes));
+                                                }
+                                                else
+                                                {
+                                                    dbDict.Add("attributes", "[ ]");
+                                                }
+                                            }
+                                            else
+                                            {
+                                                dbDict.Add("attributes", "[ ]");
+                                            }
+                                            dbDict.Add("romtype", (int)romObject.RomType);
+                                            dbDict.Add("romtypemedia", Common.ReturnValueIfNull(romObject.RomTypeMedia, ""));
+                                            dbDict.Add("medialabel", Common.ReturnValueIfNull(romObject.MediaLabel, ""));
+                                            dbDict.Add("metadatasource", romObject.SignatureSource);
+                                            dbDict.Add("ingestorversion", 2);
+
+                                            sigDB = db.ExecuteCMD(sql, dbDict);
+                                            if (sigDB.Rows.Count == 0)
+                                            {
+                                                // entry not present, insert it
+                                                sql = "INSERT INTO Signatures_Roms (GameId, Name, Size, CRC, MD5, SHA1, DevelopmentStatus, Attributes, RomType, RomTypeMedia, MediaLabel, MetadataSource, IngestorVersion) VALUES (@gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @attributes, @romtype, @romtypemedia, @medialabel, @metadatasource, @ingestorversion); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
+                                                sigDB = db.ExecuteCMD(sql, dbDict);
+
+
+                                                romId = Convert.ToInt32(sigDB.Rows[0][0]);
+                                            }
+                                            else
+                                            {
+                                                romId = (int)sigDB.Rows[0][0];
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Logging.Log(Logging.LogType.Warning, "Signature Ingestor - XML", "Invalid import file: " + XMLFile, ex);
+                    }
+                }
+                else
+                {
+                    Logging.Log(Logging.LogType.Debug, "Signature Ingestor - XML", "Rejecting already imported file: " + XMLFile);
+                }
+            }
+        }
+    }
+}

gaseous-server/Controllers/FilterController.cs

@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using gaseous_tools;
-using IGDB.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace gaseous_server.Controllers
-{
-    [Route("api/v1/[controller]")]
-    [ApiController]
-    public class FilterController : ControllerBase
-    {
-        [HttpGet]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        //[ResponseCache(CacheProfileName = "5Minute")]
-        public Dictionary<string, object> Filter()
-        {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-
-            Dictionary<string, object> FilterSet = new Dictionary<string, object>();
-
-            // platforms
-            List<Platform> platforms = new List<Platform>();
-            string sql = "SELECT Platform.Id, Platform.Abbreviation, Platform.AlternativeName, Platform.`Name`, Platform.PlatformLogo, (SELECT COUNT(Games_Roms.Id) AS RomCount FROM Games_Roms WHERE Games_Roms.PlatformId = Platform.Id) AS RomCount FROM Platform HAVING RomCount > 0 ORDER BY `Name`";
-            DataTable dbResponse = db.ExecuteCMD(sql);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                platforms.Add(Classes.Metadata.Platforms.GetPlatform((long)dr["id"]));
-            }
-            FilterSet.Add("platforms", platforms);
-
-            // genres
-            List<Genre> genres = new List<Genre>();
-            sql = "SELECT DISTINCT t1.Id, t1.`Name` FROM Genre AS t1 JOIN (SELECT * FROM Game WHERE (SELECT COUNT(Id) FROM Games_Roms WHERE GameId = Game.Id) > 0) AS t2 ON JSON_CONTAINS(t2.Genres, CAST(t1.Id AS char), '$') ORDER BY t1.`Name`";
-            dbResponse = db.ExecuteCMD(sql);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                genres.Add(Classes.Metadata.Genres.GetGenres((long)dr["id"]));
-            }
-            FilterSet.Add("genres", genres);
-
-            // game modes
-            List<GameMode> gameModes = new List<GameMode>();
-            sql = "SELECT DISTINCT t1.Id, t1.`Name` FROM GameMode AS t1 JOIN (SELECT * FROM Game WHERE (SELECT COUNT(Id) FROM Games_Roms WHERE GameId = Game.Id) > 0) AS t2 ON JSON_CONTAINS(t2.GameModes, CAST(t1.Id AS char), '$') ORDER BY t1.Id";
-            dbResponse = db.ExecuteCMD(sql);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                gameModes.Add(Classes.Metadata.GameModes.GetGame_Modes((long)dr["id"]));
-            }
-            FilterSet.Add("gamemodes", gameModes);
-
-            // player perspectives
-            List<PlayerPerspective> playerPerspectives = new List<PlayerPerspective>();
-            sql = "SELECT DISTINCT t1.Id, t1.`Name` FROM PlayerPerspective AS t1 JOIN (SELECT * FROM Game WHERE (SELECT COUNT(Id) FROM Games_Roms WHERE GameId = Game.Id) > 0) AS t2 ON JSON_CONTAINS(t2.PlayerPerspectives, CAST(t1.Id AS char), '$') ORDER BY t1.`Name`";
-            dbResponse = db.ExecuteCMD(sql);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                playerPerspectives.Add(Classes.Metadata.PlayerPerspectives.GetGame_PlayerPerspectives((long)dr["id"]));
-            }
-            FilterSet.Add("playerperspectives", playerPerspectives);
-
-            // themes
-            List<Theme> themes = new List<Theme>();
-            sql = "SELECT DISTINCT t1.Id, t1.`Name` FROM Theme AS t1 JOIN (SELECT * FROM Game WHERE (SELECT COUNT(Id) FROM Games_Roms WHERE GameId = Game.Id) > 0) AS t2 ON JSON_CONTAINS(t2.Themes, CAST(t1.Id AS char), '$') ORDER BY t1.`Name`";
-            dbResponse = db.ExecuteCMD(sql);
-
-            foreach (DataRow dr in dbResponse.Rows)
-            {
-                themes.Add(Classes.Metadata.Themes.GetGame_Themes((long)dr["id"]));
-            }
-            FilterSet.Add("themes", themes);
-
-            return FilterSet;
-        }
-    }
-}

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

@@ -0,0 +1,396 @@
+using System.Security.Claims;
+using System.Text;
+using Authentication;
+using gaseous_server.Classes;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI.Services;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
+    public class AccountController : Controller
+    {
+        private readonly UserManager<ApplicationUser> _userManager;
+        private readonly SignInManager<ApplicationUser> _signInManager;
+        private readonly IEmailSender _emailSender;
+        private readonly ILogger _logger;
+
+        public AccountController(
+            UserManager<ApplicationUser> userManager,
+            SignInManager<ApplicationUser> signInManager,
+            IEmailSender emailSender,
+            ILoggerFactory loggerFactory)
+        {
+            _userManager = userManager;
+            _signInManager = signInManager;
+            _emailSender = emailSender;
+            _logger = loggerFactory.CreateLogger<AccountController>();
+        }
+
+        [HttpPost]
+        [AllowAnonymous]
+        [Route("Login")]
+        public async Task<IActionResult> Login(LoginViewModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                // This doesn't count login failures towards account lockout
+                // To enable password failures to trigger account lockout, set lockoutOnFailure: true
+                var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: false);
+                if (result.Succeeded)
+                {
+                    Logging.Log(Logging.LogType.Information, "Login", model.Email + " has logged in, from IP: " + HttpContext.Connection.RemoteIpAddress?.ToString());
+                    return Ok(result.ToString());
+                }
+                // if (result.RequiresTwoFactor)
+                // {
+                //     return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl, RememberMe = model.RememberMe });
+                // }
+                if (result.IsLockedOut)
+                {
+                    Logging.Log(Logging.LogType.Warning, "Login", model.Email + " was unable to login due to a locked account. Login attempt from IP: " + HttpContext.Connection.RemoteIpAddress?.ToString());
+                    return Unauthorized();
+                }
+                else
+                {
+                    Logging.Log(Logging.LogType.Critical, "Login", "An unknown error occurred during login by " + model.Email + ". Login attempt from IP: " + HttpContext.Connection.RemoteIpAddress?.ToString());
+                    return Unauthorized();
+                }
+            }
+
+            // If we got this far, something failed, redisplay form
+            Logging.Log(Logging.LogType.Critical, "Login", "An unknown error occurred during login by " + model.Email + ". Login attempt from IP: " + HttpContext.Connection.RemoteIpAddress?.ToString());
+            return Unauthorized();
+        }
+
+        [HttpPost]
+        [Route("LogOff")]
+        public async Task<IActionResult> LogOff()
+        {
+            var userName = User.FindFirstValue(ClaimTypes.Name);
+            await _signInManager.SignOutAsync();
+            if (userName != null)
+            {
+                Logging.Log(Logging.LogType.Information, "Login", userName + " has logged out");
+            }
+            return Ok();
+        }
+
+        [HttpGet]
+        [Route("Profile/Basic")]
+        [Authorize]
+        public async Task<IActionResult> ProfileBasic()
+        {
+            ProfileBasicViewModel profile = new ProfileBasicViewModel();
+            profile.UserId = User.FindFirstValue(ClaimTypes.NameIdentifier);
+            ApplicationUser user = await _userManager.FindByIdAsync(profile.UserId);
+            profile.UserName = _userManager.GetUserName(HttpContext.User);
+            profile.EmailAddress = await _userManager.GetEmailAsync(user);
+            profile.Roles = new List<string>(await _userManager.GetRolesAsync(user));
+            profile.SecurityProfile = user.SecurityProfile;
+            profile.Roles.Sort();
+
+            return Ok(profile);
+        }
+
+        [HttpGet]
+        [Route("Profile/Basic/profile.js")]
+        [ApiExplorerSettings(IgnoreApi = true)]
+        [AllowAnonymous]
+        public async Task<IActionResult> ProfileBasicFile()
+        {
+            var user = await _userManager.GetUserAsync(User);
+            if (user != null)
+            {
+                ProfileBasicViewModel profile = new ProfileBasicViewModel();
+                profile.UserId = User.FindFirstValue(ClaimTypes.NameIdentifier);
+                profile.UserName = _userManager.GetUserName(HttpContext.User);
+                profile.EmailAddress = await _userManager.GetEmailAsync(user);
+                profile.Roles = new List<string>(await _userManager.GetRolesAsync(user));
+                profile.SecurityProfile = user.SecurityProfile;
+                profile.Roles.Sort();
+                
+                string profileString = "var userProfile = " + Newtonsoft.Json.JsonConvert.SerializeObject(profile, Newtonsoft.Json.Formatting.Indented) + ";";
+
+                byte[] bytes = Encoding.UTF8.GetBytes(profileString);
+                return File(bytes, "text/javascript");
+            }
+            else
+            {
+                string profileString = "var userProfile = null;";
+
+                byte[] bytes = Encoding.UTF8.GetBytes(profileString);
+                return File(bytes, "text/javascript");
+            }
+        }
+
+        [HttpPost]
+        [Route("ChangePassword")]
+        [Authorize]
+        public async Task<IActionResult> ChangePassword(ChangePasswordViewModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                var user = await _userManager.GetUserAsync(User);
+                if (user == null)
+                {
+                    return RedirectToAction("Login");
+                }
+
+                // ChangePasswordAsync changes the user password
+                var result = await _userManager.ChangePasswordAsync(user, model.OldPassword, model.NewPassword);
+
+                // The new password did not meet the complexity rules or
+                // the current password is incorrect. Add these errors to
+                // the ModelState and rerender ChangePassword view
+                if (!result.Succeeded)
+                {
+                    foreach (var error in result.Errors)
+                    {
+                        ModelState.AddModelError(string.Empty, error.Description);
+                    }
+                    return Unauthorized(result);
+                }
+
+                // Upon successfully changing the password refresh sign-in cookie
+                await _signInManager.RefreshSignInAsync(user);
+                return Ok();
+            }
+
+            return NotFound();
+        }
+
+        [HttpGet]
+        [Route("Users")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> GetAllUsers()
+        {
+            List<UserViewModel> users = new List<UserViewModel>();
+
+            foreach (ApplicationUser rawUser in _userManager.Users)
+            {
+                UserViewModel user = new UserViewModel();
+                user.Id = rawUser.Id;
+                user.EmailAddress = rawUser.NormalizedEmail.ToLower();
+                user.LockoutEnabled = rawUser.LockoutEnabled;
+                user.LockoutEnd = rawUser.LockoutEnd;
+                user.SecurityProfile = rawUser.SecurityProfile;
+                
+                // get roles
+                ApplicationUser? aUser = await _userManager.FindByIdAsync(rawUser.Id);
+                if (aUser != null)
+                {
+                    IList<string> aUserRoles = await _userManager.GetRolesAsync(aUser);
+                    user.Roles = aUserRoles.ToList();
+
+                    user.Roles.Sort();
+                }
+
+                users.Add(user);
+            }
+
+            return Ok(users);
+        }
+
+        [HttpPost]
+        [Route("Users")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> NewUser(RegisterViewModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                ApplicationUser user = new ApplicationUser
+                { 
+                    UserName = model.UserName, 
+                    NormalizedUserName = model.UserName.ToUpper(),
+                    Email = model.Email,
+                    NormalizedEmail = model.Email.ToUpper()
+                };
+                var result = await _userManager.CreateAsync(user, model.Password);
+                if (result.Succeeded)
+                {
+                    // add new users to the player role
+                    await _userManager.AddToRoleAsync(user, "Player");
+
+                    Logging.Log(Logging.LogType.Information, "User Management", User.FindFirstValue(ClaimTypes.Name) + " created user " + model.Email + " with password.");
+
+                    return Ok(result);
+                }
+                else
+                {
+                    return Ok(result);
+                }
+            }   
+            else
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpGet]
+        [Route("Users/{UserId}")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> GetUser(string UserId)
+        {
+            ApplicationUser? rawUser = await _userManager.FindByIdAsync(UserId);
+            
+            if (rawUser != null)
+            {
+                UserViewModel user = new UserViewModel();
+                user.Id = rawUser.Id;
+                user.EmailAddress = rawUser.NormalizedEmail.ToLower();
+                user.LockoutEnabled = rawUser.LockoutEnabled;
+                user.LockoutEnd = rawUser.LockoutEnd;
+                user.SecurityProfile = rawUser.SecurityProfile;
+                
+                // get roles
+                IList<string> aUserRoles = await _userManager.GetRolesAsync(rawUser);
+                user.Roles = aUserRoles.ToList();
+
+                user.Roles.Sort();
+
+                return Ok(user);
+            }
+            else
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpDelete]
+        [Route("Users/{UserId}")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> DeleteUser(string UserId)
+        {
+            // get user
+            ApplicationUser? user = await _userManager.FindByIdAsync(UserId);
+
+            if (user == null)
+            {
+                return NotFound();
+            }
+            else
+            {
+                await _userManager.DeleteAsync(user);
+                Logging.Log(Logging.LogType.Information, "User Management", User.FindFirstValue(ClaimTypes.Name) + " deleted user " + user.Email);
+                return Ok();
+            }
+        }
+
+        [HttpPost]
+        [Route("Users/{UserId}/Roles")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> SetUserRoles(string UserId, string RoleName)
+        {
+            ApplicationUser? user = await _userManager.FindByIdAsync(UserId);
+            
+            if (user != null)
+            {
+                // get roles
+                List<string> userRoles = (await _userManager.GetRolesAsync(user)).ToList();
+                
+                // delete all roles
+                foreach (string role in userRoles)
+                {
+                    if ((new string[] { "Admin", "Gamer", "Player" }).Contains(role) )
+                    {
+                        await _userManager.RemoveFromRoleAsync(user, role);
+                    }
+                }
+
+                // add only requested roles
+                switch (RoleName)
+                {
+                    case "Admin":
+                        await _userManager.AddToRoleAsync(user, "Admin");
+                        await _userManager.AddToRoleAsync(user, "Gamer");
+                        await _userManager.AddToRoleAsync(user, "Player");
+                        break;
+                    case "Gamer":
+                        await _userManager.AddToRoleAsync(user, "Gamer");
+                        await _userManager.AddToRoleAsync(user, "Player");
+                        break;
+                    case "Player":
+                        await _userManager.AddToRoleAsync(user, "Player");
+                        break;
+                    default:
+                        await _userManager.AddToRoleAsync(user, RoleName);
+                        break;
+                }
+                
+                return Ok();
+            }
+            else
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpPost]
+        [Route("Users/{UserId}/SecurityProfile")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> SetUserSecurityProfile(string UserId, SecurityProfileViewModel securityProfile)
+        {
+            if (ModelState.IsValid)
+            {
+                ApplicationUser? user = await _userManager.FindByIdAsync(UserId);
+                
+                if (user != null)
+                {
+                    user.SecurityProfile = securityProfile;
+                    await _userManager.UpdateAsync(user);
+                    
+                    return Ok();
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            else
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpPost]
+        [Route("Users/{UserId}/Password")]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> ResetPassword(string UserId, SetPasswordViewModel model)
+        {
+            if (ModelState.IsValid)
+            {
+                // we can reset the users password
+                ApplicationUser? user = await _userManager.FindByIdAsync(UserId);
+                if (user != null)
+                {
+                    string resetToken = await _userManager.GeneratePasswordResetTokenAsync(user);
+                    IdentityResult passwordChangeResult = await _userManager.ResetPasswordAsync(user, resetToken, model.NewPassword);
+                    if (passwordChangeResult.Succeeded == true)
+                    {
+                        return Ok();
+                    }
+                    else
+                    {
+                        return Ok(passwordChangeResult);
+                    }
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            else
+            {
+                return NotFound();
+            }
+        }
+    }
+}

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

@@ -2,14 +2,20 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize(Roles = "Admin,Gamer,Player")]
     public class BackgroundTasksController : Controller
     {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public List<ProcessQueue.QueueItem> GetQueue()
@@ -17,10 +23,13 @@ namespace gaseous_server.Controllers
             return ProcessQueue.QueueItems;
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{TaskType}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Roles = "Admin")]
         public ActionResult<ProcessQueue.QueueItem> ForceRun(ProcessQueue.QueueItemType TaskType, Boolean ForceRun)
         {
             foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)

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

@@ -3,14 +3,21 @@ using System.Collections.Generic;
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
+using gaseous_server.Classes;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     public class BiosController : Controller
     {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public List<Classes.Bios.BiosItem> GetBios()
@@ -18,6 +25,8 @@ namespace gaseous_server.Controllers
             return Classes.Bios.GetBios();
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{PlatformId}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
@@ -26,7 +35,11 @@ namespace gaseous_server.Controllers
             return Classes.Bios.GetBios(PlatformId, AvailableOnly);
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpHead]
         [Route("zip/{PlatformId}")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -37,7 +50,7 @@ namespace gaseous_server.Controllers
             {
                 IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId);
 
-                string biosPath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryBIOSDirectory, platform.Slug);
+                string biosPath = Path.Combine(Config.LibraryConfiguration.LibraryBIOSDirectory, platform.Slug);
 
                 string tempFile = Path.GetTempFileName();
 
@@ -59,7 +72,11 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpHead]
         [Route("{PlatformId}/{BiosName}")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]

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

@@ -3,18 +3,25 @@ using System.Collections.Generic;
 using System.IO.Compression;
 using System.Linq;
 using System.Threading.Tasks;
+using gaseous_server.Classes;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     public class CollectionsController : Controller
     {
         /// <summary>
         /// Gets all ROM collections
         /// </summary>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public List<Classes.Collections.CollectionItem> GetCollections()
@@ -28,6 +35,8 @@ namespace gaseous_server.Controllers
         /// <param name="CollectionId"></param>
         /// <param name="Build">Set to true to begin the collection build process</param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{CollectionId}")]
         [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
@@ -54,6 +63,8 @@ namespace gaseous_server.Controllers
         /// </summary>
         /// <param name="CollectionId"></param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{CollectionId}/Roms")]
         [ProducesResponseType(typeof(List<Classes.Collections.CollectionContents.CollectionPlatformItem>), StatusCodes.Status200OK)]
@@ -76,20 +87,23 @@ namespace gaseous_server.Controllers
         /// </summary>
         /// <param name="Item"></param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpPost]
         [Route("Preview")]
+        [Authorize(Roles = "Admin,Gamer")]
         [ProducesResponseType(typeof(List<Classes.Collections.CollectionContents.CollectionPlatformItem>), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GetCollectionRomsPreview(Classes.Collections.CollectionItem Item)
         {
-            //try
+            try
-            //{
+            {
                 return Ok(Classes.Collections.GetCollectionContent(Item));
-            //}
+            }
-            //catch (Exception ex)
+            catch (Exception ex)
-            //{
+            {
-            //    return NotFound(ex);
+               return NotFound(ex);
-            //}
+            }
         }
 
         /// <summary>
@@ -97,6 +111,8 @@ namespace gaseous_server.Controllers
         /// </summary>
         /// <param name="CollectionId"></param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{CollectionId}/Roms/Zip")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -107,7 +123,7 @@ namespace gaseous_server.Controllers
             {
                 Classes.Collections.CollectionItem collectionItem = Classes.Collections.GetCollection(CollectionId);
 
-                string ZipFilePath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryCollectionsDirectory, CollectionId + ".zip");
+                string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, CollectionId + ".zip");
 
                 if (System.IO.File.Exists(ZipFilePath))
                 {
@@ -130,7 +146,10 @@ namespace gaseous_server.Controllers
         /// </summary>
         /// <param name="Item"></param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpPost]
+        [Authorize(Roles = "Admin,Gamer")]
         [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         public ActionResult NewCollection(Classes.Collections.CollectionItem Item)
@@ -151,15 +170,57 @@ namespace gaseous_server.Controllers
         /// <param name="CollectionId"></param>
         /// <param name="Item"></param>
         /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpPatch]
         [Route("{CollectionId}")]
+        [Authorize(Roles = "Admin,Gamer")]
         [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult EditCollection(long CollectionId, Classes.Collections.CollectionItem Item)
         {
             try
             {
-                return Ok(Classes.Collections.EditCollection(CollectionId, Item));
+                return Ok(Classes.Collections.EditCollection(CollectionId, Item, true));
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Edits an existing collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <param name="Item"></param>
+        /// <returns></returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPatch]
+        [Authorize(Roles = "Admin,Gamer")]
+        [Route("{CollectionId}/AlwaysInclude")]
+        [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult EditCollectionAlwaysInclude(long CollectionId, [FromQuery]bool Rebuild, [FromBody]Collections.CollectionItem.AlwaysIncludeItem Inclusion)
+        {
+            try
+            {
+                Collections.CollectionItem collectionItem = Classes.Collections.GetCollection(CollectionId);
+                bool ItemFound = false;
+                foreach (Collections.CollectionItem.AlwaysIncludeItem includeItem in collectionItem.AlwaysInclude)
+                {
+                    if (includeItem.PlatformId == Inclusion.PlatformId && includeItem.GameId == Inclusion.GameId)
+                    {
+                        ItemFound = true;
+                    }
+                }
+                if (ItemFound == false)
+                {
+                    collectionItem.AlwaysInclude.Add(Inclusion);
+                }
+
+                return Ok(Classes.Collections.EditCollection(CollectionId, collectionItem, Rebuild));
             }
             catch
             {
@@ -171,7 +232,10 @@ namespace gaseous_server.Controllers
         /// Deletes the specified ROM collection
         /// </summary>
         /// <param name="CollectionId"></param>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpDelete]
+        [Authorize(Roles = "Admin,Gamer")]
         [Route("{CollectionId}")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]

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

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using gaseous_server.Classes;
+using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
+    [ApiController]
+    public class FilterController : ControllerBase
+    {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        //[ResponseCache(CacheProfileName = "5Minute")]
+        public Dictionary<string, object> Filter()
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+            Dictionary<string, object> FilterSet = new Dictionary<string, object>();
+
+            // platforms
+            List<FilterPlatform> platforms = new List<FilterPlatform>();
+            //string sql = "SELECT Platform.Id, Platform.Abbreviation, Platform.AlternativeName, Platform.`Name`, Platform.PlatformLogo, (SELECT COUNT(Games_Roms.Id) AS RomCount FROM Games_Roms WHERE Games_Roms.PlatformId = Platform.Id) AS RomCount FROM Platform HAVING RomCount > 0 ORDER BY `Name`";
+            string sql = "SELECT Platform.Id, Platform.Abbreviation, Platform.AlternativeName, Platform.`Name`, Platform.PlatformLogo, (SELECT COUNT(Games_Roms.Id) AS RomCount FROM Games_Roms WHERE Games_Roms.PlatformId = Platform.Id) AS RomCount, (SELECT COUNT(*) AS GameCount FROM (SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Games_Roms.PlatformId FROM Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId) Game WHERE Game.PlatformId = Platform.Id) AS GameCount FROM Platform HAVING RomCount > 0 ORDER BY `Name`";
+            DataTable dbResponse = db.ExecuteCMD(sql);
+
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                FilterPlatform platformItem = new FilterPlatform(Classes.Metadata.Platforms.GetPlatform((long)dr["id"]));
+                platformItem.RomCount = (int)(long)dr["RomCount"];
+                platformItem.GameCount = (int)(long)dr["GameCount"];
+                platforms.Add(platformItem);
+
+            }
+            FilterSet.Add("platforms", platforms);
+
+            // genres
+            List<Genre> genres = new List<Genre>();
+            sql = "SELECT DISTINCT Relation_Game_Genres.GenresId AS id, Genre.`Name` FROM Relation_Game_Genres JOIN Genre ON Relation_Game_Genres.GenresId = Genre.Id WHERE Relation_Game_Genres.GameId IN (SELECT DISTINCT GameId FROM Games_Roms) ORDER BY `Name`;";
+            dbResponse = db.ExecuteCMD(sql);
+
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                genres.Add(Classes.Metadata.Genres.GetGenres((long)dr["id"]));
+            }
+            FilterSet.Add("genres", genres);
+
+            // game modes
+            List<GameMode> gameModes = new List<GameMode>();
+            sql = "SELECT DISTINCT Relation_Game_GameModes.GameModesId AS id, GameMode.`Name` FROM Relation_Game_GameModes JOIN GameMode ON Relation_Game_GameModes.GameModesId = GameMode.Id WHERE Relation_Game_GameModes.GameId IN (SELECT DISTINCT GameId FROM Games_Roms) ORDER BY `Name`;";
+            dbResponse = db.ExecuteCMD(sql);
+
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                gameModes.Add(Classes.Metadata.GameModes.GetGame_Modes((long)dr["id"]));
+            }
+            FilterSet.Add("gamemodes", gameModes);
+
+            // player perspectives
+            List<PlayerPerspective> playerPerspectives = new List<PlayerPerspective>();
+            sql = "SELECT DISTINCT Relation_Game_PlayerPerspectives.PlayerPerspectivesId AS id, PlayerPerspective.`Name` FROM Relation_Game_PlayerPerspectives JOIN PlayerPerspective ON Relation_Game_PlayerPerspectives.PlayerPerspectivesId = PlayerPerspective.Id WHERE Relation_Game_PlayerPerspectives.GameId IN (SELECT DISTINCT GameId FROM Games_Roms) ORDER BY `Name`;";
+            dbResponse = db.ExecuteCMD(sql);
+
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                playerPerspectives.Add(Classes.Metadata.PlayerPerspectives.GetGame_PlayerPerspectives((long)dr["id"]));
+            }
+            FilterSet.Add("playerperspectives", playerPerspectives);
+
+            // themes
+            List<Theme> themes = new List<Theme>();
+            sql = "SELECT DISTINCT Relation_Game_Themes.ThemesId AS id, Theme.`Name` FROM Relation_Game_Themes JOIN Theme ON Relation_Game_Themes.ThemesId = Theme.Id WHERE Relation_Game_Themes.GameId IN (SELECT DISTINCT GameId FROM Games_Roms) ORDER BY `Name`;";
+            dbResponse = db.ExecuteCMD(sql);
+
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                themes.Add(Classes.Metadata.Themes.GetGame_Themes((long)dr["id"]));
+            }
+            FilterSet.Add("themes", themes);
+
+            return FilterSet;
+        }
+
+        public class FilterPlatform : IGDB.Models.Platform
+        {
+            public FilterPlatform(Platform platform)
+            {
+                var properties = platform.GetType().GetProperties();
+                foreach (var prop in properties)
+                {
+                    if (prop.GetGetMethod() != null)
+                    {
+                        this.GetType().GetProperty(prop.Name).SetValue(this, prop.GetValue(platform));
+                    }
+                }
+            }
+
+            public int RomCount { get; set; }
+            public int GameCount { get; set; }
+        }
+    }
+}

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

@@ -6,21 +6,25 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using gaseous_server.Classes;
 using gaseous_server.Classes.Metadata;
-using gaseous_tools;
 using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis.Scripting;
-using Org.BouncyCastle.Asn1.X509;
 using static gaseous_server.Classes.Metadata.AgeRatings;
 
 namespace gaseous_server.Controllers
 {
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     [ApiController]
     public class GamesController : ControllerBase
     {
+        [MapToApiVersion("1.0")]
         [HttpGet]
         [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
         public ActionResult Game(
@@ -35,7 +39,7 @@ namespace gaseous_server.Controllers
             bool sortdescending = false)
             {
 
-            return Ok(GetGames(name, platform, genre, gamemode, playerperspective, theme, minrating, maxrating, sortdescending));
+            return Ok(GetGames(name, platform, genre, gamemode, playerperspective, theme, minrating, maxrating, "Adult", true, true, sortdescending));
         }
 
         public static List<Game> GetGames(
@@ -47,6 +51,9 @@ namespace gaseous_server.Controllers
             string theme = "",
             int minrating = -1,
             int maxrating = -1,
+            string ratinggroup = "Adult",
+            bool includenullrating = true,
+            bool sortbynamethe = false,
             bool sortdescending = false)
         {
             string whereClause = "";
@@ -99,7 +106,7 @@ namespace gaseous_server.Controllers
 
             if (genre.Length > 0)
             {
-                tempVal = "(";
+                tempVal = "Relation_Game_Genres.GenresId IN (";
                 string[] genreClauseItems = genre.Split(",");
                 for (int i = 0; i < genreClauseItems.Length; i++)
                 {
@@ -108,7 +115,7 @@ namespace gaseous_server.Controllers
                         tempVal += " AND ";
                     }
                     string genreLabel = "@Genre" + i;
-                    tempVal += "JSON_CONTAINS(Game.Genres, " + genreLabel + ", '$')";
+                    tempVal += genreLabel;
                     whereParams.Add(genreLabel, genreClauseItems[i]);
                 }
                 tempVal += ")";
@@ -117,7 +124,7 @@ namespace gaseous_server.Controllers
 
             if (gamemode.Length > 0)
             {
-                tempVal = "(";
+                tempVal = "Relation_Game_GameModes.GameModesId IN (";
                 string[] gameModeClauseItems = gamemode.Split(",");
                 for (int i = 0; i < gameModeClauseItems.Length; i++)
                 {
@@ -126,7 +133,7 @@ namespace gaseous_server.Controllers
                         tempVal += " AND ";
                     }
                     string gameModeLabel = "@GameMode" + i;
-                    tempVal += "JSON_CONTAINS(Game.GameModes, " + gameModeLabel + ", '$')";
+                    tempVal += gameModeLabel;
                     whereParams.Add(gameModeLabel, gameModeClauseItems[i]);
                 }
                 tempVal += ")";
@@ -135,7 +142,7 @@ namespace gaseous_server.Controllers
 
             if (playerperspective.Length > 0)
             {
-                tempVal = "(";
+                tempVal = "Relation_Game_PlayerPerspectives.PlayerPerspectivesId IN (";
                 string[] playerPerspectiveClauseItems = playerperspective.Split(",");
                 for (int i = 0; i < playerPerspectiveClauseItems.Length; i++)
                 {
@@ -144,7 +151,7 @@ namespace gaseous_server.Controllers
                         tempVal += " AND ";
                     }
                     string playerPerspectiveLabel = "@PlayerPerspective" + i;
-                    tempVal += "JSON_CONTAINS(Game.PlayerPerspectives, " + playerPerspectiveLabel + ", '$')";
+                    tempVal += playerPerspectiveLabel;
                     whereParams.Add(playerPerspectiveLabel, playerPerspectiveClauseItems[i]);
                 }
                 tempVal += ")";
@@ -153,7 +160,7 @@ namespace gaseous_server.Controllers
 
             if (theme.Length > 0)
             {
-                tempVal = "(";
+                tempVal = "Relation_Game_Themes.ThemesId IN (";
                 string[] themeClauseItems = theme.Split(",");
                 for (int i = 0; i < themeClauseItems.Length; i++)
                 {
@@ -162,13 +169,59 @@ namespace gaseous_server.Controllers
                         tempVal += " AND ";
                     }
                     string themeLabel = "@Theme" + i;
-                    tempVal += "JSON_CONTAINS(Game.Themes, " + themeLabel + ", '$')";
+                    tempVal += themeLabel;
                     whereParams.Add(themeLabel, themeClauseItems[i]);
                 }
                 tempVal += ")";
                 whereClauses.Add(tempVal);
             }
 
+            if (ratinggroup.Length > 0)
+            {
+                List<long> AgeClassificationsList = new List<long>();
+                foreach (string ratingGroup in ratinggroup.Split(','))
+                {
+                    if (AgeGroups.AgeGroupings.ContainsKey(ratingGroup))
+                    {
+                        List<AgeGroups.AgeGroupItem> ageGroups = AgeGroups.AgeGroupings[ratingGroup];
+                        foreach (AgeGroups.AgeGroupItem ageGroup in ageGroups)
+                        {
+                            AgeClassificationsList.AddRange(ageGroup.AgeGroupItemValues);
+                        }
+                    }
+                }
+
+                if (AgeClassificationsList.Count > 0)
+                {
+                    tempVal = "(view_AgeRatings.Rating IN (";
+                    for (int i = 0; i < AgeClassificationsList.Count; i++)
+                    {
+                        if (i > 0)
+                        {
+                            tempVal += ", ";
+                        }
+                        string themeLabel = "@Rating" + i;
+                        tempVal += themeLabel;
+                        whereParams.Add(themeLabel, AgeClassificationsList[i]);
+                    }
+                    tempVal += ")";
+
+                    tempVal += " OR ";
+
+                    if (includenullrating == true)
+                    {
+                        tempVal += "view_AgeRatings.Rating IS NULL";
+                    }
+                    else
+                    {
+                        tempVal += "view_AgeRatings.Rating IS NOT NULL";
+                    }
+                    tempVal += ")";
+
+                    whereClauses.Add(tempVal);
+                }
+            }
+
             // build where clause
             if (whereClauses.Count > 0)
             {
@@ -198,14 +251,21 @@ namespace gaseous_server.Controllers
             }
 
             // order by clause
-            string orderByClause = "ORDER BY `Name` ASC";
+            string orderByField = "Name";
+            if (sortbynamethe == true)
+            {
+                orderByField = "NameThe";
+            }
+            string orderByClause = "ORDER BY `" + orderByField + "` ASC";
             if (sortdescending == true)
             {
-                orderByClause = "ORDER BY `Name` DESC";
+                orderByClause = "ORDER BY `" + orderByField + "` DESC";
             }
 
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Game.Id, Game.AgeRatings, Game.AggregatedRating, Game.AggregatedRatingCount, Game.AlternativeNames, Game.Artworks, Game.Bundles, Game.Category, Game.Collection, Game.Cover, Game.Dlcs, Game.Expansions, Game.ExternalGames, Game.FirstReleaseDate, Game.`Follows`, Game.Franchise, Game.Franchises, Game.GameEngines, Game.GameModes, Game.Genres, Game.Hypes, Game.InvolvedCompanies, Game.Keywords, Game.MultiplayerModes, Game.`Name`, Game.ParentGame, Game.Platforms, Game.PlayerPerspectives, Game.Rating, Game.RatingCount, Game.ReleaseDates, Game.Screenshots, Game.SimilarGames, Game.Slug, Game.StandaloneExpansions, Game.`Status`, Game.StoryLine, Game.Summary, Game.Tags, Game.Themes, Game.TotalRating, Game.TotalRatingCount, Game.VersionParent, Game.VersionTitle, Game.Videos, Game.Websites FROM gaseous.Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId " + whereClause + " " + havingClause + " " + orderByClause;
+            //string sql = "SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Game.* FROM Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId LEFT JOIN Relation_Game_Genres ON Game.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON Game.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON Game.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId " + whereClause + " " + havingClause + " " + orderByClause;
+
+            string sql = "SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Game.*, case when Game.`Name` like 'The %' then CONCAT(trim(substr(Game.`Name` from 4)), ', The') else Game.`Name` end as NameThe FROM Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId LEFT JOIN Relation_Game_Genres ON Game.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON Game.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON Game.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId LEFT JOIN (SELECT Relation_Game_AgeRatings.GameId, AgeRating.* FROM Relation_Game_AgeRatings JOIN AgeRating ON Relation_Game_AgeRatings.AgeRatingsId = AgeRating.Id) view_AgeRatings ON Game.Id = view_AgeRatings.GameId " + whereClause + " " + havingClause + " " + orderByClause;
 
             List<IGDB.Models.Game> RetVal = new List<IGDB.Models.Game>();
 
@@ -219,6 +279,8 @@ namespace gaseous_server.Controllers
             return RetVal;
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}")]
         [ProducesResponseType(typeof(Game), StatusCodes.Status200OK)]
@@ -245,6 +307,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/alternativename")]
         [ProducesResponseType(typeof(List<AlternativeName>), StatusCodes.Status200OK)]
@@ -276,6 +340,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/agerating")]
         [ProducesResponseType(typeof(List<AgeRatings.GameAgeRating>), StatusCodes.Status200OK)]
@@ -307,6 +373,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/agerating/{RatingId}/image")]
         [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
@@ -386,6 +454,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/artwork")]
         [ProducesResponseType(typeof(List<Artwork>), StatusCodes.Status200OK)]
@@ -415,6 +485,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/artwork/{ArtworkId}")]
         [ProducesResponseType(typeof(Artwork), StatusCodes.Status200OK)]
@@ -449,6 +521,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/artwork/{ArtworkId}/image")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -503,6 +577,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/cover")]
         [ProducesResponseType(typeof(Cover), StatusCodes.Status200OK)]
@@ -536,6 +612,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/cover/image")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -575,6 +653,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/genre")]
         [ProducesResponseType(typeof(List<Genre>), StatusCodes.Status200OK)]
@@ -611,6 +691,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/companies")]
         [ProducesResponseType(typeof(List<Dictionary<string, object>>), StatusCodes.Status200OK)]
@@ -654,6 +736,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/companies/{CompanyId}")]
         [ProducesResponseType(typeof(Dictionary<string, object>), StatusCodes.Status200OK)]
@@ -695,6 +779,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/companies/{CompanyId}/image")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -738,9 +824,11 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/roms")]
-        [ProducesResponseType(typeof(List<Classes.Roms.GameRomItem>), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(Classes.Roms.GameRomObject), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         //[ResponseCache(CacheProfileName = "5Minute")]
         public ActionResult GameRom(long GameId)
@@ -749,9 +837,7 @@ namespace gaseous_server.Controllers
             {
                 Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
-                List<Classes.Roms.GameRomItem> roms = Classes.Roms.GetRoms(GameId);
+                return Ok(Classes.Roms.GetRoms(GameId));
-
-                return Ok(roms);
             }
             catch
             {
@@ -759,6 +845,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/roms/{RomId}")]
         [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
@@ -786,7 +874,10 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpPatch]
+        [Authorize(Roles = "Admin,Gamer")]
         [Route("{GameId}/roms/{RomId}")]
         [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -813,7 +904,10 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpDelete]
+        [Authorize(Roles = "Admin,Gamer")]
         [Route("{GameId}/roms/{RomId}")]
         [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -840,7 +934,11 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpHead]
         [Route("{GameId}/roms/{RomId}/file")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -875,7 +973,11 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpHead]
         [Route("{GameId}/roms/{RomId}/{FileName}")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -910,6 +1012,175 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [Route("{GameId}/romgroup/{RomGroupId}")]
+        [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        //[ResponseCache(CacheProfileName = "5Minute")]
+        public ActionResult GameRomGroup(long GameId, long RomGroupId)
+        {
+            try
+            {
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                Classes.RomMediaGroup.GameRomMediaGroupItem rom = Classes.RomMediaGroup.GetMediaGroup(RomGroupId);
+                if (rom.GameId == GameId)
+                {
+                    return Ok(rom);
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        [Authorize(Roles = "Admin,Gamer")]
+        [Route("{GameId}/romgroup")]
+        [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult NewGameRomGroup(long GameId, long PlatformId, [FromBody] List<long> RomIds)
+        {
+            try
+            {
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                try
+                {
+                    Classes.RomMediaGroup.GameRomMediaGroupItem rom = Classes.RomMediaGroup.CreateMediaGroup(GameId, PlatformId, RomIds);
+                    return Ok(rom);
+                }
+                catch
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPatch]
+        [Authorize(Roles = "Admin,Gamer")]
+        [Route("{GameId}/romgroup/{RomId}")]
+        [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GameRomGroupMembers(long GameId, long RomGroupId, [FromBody] List<long> RomIds)
+        {
+            try
+            {
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                Classes.RomMediaGroup.GameRomMediaGroupItem rom = Classes.RomMediaGroup.GetMediaGroup(RomGroupId);
+                if (rom.GameId == GameId)
+                {
+                    rom = Classes.RomMediaGroup.EditMediaGroup(RomGroupId, RomIds);
+                    return Ok(rom);
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpDelete]
+        [Authorize(Roles = "Admin,Gamer")]
+        [Route("{GameId}/romgroup/{RomGroupId}")]
+        [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GameRomGroupDelete(long GameId, long RomGroupId)
+        {
+            try
+            {
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                Classes.RomMediaGroup.GameRomMediaGroupItem rom = Classes.RomMediaGroup.GetMediaGroup(RomGroupId);
+                if (rom.GameId == GameId)
+                {
+                    Classes.RomMediaGroup.DeleteMediaGroup(RomGroupId);
+                    return Ok(rom);
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpHead]
+        [Route("{GameId}/romgroup/{RomGroupId}/file")]
+        [Route("{GameId}/romgroup/{RomGroupId}/{filename}")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GameRomGroupFile(long GameId, long RomGroupId, string filename = "")
+        {
+            try
+            {
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                Classes.RomMediaGroup.GameRomMediaGroupItem rom = Classes.RomMediaGroup.GetMediaGroup(RomGroupId);
+                if (rom.GameId != GameId)
+                {
+                    return NotFound();
+                }
+
+                string romFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMediaGroupDirectory, RomGroupId + ".zip");
+                if (System.IO.File.Exists(romFilePath))
+                {
+                    FileStream content = new FileStream(romFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    string returnFileName = "";
+                    if (filename == "")
+                    {
+                        returnFileName = gameObject.Name + ".zip";
+                    }
+                    else
+                    {
+                        returnFileName = filename;
+                    }
+                    FileStreamResult response = File(content, "application/octet-stream", returnFileName);
+                    return response;
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("search")]
         [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
@@ -947,6 +1218,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/screenshots")]
         [ProducesResponseType(typeof(List<Screenshot>), StatusCodes.Status200OK)]
@@ -976,6 +1249,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/screenshots/{ScreenshotId}")]
         [ProducesResponseType(typeof(Screenshot), StatusCodes.Status200OK)]
@@ -1008,6 +1283,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/screenshots/{ScreenshotId}/image")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
@@ -1050,6 +1327,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{GameId}/videos")]
         [ProducesResponseType(typeof(List<GameVideo>), StatusCodes.Status200OK)]

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

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize(Roles = "Admin")]
+    public class LibraryController : Controller
+    {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [ProducesResponseType(typeof(List<GameLibrary.LibraryItem>), StatusCodes.Status200OK)]
+        public ActionResult GetLibraries()
+        {
+            return Ok(GameLibrary.GetLibraries);
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet("{LibraryId}")]
+        [ProducesResponseType(typeof(GameLibrary.LibraryItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetLibrary(int LibraryId)
+        {
+            try
+            {
+                return Ok(GameLibrary.GetLibrary(LibraryId));
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        [ProducesResponseType(typeof(GameLibrary.LibraryItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status409Conflict)]
+        public ActionResult AddLibrary(string Name, string Path, long DefaultPlatformId)
+        {
+            try
+            {
+                return Ok(GameLibrary.AddLibrary(Name, Path, DefaultPlatformId));
+            }
+            catch (GameLibrary.PathExists exPE)
+            {
+                return Conflict("Path already used in another library");
+            }
+            catch (GameLibrary.PathNotFound exPNF)
+            {
+                return NotFound("Path not found");
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpDelete("{LibraryId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult DelLibrary(int LibraryId)
+        {
+            try
+            {
+                GameLibrary.DeleteLibrary(LibraryId);
+                return Ok();
+            }
+            catch (GameLibrary.CannotDeleteDefaultLibrary exCDDL)
+            {
+                return BadRequest(exCDDL.ToString());
+            }
+            catch (GameLibrary.LibraryNotFound exLNF)
+            {
+                return NotFound(exLNF.ToString());
+            }
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using gaseous_server.Classes;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize(Roles = "Admin")]
+    public class LogsController : Controller
+    {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public List<Logging.LogItem> Logs(long? StartIndex, int PageNumber = 1, int PageSize = 100)
+        {
+            return Logging.GetLogs(StartIndex, PageNumber, PageSize);
+        }
+    }
+}

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

@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using gaseous_server.Classes.Metadata;
+using gaseous_server.Models;
+using gaseous_server.Classes;
+using IGDB.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.Scripting;
+using Microsoft.AspNetCore.Authorization;
+
+namespace gaseous_server.Controllers
+{
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [ApiController]
+    [Authorize]
+    public class PlatformMapsController : Controller
+    {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [ProducesResponseType(typeof(List<PlatformMapping.PlatformMapItem>), StatusCodes.Status200OK)]
+        public ActionResult GetPlatformMap(bool ResetToDefault = false)
+        {
+            if (ResetToDefault == true)
+            {
+                PlatformMapping.ExtractPlatformMap(true);
+            }
+
+            return Ok(PlatformMapping.PlatformMap);
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [Route("{PlatformId}")]
+        [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult PlatformMap(long PlatformId)
+        {
+            try
+            {
+                PlatformMapping.PlatformMapItem platformMapItem = PlatformMapping.GetPlatformMap(PlatformId);
+
+                if (platformMapItem != null)
+                {
+                    return Ok(platformMapItem);
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        [ProducesResponseType(typeof(List<IFormFile>), StatusCodes.Status200OK)]
+        [RequestSizeLimit(long.MaxValue)]
+        [DisableRequestSizeLimit, RequestFormLimits(MultipartBodyLengthLimit = long.MaxValue, ValueLengthLimit = int.MaxValue)]
+        [Authorize(Roles = "Admin")]
+        public async Task<IActionResult> UploadPlatformMap(List<IFormFile> files)
+        {
+            Guid sessionid = Guid.NewGuid();
+
+            string workPath = Path.Combine(Config.LibraryConfiguration.LibraryUploadDirectory, sessionid.ToString());
+
+            long size = files.Sum(f => f.Length);
+
+            List<Dictionary<string, object>> UploadedFiles = new List<Dictionary<string, object>>();
+
+            foreach (IFormFile formFile in files)
+            {
+                if (formFile.Length > 0)
+                {
+                    Guid FileId = Guid.NewGuid();
+
+                    string filePath = Path.Combine(workPath, Path.GetFileName(formFile.FileName));
+
+                    if (!Directory.Exists(workPath))
+                    {
+                        Directory.CreateDirectory(workPath);
+                    }
+
+                    using (var stream = System.IO.File.Create(filePath))
+                    {
+                        await formFile.CopyToAsync(stream);
+
+                        Dictionary<string, object> UploadedFile = new Dictionary<string, object>();
+                        UploadedFile.Add("id", FileId.ToString());
+                        UploadedFile.Add("originalname", Path.GetFileName(formFile.FileName));
+                        UploadedFile.Add("fullpath", filePath);
+                        UploadedFiles.Add(UploadedFile);
+                    }
+                }
+            }
+
+            // Process uploaded files
+            foreach (Dictionary<string, object> UploadedFile in UploadedFiles)
+            {
+                Models.PlatformMapping.ExtractPlatformMap((string)UploadedFile["fullpath"]);
+            }
+
+            if (Directory.Exists(workPath))
+            {
+                Directory.Delete(workPath, true);
+            }
+
+            return Ok(new { count = files.Count, size });
+        }
+
+        // [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        // [Route("{PlatformId}")]
+        // [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)]
+        // [ProducesResponseType(StatusCodes.Status404NotFound)]
+        // [ProducesResponseType(StatusCodes.Status409Conflict)]
+        // public ActionResult NewPlatformMap(long PlatformId, PlatformMapping.PlatformMapItem Map)
+        // {
+        //     try
+        //     {
+        //         PlatformMapping.PlatformMapItem platformMapItem = PlatformMapping.GetPlatformMap(PlatformId);
+
+        //         if (platformMapItem != null)
+        //         {
+        //             return Conflict();
+        //         }
+        //         else
+        //         {
+        //             PlatformMapping.WritePlatformMap(Map, false, false);
+        //             return Ok(PlatformMapping.GetPlatformMap(PlatformId));
+        //         }
+        //     }
+        //     catch
+        //     {
+        //         return NotFound();
+        //     }
+        // }
+
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
+        [HttpPatch]
+        [Route("{PlatformId}")]
+        [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [Authorize(Roles = "Admin")]
+        public ActionResult EditPlatformMap(long PlatformId, PlatformMapping.PlatformMapItem Map)
+        {
+            try
+            {
+                PlatformMapping.PlatformMapItem platformMapItem = PlatformMapping.GetPlatformMap(PlatformId);
+
+                if (platformMapItem != null)
+                {
+                    PlatformMapping.WritePlatformMap(Map, true, false);
+                    return Ok(PlatformMapping.GetPlatformMap(PlatformId));
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+    }
+}

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

@@ -5,26 +5,38 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using gaseous_server.Classes;
 using gaseous_server.Classes.Metadata;
-using gaseous_tools;
+using gaseous_server.Models;
 using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis.Scripting;
 
 namespace gaseous_server.Controllers
 {
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     [ApiController]
     public class PlatformsController : Controller
     {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(typeof(List<Platform>), StatusCodes.Status200OK)]
         public ActionResult Platform()
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            return Ok(PlatformsController.GetPlatforms());
+        }
 
-            string sql = "SELECT * FROM gaseous.Platform WHERE Id IN (SELECT DISTINCT PlatformId FROM Games_Roms) ORDER BY `Name` ASC;";
+        public static List<Platform> GetPlatforms()
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+            string sql = "SELECT * FROM Platform WHERE Id IN (SELECT DISTINCT PlatformId FROM Games_Roms) ORDER BY `Name` ASC;";
 
             List<Platform> RetVal = new List<Platform>();
 
@@ -34,9 +46,11 @@ namespace gaseous_server.Controllers
                 RetVal.Add(Classes.Metadata.Platforms.GetPlatform((long)dr["id"]));
             }
 
-            return Ok(RetVal);
+            return RetVal;
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{PlatformId}")]
         [ProducesResponseType(typeof(Platform), StatusCodes.Status200OK)]
@@ -62,6 +76,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{PlatformId}/platformlogo")]
         [ProducesResponseType(typeof(PlatformLogo), StatusCodes.Status200OK)]
@@ -94,6 +110,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("{PlatformId}/platformlogo/image")]
         [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]

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

@@ -6,26 +6,32 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using gaseous_server.Classes;
 using gaseous_server.Classes.Metadata;
-using gaseous_tools;
 using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis.Scripting;
-using Org.BouncyCastle.Asn1.X509;
 using static gaseous_server.Classes.Metadata.AgeRatings;
 
 namespace gaseous_server.Controllers
 {
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     [ApiController]
     public class RomsController : ControllerBase
     {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpPost]
+        [Authorize(Roles = "Admin,Gamer")]
         [ProducesResponseType(typeof(List<IFormFile>), StatusCodes.Status200OK)]
         [RequestSizeLimit(long.MaxValue)]
         [DisableRequestSizeLimit, RequestFormLimits(MultipartBodyLengthLimit = long.MaxValue, ValueLengthLimit = int.MaxValue)]
-        public async Task<IActionResult> UploadRom(List<IFormFile> files)
+        public async Task<IActionResult> UploadRom(List<IFormFile> files, long? OverridePlatformId = null)
         {
             Guid sessionid = Guid.NewGuid();
 
@@ -61,12 +67,17 @@ namespace gaseous_server.Controllers
                 }
             }
 
-            // Process uploaded files
+            // get override platform if specified
-            // Don't rely on or trust the FileName property without validation.
+            IGDB.Models.Platform? OverridePlatform = null;
+            if (OverridePlatformId != null)
+            {
+                OverridePlatform = Platforms.GetPlatform((long)OverridePlatformId);
+            }
 
+            // Process uploaded files
             foreach (Dictionary<string, object> UploadedFile in UploadedFiles)
             {
-                Classes.ImportGame.ImportGameFile((string)UploadedFile["fullpath"]);
+                Classes.ImportGame.ImportGameFile((string)UploadedFile["fullpath"], OverridePlatform);
             }
 
             if (Directory.Exists(workPath))

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

@@ -2,17 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using gaseous_tools;
+using gaseous_server.Classes;
 using IGDB;
 using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using static gaseous_server.Classes.Metadata.Games;
-using static gaseous_tools.Config.ConfigFile;
+
 
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     public class SearchController : Controller
     {
         private static IGDBClient igdb = new IGDBClient(
@@ -21,6 +25,8 @@ namespace gaseous_server.Controllers
                             Config.IGDB.Secret
                         );
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("Platform")]
         [ProducesResponseType(typeof(List<Platform>), StatusCodes.Status200OK)]
@@ -42,6 +48,8 @@ namespace gaseous_server.Controllers
             return results.ToList();
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("Game")]
         [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]

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

@@ -4,7 +4,9 @@ using System.Data;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
-using gaseous_tools;
+using gaseous_server.Classes;
+using gaseous_signature_parser.models.RomSignatureObject;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
@@ -12,13 +14,18 @@ using Microsoft.AspNetCore.Mvc;
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]/[action]")]
+    [Route("api/v{version:apiVersion}/[controller]/[action]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     public class SignaturesController : ControllerBase
     {
         /// <summary>
         /// Get the current signature counts from the database
         /// </summary>
         /// <returns>Number of sources, publishers, games, and rom signatures in the database</returns>
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public Models.Signatures_Status Status()
@@ -26,6 +33,8 @@ namespace gaseous_server.Controllers
             return new Models.Signatures_Status();
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public List<Models.Signatures_Games> GetSignature(string md5 = "", string sha1 = "")
@@ -39,6 +48,8 @@ namespace gaseous_server.Controllers
             }
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public List<Models.Signatures_Games> GetByTosecName(string TosecName = "")
@@ -54,8 +65,8 @@ namespace gaseous_server.Controllers
 
         private List<Models.Signatures_Games> _GetSignature(string sqlWhere, string searchString)
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT     view_Signatures_Games.*,    Signatures_Roms.Id AS romid,    Signatures_Roms.Name AS romname,    Signatures_Roms.Size,    Signatures_Roms.CRC,    Signatures_Roms.MD5,    Signatures_Roms.SHA1,    Signatures_Roms.DevelopmentStatus,    Signatures_Roms.Flags,    Signatures_Roms.RomType,    Signatures_Roms.RomTypeMedia,    Signatures_Roms.MediaLabel,    Signatures_Roms.MetadataSource FROM    Signatures_Roms        INNER JOIN    view_Signatures_Games ON Signatures_Roms.GameId = view_Signatures_Games.Id WHERE " + sqlWhere;
+            string sql = "SELECT     view_Signatures_Games.*,    Signatures_Roms.Id AS romid,    Signatures_Roms.Name AS romname,    Signatures_Roms.Size,    Signatures_Roms.CRC,    Signatures_Roms.MD5,    Signatures_Roms.SHA1,    Signatures_Roms.DevelopmentStatus,    Signatures_Roms.Attributes,    Signatures_Roms.RomType,    Signatures_Roms.RomTypeMedia,    Signatures_Roms.MediaLabel,    Signatures_Roms.MetadataSource FROM    Signatures_Roms        INNER JOIN    view_Signatures_Games ON Signatures_Roms.GameId = view_Signatures_Games.Id WHERE " + sqlWhere;
             Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("searchString", searchString);
 
@@ -88,14 +99,14 @@ namespace gaseous_server.Controllers
                         Name = (string)sigDbRow["romname"],
                         Size = (Int64)sigDbRow["Size"],
                         Crc = (string)sigDbRow["CRC"],
-                        Md5 = (string)sigDbRow["MD5"],
+                        Md5 = ((string)sigDbRow["MD5"]).ToLower(),
-                        Sha1 = (string)sigDbRow["SHA1"],
+                        Sha1 = ((string)sigDbRow["SHA1"]).ToLower(),
                         DevelopmentStatus = (string)sigDbRow["DevelopmentStatus"],
-                        flags = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>((string)sigDbRow["Flags"]),
+                        Attributes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<KeyValuePair<string, object>>>((string)Common.ReturnValueIfNull(sigDbRow["Attributes"], "[]")),
-                        RomType = (Models.Signatures_Games.RomItem.RomTypes)(int)sigDbRow["RomType"],
+                        RomType = (RomSignatureObject.Game.Rom.RomTypes)(int)sigDbRow["RomType"],
                         RomTypeMedia = (string)sigDbRow["RomTypeMedia"],
                         MediaLabel = (string)sigDbRow["MediaLabel"],
-                        SignatureSource = (Models.Signatures_Games.RomItem.SignatureSourceType)(Int32)sigDbRow["MetadataSource"]
+                        SignatureSource = (gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType)(Int32)sigDbRow["MetadataSource"]
                     }
                 };
                 GamesList.Add(gameItem);

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

@@ -4,28 +4,38 @@ using System.Data;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
-using gaseous_tools;
+using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace gaseous_server.Controllers
 {
     [ApiController]
-    [Route("api/v1/[controller]")]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.0")]
+    [ApiVersion("1.1")]
+    [Authorize]
     public class SystemController : Controller
     {
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public SystemInfo GetSystemStatus()
         {
-            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             SystemInfo ReturnValue = new SystemInfo();
 
             // disk size
             List<SystemInfo.PathItem> Disks = new List<SystemInfo.PathItem>();
-            //Disks.Add(GetDisk(gaseous_tools.Config.ConfigurationPath));
+            foreach (GameLibrary.LibraryItem libraryItem in GameLibrary.GetLibraries)
-            Disks.Add(GetDisk(gaseous_tools.Config.LibraryConfiguration.LibraryRootDirectory));
+            {
+                Disks.Add(GetDisk(libraryItem.Path));
+            }
             ReturnValue.Paths = Disks;
 
             // database size
@@ -51,6 +61,8 @@ namespace gaseous_server.Controllers
             return ReturnValue;
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("Version")]
         [ProducesResponseType(StatusCodes.Status200OK)]
@@ -58,11 +70,31 @@ namespace gaseous_server.Controllers
             return Assembly.GetExecutingAssembly().GetName().Version;
         }
 
+        [MapToApiVersion("1.0")]
+        [MapToApiVersion("1.1")]
         [HttpGet]
         [Route("VersionFile")]
+        [AllowAnonymous]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public FileContentResult GetSystemVersionAsFile() {
-            string ver = "var AppVersion = \"" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + "\"";
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+
+            // get age ratings dictionary
+            Dictionary<int, string> AgeRatingsStrings = new Dictionary<int, string>();
+            foreach(IGDB.Models.AgeRatingTitle ageRatingTitle in Enum.GetValues(typeof(IGDB.Models.AgeRatingTitle)) )
+            {
+                AgeRatingsStrings.Add((int)ageRatingTitle, ageRatingTitle.ToString());
+            }
+
+            string ver = "var AppVersion = \"" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + "\";" + Environment.NewLine +
+                "var DBSchemaVersion = \"" + db.GetDatabaseSchemaVersion() + "\";" + Environment.NewLine +
+                "var FirstRunStatus = " + Config.ReadSetting("FirstRunStatus", "0") + ";" + Environment.NewLine +
+                "var AgeRatingStrings = " + JsonSerializer.Serialize(AgeRatingsStrings, new JsonSerializerOptions{
+                    WriteIndented = true
+                }) + ";" + Environment.NewLine +
+                "var AgeRatingGroups = " + JsonSerializer.Serialize(AgeRatings.AgeGroups.AgeGroupingsFlat, new JsonSerializerOptions{
+                    WriteIndented = true
+                }) + ";";
             byte[] bytes = Encoding.UTF8.GetBytes(ver);
             return File(bytes, "text/javascript");
         }
@@ -71,7 +103,7 @@ namespace gaseous_server.Controllers
         {
             SystemInfo.PathItem pathItem = new SystemInfo.PathItem {
                 LibraryPath = Path,
-                SpaceUsed = gaseous_tools.Common.DirSize(new DirectoryInfo(Path)),
+                SpaceUsed = Common.DirSize(new DirectoryInfo(Path)),
                 SpaceAvailable = new DriveInfo(Path).AvailableFreeSpace,
                 TotalSpace = new DriveInfo(Path).TotalSize
             };

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

@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Authentication;
+using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.1")]
+    [Authorize]
+    public class FirstSetupController : Controller
+    {
+        private readonly UserManager<ApplicationUser> _userManager;
+        private readonly SignInManager<ApplicationUser> _signInManager;
+
+        public FirstSetupController(
+            UserManager<ApplicationUser> userManager,
+            SignInManager<ApplicationUser> signInManager)
+        {
+            _userManager = userManager;
+            _signInManager = signInManager;
+        }
+
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        [Route("0")]
+        [AllowAnonymous]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public async Task<ActionResult> CreateAdminAccount(Authentication.RegisterViewModel model)
+        {
+            if (Config.ReadSetting("FirstRunStatus", "0") == "0")
+            {
+                if (ModelState.IsValid)
+                {
+                    ApplicationUser user = new ApplicationUser
+                    { 
+                        UserName = model.UserName, 
+                        NormalizedUserName = model.UserName.ToUpper(),
+                        Email = model.Email,
+                        NormalizedEmail = model.Email.ToUpper(),
+                        SecurityProfile = new SecurityProfileViewModel()
+                    };
+                    var result = await _userManager.CreateAsync(user, model.Password);
+                    if (result.Succeeded)
+                    {
+                        await _userManager.AddToRoleAsync(user, "Player");
+                        await _userManager.AddToRoleAsync(user, "Gamer");
+                        await _userManager.AddToRoleAsync(user, "Admin");
+
+                        await _signInManager.SignInAsync(user, isPersistent: true);
+                        
+                        Config.SetSetting("FirstRunStatus", "1");
+
+                        return Ok();
+                    }
+                }
+
+                return Problem(ModelState.ToString());
+            }
+            else
+            {
+                return NotFound();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,413 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using Authentication;
+using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Scripting;
+using static gaseous_server.Classes.Metadata.AgeRatings;
+
+namespace gaseous_server.Controllers.v1_1
+{
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.1")]
+    [ApiController]
+    [Authorize]
+    public class GamesController: ControllerBase
+    {
+        private readonly UserManager<ApplicationUser> _userManager;
+        private readonly SignInManager<ApplicationUser> _signInManager;
+        
+        public GamesController(
+            UserManager<ApplicationUser> userManager,
+            SignInManager<ApplicationUser> signInManager)
+        {
+            _userManager = userManager;
+            _signInManager = signInManager;
+        }
+
+        [MapToApiVersion("1.1")]
+        [HttpPost]
+        [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
+        public async Task<IActionResult> Game_v1_1(GameSearchModel model)
+        {
+            var user = await _userManager.GetUserAsync(User);
+
+            if (user != null)
+            {
+                // apply security profile filtering
+                List<string> RemoveAgeGroups = new List<string>();
+                switch (user.SecurityProfile.AgeRestrictionPolicy.MaximumAgeRestriction.ToLower())
+                {
+                    case "adult":
+                        break;
+                    case "mature":
+                        RemoveAgeGroups.Add("Adult");
+                        break;
+                    case "teen":
+                        RemoveAgeGroups.Add("Adult");
+                        RemoveAgeGroups.Add("Mature");
+                        break;
+                    case "child":
+                        RemoveAgeGroups.Add("Adult");
+                        RemoveAgeGroups.Add("Mature");
+                        RemoveAgeGroups.Add("Teen");
+                        break;
+                }
+                foreach (string RemoveAgeGroup in RemoveAgeGroups)
+                {
+                    if (model.GameAgeRating.AgeGroupings.Contains(RemoveAgeGroup))
+                    {
+                        model.GameAgeRating.AgeGroupings.Remove(RemoveAgeGroup);
+                    }
+                }
+                if (user.SecurityProfile.AgeRestrictionPolicy.IncludeUnrated == false)
+                {
+                    model.GameAgeRating.IncludeUnrated = false;
+                }
+
+                return Ok(GetGames(model));
+            }
+            else
+            {
+                return Unauthorized();
+            }
+        }
+
+        public class GameSearchModel
+        {
+            public string Name { get; set; }
+            public List<string> Platform { get; set; }
+            public List<string> Genre { get; set; }
+            public List<string> GameMode { get; set; }
+            public List<string> PlayerPerspective { get; set; }
+            public List<string> Theme { get; set; }
+            public GameRatingItem GameRating { get; set; } = new GameRatingItem();
+            public GameAgeRatingItem GameAgeRating { get; set; } = new GameAgeRatingItem();
+            public GameSortingItem Sorting { get; set; } = new GameSortingItem();
+            
+
+            public class GameRatingItem
+            {
+                public int MinimumRating { get; set; } = -1;
+                public int MinimumRatingCount { get; set; } = -1;
+                public int MaximumRating { get; set; } = -1;
+                public int MaximumRatingCount { get; set; } = -1;
+                public bool IncludeUnrated { get; set; } = false;
+            }
+
+            public class GameAgeRatingItem
+            {
+                public List<string> AgeGroupings { get; set; } = new List<string>{ "Child", "Teen", "Mature", "Adult" };
+                public bool IncludeUnrated { get; set; } = true;
+            }
+
+            public class GameSortingItem
+            {
+                public SortField SortBy { get; set; } = SortField.NameThe;
+                public bool SortAscending { get; set; } = true;
+
+                public enum SortField
+                {
+                    Name,
+                    NameThe,
+                    Rating,
+                    RatingCount
+                }
+            }
+        }
+    
+        public static List<Game> GetGames(GameSearchModel model)
+        {
+            string whereClause = "";
+            string havingClause = "";
+            Dictionary<string, object> whereParams = new Dictionary<string, object>();
+
+            List<string> whereClauses = new List<string>();
+            List<string> havingClauses = new List<string>();
+
+            string tempVal = "";
+
+            if (model.Name.Length > 0)
+            {
+                tempVal = "`Name` LIKE @Name";
+                whereParams.Add("@Name", "%" + model.Name + "%");
+                havingClauses.Add(tempVal);
+            }
+
+            if (model.GameRating != null)
+            {
+                List<string> ratingClauses = new List<string>();
+                if (model.GameRating.MinimumRating != -1)
+                {
+                    string ratingTempMinVal = "totalRating >= @totalMinRating";
+                    whereParams.Add("@totalMinRating", model.GameRating.MinimumRating);
+                    ratingClauses.Add(ratingTempMinVal);
+                }
+
+                if (model.GameRating.MaximumRating != -1)
+                {
+                    string ratingTempMaxVal = "totalRating <= @totalMaxRating";
+                    whereParams.Add("@totalMaxRating", model.GameRating.MaximumRating);
+                    ratingClauses.Add(ratingTempMaxVal);
+                }
+
+                if (model.GameRating.MinimumRatingCount != -1)
+                {
+                    string ratingTempMinCountVal = "totalRatingCount >= @totalMinRatingCount";
+                    whereParams.Add("@totalMinRatingCount", model.GameRating.MinimumRatingCount);
+                    ratingClauses.Add(ratingTempMinCountVal);
+                }
+
+                if (model.GameRating.MaximumRatingCount != -1)
+                {
+                    string ratingTempMaxCountVal = "totalRatingCount <= @totalMaxRatingCount";
+                    whereParams.Add("@totalMaxRatingCount", model.GameRating.MaximumRatingCount);
+                    ratingClauses.Add(ratingTempMaxCountVal);
+                }
+
+                // generate rating sub clause
+                string ratingClauseValue = "";
+                if (ratingClauses.Count > 0)
+                {
+                    foreach (string ratingClause in ratingClauses)
+                    {
+                        if (ratingClauseValue.Length > 0)
+                        {
+                            ratingClauseValue += " AND ";
+                        }
+                        ratingClauseValue += ratingClause;
+                    }
+                }
+
+                string unratedClause = "totalRating IS NOT NULL";
+                if (model.GameRating.IncludeUnrated == true)
+                {
+                    unratedClause = "totalRating IS NULL";
+                }
+
+                if (ratingClauseValue.Length > 0)
+                {
+                    havingClauses.Add("((" + ratingClauseValue + ") OR " + unratedClause + ")");
+                }
+            }
+
+            if (model.Platform.Count > 0)
+            {
+                tempVal = "Games_Roms.PlatformId IN (";
+                for (int i = 0; i < model.Platform.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += ", ";
+                    }
+                    string platformLabel = "@Platform" + i;
+                    tempVal += platformLabel;
+                    whereParams.Add(platformLabel, model.Platform[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (model.Genre.Count > 0)
+            {
+                tempVal = "Relation_Game_Genres.GenresId IN (";
+                for (int i = 0; i < model.Genre.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string genreLabel = "@Genre" + i;
+                    tempVal += genreLabel;
+                    whereParams.Add(genreLabel, model.Genre[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (model.GameMode.Count > 0)
+            {
+                tempVal = "Relation_Game_GameModes.GameModesId IN (";
+                for (int i = 0; i < model.GameMode.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string gameModeLabel = "@GameMode" + i;
+                    tempVal += gameModeLabel;
+                    whereParams.Add(gameModeLabel, model.GameMode[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (model.PlayerPerspective.Count > 0)
+            {
+                tempVal = "Relation_Game_PlayerPerspectives.PlayerPerspectivesId IN (";
+                for (int i = 0; i < model.PlayerPerspective.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string playerPerspectiveLabel = "@PlayerPerspective" + i;
+                    tempVal += playerPerspectiveLabel;
+                    whereParams.Add(playerPerspectiveLabel, model.PlayerPerspective[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (model.Theme.Count > 0)
+            {
+                tempVal = "Relation_Game_Themes.ThemesId IN (";
+                for (int i = 0; i < model.Theme.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string themeLabel = "@Theme" + i;
+                    tempVal += themeLabel;
+                    whereParams.Add(themeLabel, model.Theme[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (model.GameAgeRating != null)
+            {
+                if (model.GameAgeRating.AgeGroupings.Count > 0)
+                {
+                    List<long> AgeClassificationsList = new List<long>();
+                    foreach (string ratingGroup in model.GameAgeRating.AgeGroupings)
+                    {
+                        if (AgeGroups.AgeGroupings.ContainsKey(ratingGroup))
+                        {
+                            List<AgeGroups.AgeGroupItem> ageGroups = AgeGroups.AgeGroupings[ratingGroup];
+                            foreach (AgeGroups.AgeGroupItem ageGroup in ageGroups)
+                            {
+                                AgeClassificationsList.AddRange(ageGroup.AgeGroupItemValues);
+                            }
+                        }
+                    }
+
+                    if (AgeClassificationsList.Count > 0)
+                    {
+                        AgeClassificationsList = new HashSet<long>(AgeClassificationsList).ToList();
+                        tempVal = "(view_AgeRatings.Rating IN (";
+                        for (int i = 0; i < AgeClassificationsList.Count; i++)
+                        {
+                            if (i > 0)
+                            {
+                                tempVal += ", ";
+                            }
+                            string themeLabel = "@Rating" + i;
+                            tempVal += themeLabel;
+                            whereParams.Add(themeLabel, AgeClassificationsList[i]);
+                        }
+                        tempVal += ")";
+
+                        if (model.GameAgeRating.IncludeUnrated == true)
+                        {
+                            tempVal += " OR view_AgeRatings.Rating IS NULL";
+                        }
+                        tempVal += ")";
+
+                        whereClauses.Add(tempVal);
+                    }
+                }
+            }
+
+            // build where clause
+            if (whereClauses.Count > 0)
+            {
+                whereClause = "WHERE ";
+                for (int i = 0; i < whereClauses.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        whereClause += " AND ";
+                    }
+                    whereClause += whereClauses[i];
+                }
+            }
+
+            // build having clause
+            if (havingClauses.Count > 0)
+            {
+                havingClause = "HAVING ";
+                for (int i = 0; i < havingClauses.Count; i++)
+                {
+                    if (i > 0)
+                    {
+                        havingClause += " AND ";
+                    }
+                    havingClause += havingClauses[i];
+                }
+            }
+
+            // order by clause
+            string orderByField = "NameThe";
+            string orderByOrder = "ASC";
+            if (model.Sorting != null)
+            {
+                switch(model.Sorting.SortBy)
+                {
+                    case GameSearchModel.GameSortingItem.SortField.NameThe:
+                        orderByField = "NameThe";
+                        break;
+                    case GameSearchModel.GameSortingItem.SortField.Name:
+                        orderByField = "Name";
+                        break;
+                    case GameSearchModel.GameSortingItem.SortField.Rating:
+                        orderByField = "TotalRating";
+                        break;
+                    case GameSearchModel.GameSortingItem.SortField.RatingCount:
+                        orderByField = "TotalRatingCount";
+                        break;
+                    default:
+                        orderByField = "NameThe";
+                        break;
+                }
+
+                if (model.Sorting.SortAscending == true)
+                {
+                    orderByOrder = "ASC";
+                }
+                else
+                {
+                    orderByOrder = "DESC";
+                }
+            }
+            string orderByClause = "ORDER BY `" + orderByField + "` " + orderByOrder;
+
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Game.*, case when Game.`Name` like 'The %' then CONCAT(trim(substr(Game.`Name` from 4)), ', The') else Game.`Name` end as NameThe FROM Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId LEFT JOIN Relation_Game_Genres ON Game.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON Game.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON Game.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId LEFT JOIN (SELECT Relation_Game_AgeRatings.GameId, AgeRating.* FROM Relation_Game_AgeRatings JOIN AgeRating ON Relation_Game_AgeRatings.AgeRatingsId = AgeRating.Id) view_AgeRatings ON Game.Id = view_AgeRatings.GameId " + whereClause + " " + havingClause + " " + orderByClause;
+
+            List<IGDB.Models.Game> RetVal = new List<IGDB.Models.Game>();
+
+            DataTable dbResponse = db.ExecuteCMD(sql, whereParams);
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                //RetVal.Add(Classes.Metadata.Games.GetGame((long)dr["ROMGameId"], false, false));
+                RetVal.Add(Classes.Metadata.Games.GetGame(dr));
+            }
+
+            return RetVal;
+        }
+    }
+}

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

@@ -0,0 +1,65 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using IGDB.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.Scripting;
+using static gaseous_server.Classes.Metadata.AgeRatings;
+
+namespace gaseous_server.Controllers.v1_1
+{
+    [Route("api/v{version:apiVersion}/[controller]")]
+    [ApiVersion("1.1")]
+    [ApiController]
+    public class RatingsController: ControllerBase
+    {
+        [MapToApiVersion("1.1")]
+        [HttpGet]
+        [Authorize]
+        [Route("Images/{RatingBoard}/{RatingId}/image.svg")]
+        [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult RatingsImageById(string RatingBoard, int RatingId)
+        {
+            IGDB.Models.AgeRatingTitle RatingTitle = (AgeRatingTitle)RatingId;
+
+            string resourceName = "gaseous_server.Assets.Ratings." + RatingBoard + "." + RatingTitle.ToString() + ".svg";
+
+            var assembly = Assembly.GetExecutingAssembly();
+            string[] resources = assembly.GetManifestResourceNames();
+            if (resources.Contains(resourceName))
+            {
+                using (Stream stream = assembly.GetManifestResourceStream(resourceName))
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    byte[] filedata = new byte[stream.Length];
+                    stream.Read(filedata, 0, filedata.Length);
+
+                    string filename = RatingBoard + "-" + RatingTitle.ToString() + ".svg";
+                    string contentType = "image/svg+xml";
+
+                    var cd = new System.Net.Mime.ContentDisposition
+                    {
+                        FileName = filename,
+                        Inline = true,
+                    };
+
+                    Response.Headers.Add("Content-Disposition", cd.ToString());
+                    Response.Headers.Add("Cache-Control", "public, max-age=604800");
+
+                    return File(filedata, contentType);
+                }
+            }
+            return NotFound();
+        }
+    }
+}

gaseous-server/Models/PlatformMapping.cs

@@ -1,54 +1,382 @@
 using System;
+using System.Collections;
+using System.Data;
+using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
+using System.Web;
 using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using gaseous_server.Controllers;
+using IGDB.Models;
+using Newtonsoft.Json;
 
 namespace gaseous_server.Models
 {
 	public class PlatformMapping
 	{
-        public PlatformMapping()
+        private static Dictionary<string, PlatformMapItem> PlatformMapCache = new Dictionary<string, PlatformMapItem>();
-        {
 
+        /// <summary>
+        /// Updates the platform map from the embedded platform map resource
+        /// </summary>
+        public static void ExtractPlatformMap(bool ResetToDefault = false)
+        {
+            using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("gaseous_server.Support.PlatformMap.json"))
+            using (StreamReader reader = new StreamReader(stream))
+            {
+                string rawJson = reader.ReadToEnd();
+                List<PlatformMapItem> platforms = new List<PlatformMapItem>();
+                Newtonsoft.Json.JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings{
+                    MaxDepth = 64
+                };
+                platforms = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PlatformMapItem>>(rawJson, jsonSerializerSettings);
+
+                foreach (PlatformMapItem mapItem in platforms)
+                {
+                    // check if it exists first - only add if it doesn't exist
+                    try
+                    {
+                        Logging.Log(Logging.LogType.Information, "Platform Map", "Checking if " + mapItem.IGDBName + " is in database.");
+                        PlatformMapItem item = GetPlatformMap(mapItem.IGDBId);
+                        // exists
+                        if (ResetToDefault == false)
+                        {
+                            Logging.Log(Logging.LogType.Information, "Platform Map", "Skipping import of " + mapItem.IGDBName + " - already in database.");
+                        }
+                        else
+                        {
+                            WritePlatformMap(mapItem, true, true);
+                            Logging.Log(Logging.LogType.Information, "Platform Map", "Overwriting " + mapItem.IGDBName + " with default values.");
+                        }
+                    }
+                    catch
+                    {
+                        Logging.Log(Logging.LogType.Information, "Platform Map", "Importing " + mapItem.IGDBName + " from predefined data.");
+                        // doesn't exist - add it
+                        WritePlatformMap(mapItem, false, true);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the platform map from the provided file - existing items are overwritten
+        /// </summary>
+        /// <param name="ImportFile"></param>
+        public static void ExtractPlatformMap(string ImportFile)
+        {
+            string rawJson = File.ReadAllText(ImportFile);
+            List<PlatformMapItem> platforms = new List<PlatformMapItem>();
+            platforms = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PlatformMapItem>>(rawJson);
+
+            foreach (PlatformMapItem mapItem in platforms)
+            {
+                // get the IGDB platform data
+                Platform platform = Platforms.GetPlatform(mapItem.IGDBId);
+
+                try
+                {
+                    PlatformMapItem item = GetPlatformMap(mapItem.IGDBId);
+
+                    // still here? we must have found the item we're looking for! overwrite it
+                    Logging.Log(Logging.LogType.Information, "Platform Map", "Replacing " + mapItem.IGDBName + " from external JSON file.");
+                    WritePlatformMap(mapItem, true, true);
+                }
+                catch
+                {
+                    // we caught a not found error, insert a new record
+                    Logging.Log(Logging.LogType.Information, "Platform Map", "Importing " + mapItem.IGDBName + " from external JSON file.");
+                    WritePlatformMap(mapItem, false, true);
+                }
+            }
         }
         
-        //private static List<PlatformMapItem> _PlatformMaps = new List<PlatformMapItem>();
         public static List<PlatformMapItem> PlatformMap
         {
             get
             {
-                // load platform maps from: gaseous_server.Support.PlatformMap.json
+                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-                List<PlatformMapItem> _PlatformMaps = new List<PlatformMapItem>();
+                string sql = "SELECT * FROM PlatformMap";
-                var assembly = Assembly.GetExecutingAssembly();
+                DataTable data = db.ExecuteCMD(sql);
-                var resourceName = "gaseous_server.Support.PlatformMap.json";
+
-                using (Stream stream = assembly.GetManifestResourceStream(resourceName))
+                List<PlatformMapItem> platformMaps = new List<PlatformMapItem>();
-                using (StreamReader reader = new StreamReader(stream))
+                foreach (DataRow row in data.Rows)
                 {
-                    string rawJson = reader.ReadToEnd();
+                    long mapId = (long)row["Id"];
-                    _PlatformMaps.Clear();
+                    if (PlatformMapCache.ContainsKey(mapId.ToString()))
-                    _PlatformMaps = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PlatformMapItem>>(rawJson);
+                    {
+                        platformMaps.Add(PlatformMapCache[mapId.ToString()]);
+                    }
+                    else
+                    {
+                        platformMaps.Add(BuildPlatformMapItem(row));
+                    }
                 }
 
-                return _PlatformMaps;
+                platformMaps.Sort((x, y) => x.IGDBName.CompareTo(y.IGDBName));
+
+                return platformMaps;
             }
         }
 
+        public static PlatformMapItem GetPlatformMap(long Id)
+        {
+            if (PlatformMapCache.ContainsKey(Id.ToString()))
+            {
+                return PlatformMapCache[Id.ToString()];
+            }
+            else
+            {
+                Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                string sql = "SELECT * FROM PlatformMap WHERE Id = @Id";
+                Dictionary<string, object> dbDict = new Dictionary<string, object>();
+                dbDict.Add("Id", Id);
+                DataTable data = db.ExecuteCMD(sql, dbDict);
+
+                if (data.Rows.Count > 0)
+                {
+                    PlatformMapItem platformMap = BuildPlatformMapItem(data.Rows[0]);
+
+                    return platformMap;
+                }
+                else
+                {
+                    Exception exception = new Exception("Platform Map Id " + Id + " does not exist.");
+                    Logging.Log(Logging.LogType.Critical, "Platform Map", "Platform Map Id " + Id + " does not exist.", exception);
+                    throw exception;
+                }
+            }
+        }
+
+        public static void WritePlatformMap(PlatformMapItem item, bool Update, bool AllowAvailableEmulatorOverwrite)
+        {
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string sql = "";
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            if (Update == false)
+            {
+                // insert
+                sql = "INSERT INTO PlatformMap (Id, RetroPieDirectoryName, WebEmulator_Type, WebEmulator_Core, AvailableWebEmulators) VALUES (@Id, @RetroPieDirectoryName, @WebEmulator_Type, @WebEmulator_Core, @AvailableWebEmulators)";
+            }
+            else
+            {
+                // update
+                if (AllowAvailableEmulatorOverwrite == true)
+                {
+                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core, AvailableWebEmulators=@AvailableWebEmulators WHERE Id = @Id";
+                }
+                else
+                {
+                    sql = "UPDATE PlatformMap SET RetroPieDirectoryName=@RetroPieDirectoryName, WebEmulator_Type=@WebEmulator_Type, WebEmulator_Core=@WebEmulator_Core WHERE Id = @Id";
+                }
+            }
+            dbDict.Add("Id", item.IGDBId);
+            dbDict.Add("RetroPieDirectoryName", item.RetroPieDirectoryName);
+            if (item.WebEmulator != null)
+            {
+                dbDict.Add("WebEmulator_Type", item.WebEmulator.Type);
+                dbDict.Add("WebEmulator_Core", item.WebEmulator.Core);
+                dbDict.Add("AvailableWebEmulators", Newtonsoft.Json.JsonConvert.SerializeObject(item.WebEmulator.AvailableWebEmulators));
+            }
+            else
+            {
+                dbDict.Add("WebEmulator_Type", "");
+                dbDict.Add("WebEmulator_Core", "");
+                dbDict.Add("AvailableWebEmulators", "");
+            }
+            db.ExecuteCMD(sql, dbDict);
+
+            // remove existing items so they can be re-inserted
+            sql = "DELETE FROM PlatformMap_AlternateNames WHERE Id = @Id; DELETE FROM PlatformMap_Extensions WHERE Id = @Id; DELETE FROM PlatformMap_UniqueExtensions WHERE Id = @Id; DELETE FROM PlatformMap_Bios WHERE Id = @Id;";
+            db.ExecuteCMD(sql, dbDict);
+
+            // insert alternate names
+            if (item.AlternateNames != null)
+            {
+                foreach (string alternateName in item.AlternateNames)
+                {
+                    if (alternateName != null)
+                    {
+                        sql = "INSERT INTO PlatformMap_AlternateNames (Id, Name) VALUES (@Id, @Name);";
+                        dbDict.Clear();
+                        dbDict.Add("Id", item.IGDBId);
+                        dbDict.Add("Name", HttpUtility.HtmlDecode(alternateName));
+                        db.ExecuteCMD(sql, dbDict);
+                    }
+                }
+            }
+
+            // insert extensions
+            if (item.Extensions != null)
+            {
+                foreach (string extension in item.Extensions.SupportedFileExtensions)
+                {
+                    sql = "INSERT INTO PlatformMap_Extensions (Id, Extension) VALUES (@Id, @Extension);";
+                    dbDict.Clear();
+                    dbDict.Add("Id", item.IGDBId);
+                    dbDict.Add("Extension", extension.Trim().ToUpper());
+                    db.ExecuteCMD(sql, dbDict);
+                }
+
+                // delete duplicates
+                sql = "DELETE FROM PlatformMap_UniqueExtensions; INSERT INTO PlatformMap_UniqueExtensions SELECT * FROM PlatformMap_Extensions WHERE Extension <> '.ZIP' AND Extension IN (SELECT Extension FROM PlatformMap_Extensions GROUP BY Extension HAVING COUNT(Extension) = 1);";
+                db.ExecuteCMD(sql);
+            }
+
+            // insert bios
+            if (item.Bios != null)
+            {
+                foreach (PlatformMapItem.EmulatorBiosItem biosItem in item.Bios)
+                {
+                    sql = "INSERT INTO PlatformMap_Bios (Id, Filename, Description, Hash) VALUES (@Id, @Filename, @Description, @Hash);";
+                    dbDict.Clear();
+                    dbDict.Add("Id", item.IGDBId);
+                    dbDict.Add("Filename", biosItem.filename);
+                    dbDict.Add("Description", biosItem.description);
+                    dbDict.Add("Hash", biosItem.hash);
+                    db.ExecuteCMD(sql, dbDict);
+                }
+            }
+
+            if (PlatformMapCache.ContainsKey(item.IGDBId.ToString()))
+            {
+                PlatformMapCache.Remove(item.IGDBId.ToString());
+            }
+        }
+
+        static PlatformMapItem BuildPlatformMapItem(DataRow row)
+        {
+            long IGDBId = (long)row["Id"];
+            Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            string sql = "";
+
+            // get platform data
+            IGDB.Models.Platform platform = Platforms.GetPlatform(IGDBId);
+
+            // get platform alternate names
+            sql = "SELECT * FROM PlatformMap_AlternateNames WHERE Id = @Id ORDER BY Name";
+            dbDict.Clear();
+            dbDict.Add("Id", IGDBId);
+            DataTable altTable = db.ExecuteCMD(sql, dbDict);
+
+            List<string> alternateNames = new List<string>();
+            foreach (DataRow altRow in altTable.Rows)
+            {
+                string altVal = (string)altRow["Name"];
+                if (!alternateNames.Contains(altVal, StringComparer.OrdinalIgnoreCase))
+                {
+                    alternateNames.Add(altVal);
+                }
+            }
+            if (platform.AlternativeName != null)
+            {
+                if (!alternateNames.Contains(platform.AlternativeName, StringComparer.OrdinalIgnoreCase))
+                {
+                    alternateNames.Add(platform.AlternativeName);
+                }
+            }
+
+            // get platform known extensions
+            sql = "SELECT * FROM PlatformMap_Extensions WHERE Id = @Id ORDER BY Extension";
+            dbDict.Clear();
+            dbDict.Add("Id", IGDBId);
+            DataTable extTable = db.ExecuteCMD(sql, dbDict);
+
+            List<string> knownExtensions = new List<string>();
+            foreach (DataRow extRow in extTable.Rows)
+            {
+                string extVal = (string)extRow["Extension"];
+                if (!knownExtensions.Contains(extVal, StringComparer.OrdinalIgnoreCase))
+                {
+                    knownExtensions.Add(extVal);
+                }
+            }
+
+            // get platform unique extensions
+            sql = "SELECT * FROM PlatformMap_UniqueExtensions WHERE Id = @Id ORDER BY Extension";
+            dbDict.Clear();
+            dbDict.Add("Id", IGDBId);
+            DataTable uextTable = db.ExecuteCMD(sql, dbDict);
+
+            List<string> uniqueExtensions = new List<string>();
+            foreach (DataRow uextRow in uextTable.Rows)
+            {
+                string uextVal = (string)uextRow["Extension"];
+                if (!uniqueExtensions.Contains(uextVal, StringComparer.OrdinalIgnoreCase))
+                {
+                    uniqueExtensions.Add(uextVal);
+                }
+            }
+
+            // get platform bios
+            sql = "SELECT * FROM PlatformMap_Bios WHERE Id = @Id ORDER BY Filename";
+            dbDict.Clear();
+            dbDict.Add("Id", IGDBId);
+            DataTable biosTable = db.ExecuteCMD(sql, dbDict);
+
+            List<PlatformMapItem.EmulatorBiosItem> bioss = new List<PlatformMapItem.EmulatorBiosItem>();
+            foreach (DataRow biosRow in biosTable.Rows)
+            {
+                PlatformMapItem.EmulatorBiosItem bios = new PlatformMapItem.EmulatorBiosItem
+                {
+                    filename = (string)Common.ReturnValueIfNull(biosRow["Filename"], ""),
+                    description = (string)Common.ReturnValueIfNull(biosRow["Description"], ""),
+                    hash = ((string)Common.ReturnValueIfNull(biosRow["Hash"], "")).ToLower()
+                };
+                bioss.Add(bios);
+            }
+
+            // build item
+            PlatformMapItem mapItem = new PlatformMapItem();
+            mapItem.IGDBId = IGDBId;
+            mapItem.IGDBName = platform.Name;
+            mapItem.IGDBSlug = platform.Slug;
+            mapItem.AlternateNames = alternateNames;
+            mapItem.Extensions = new PlatformMapItem.FileExtensions{
+                SupportedFileExtensions = knownExtensions,
+                UniqueFileExtensions = uniqueExtensions
+            };
+            mapItem.RetroPieDirectoryName = (string)Common.ReturnValueIfNull(row["RetroPieDirectoryName"], "");
+            mapItem.WebEmulator = new PlatformMapItem.WebEmulatorItem{
+                Type = (string)Common.ReturnValueIfNull(row["WebEmulator_Type"], ""),
+                Core = (string)Common.ReturnValueIfNull(row["WebEmulator_Core"], ""),
+                AvailableWebEmulators = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PlatformMapItem.WebEmulatorItem.AvailableWebEmulatorItem>>((string)Common.ReturnValueIfNull(row["AvailableWebEmulators"], "[]"))
+            };
+            mapItem.Bios = bioss;
+            
+            if (PlatformMapCache.ContainsKey(IGDBId.ToString()))
+            {
+                PlatformMapCache[IGDBId.ToString()] = mapItem;
+            }
+            else
+            {
+                PlatformMapCache.Add(IGDBId.ToString(), mapItem);
+            }
+
+            return mapItem;
+        }
+
         public static void GetIGDBPlatformMapping(ref Models.Signatures_Games Signature, FileInfo RomFileInfo, bool SetSystemName)
         {
             bool PlatformFound = false;
             foreach (Models.PlatformMapping.PlatformMapItem PlatformMapping in Models.PlatformMapping.PlatformMap)
             {
-                if (PlatformMapping.KnownFileExtensions.Contains(RomFileInfo.Extension, StringComparer.OrdinalIgnoreCase))
+                if (PlatformMapping.Extensions != null)
                 {
-                    if (SetSystemName == true)
+                    if (PlatformMapping.Extensions.UniqueFileExtensions.Contains(RomFileInfo.Extension, StringComparer.OrdinalIgnoreCase))
                     {
-                        if (Signature.Game != null) { Signature.Game.System = PlatformMapping.IGDBName; }
+                        if (SetSystemName == true)
-                    }
+                        {
-                    Signature.Flags.IGDBPlatformId = PlatformMapping.IGDBId;
+                            if (Signature.Game != null) { Signature.Game.System = PlatformMapping.IGDBName; }
-                    Signature.Flags.IGDBPlatformName = PlatformMapping.IGDBName;
+                        }
+                        Signature.Flags.IGDBPlatformId = PlatformMapping.IGDBId;
+                        Signature.Flags.IGDBPlatformName = PlatformMapping.IGDBName;
 
-                    PlatformFound = true;
+                        PlatformFound = true;
-                    break;
+                        break;
+                    }
                 }
             }
 
@@ -56,7 +384,10 @@ namespace gaseous_server.Models
             {
                 foreach (Models.PlatformMapping.PlatformMapItem PlatformMapping in Models.PlatformMapping.PlatformMap)
                 {
-                    if (PlatformMapping.AlternateNames.Contains(Signature.Game.System, StringComparer.OrdinalIgnoreCase))
+                    if (
+                        PlatformMapping.IGDBName == Signature.Game.System ||
+                        PlatformMapping.AlternateNames.Contains(Signature.Game.System, StringComparer.OrdinalIgnoreCase)
+                        )
                     {
                         if (SetSystemName == true)
                         {
@@ -74,27 +405,51 @@ namespace gaseous_server.Models
 
         public class PlatformMapItem
         {
-            public int IGDBId { get; set; }
+            public long IGDBId { get; set; }
             public string IGDBName { get; set; }
+            public string IGDBSlug { get; set; }
             public List<string> AlternateNames { get; set; } = new List<string>();
-            public List<string> KnownFileExtensions { get; set; } = new List<string>();
+            
-            //public Dictionary<string, object>? WebEmulator { get; set; }
+            public FileExtensions Extensions { get; set; }
+            public class FileExtensions
+            {
+                public List<string> SupportedFileExtensions { get; set; } = new List<string>();
+
+                public List<string> UniqueFileExtensions { get; set; } = new List<string>();
+            }
+
+            public string RetroPieDirectoryName { get; set; }
             public WebEmulatorItem? WebEmulator { get; set; }
 
             public class WebEmulatorItem
             {
                 public string Type { get; set; }
                 public string Core { get; set; }
-                public List<EmulatorBiosItem> Bios { get; set; }
 
-                public class EmulatorBiosItem
+                public List<AvailableWebEmulatorItem> AvailableWebEmulators { get; set; } = new List<AvailableWebEmulatorItem>();
+
+                public class AvailableWebEmulatorItem
                 {
-                    public string hash { get; set; }
+                    public string EmulatorType { get; set; }
-                    public string description { get; set; }
+                    public List<AvailableWebEmulatorCoreItem> AvailableWebEmulatorCores { get; set; } = new List<AvailableWebEmulatorCoreItem>();
-                    public string filename { get; set; }
+
-                    public string region { get; set; }
+                    public class AvailableWebEmulatorCoreItem
+                    {
+                        public string Core { get; set; }
+                        public string? AlternateCoreName { get; set; } = "";
+                        public bool Default { get; set; } = false;
+                    }
                 }
             }
+
+            public List<EmulatorBiosItem> Bios { get; set; }
+
+            public class EmulatorBiosItem
+            {
+                public string hash { get; set; }
+                public string description { get; set; }
+                public string filename { get; set; }
+            }
         }
 	}
 }

gaseous-server/Models/Signatures_Games.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Text.Json.Serialization;
-using static gaseous_romsignatureobject.RomSignatureObject.Game;
+using gaseous_signature_parser.models.RomSignatureObject;
 
 namespace gaseous_server.Models
 {
@@ -127,57 +127,13 @@ namespace gaseous_server.Models
 
             public string? DevelopmentStatus { get; set; }
 
-            public List<string> flags { get; set; } = new List<string>();
+            public List<KeyValuePair<string, object>> Attributes { get; set; } = new List<KeyValuePair<string, object>>();
 
-            public RomTypes RomType { get; set; }
+            public RomSignatureObject.Game.Rom.RomTypes RomType { get; set; }
             public string? RomTypeMedia { get; set; }
             public string? MediaLabel { get; set; }
 
-            public SignatureSourceType SignatureSource { get; set; }
+            public RomSignatureObject.Game.Rom.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
-            }
 
             [JsonIgnore]
             public int Score
@@ -198,6 +154,7 @@ namespace gaseous_server.Models
                                 case "crc":
                                 case "developmentstatus":
                                 case "flags":
+                                case "attributes":
                                 case "romtypemedia":
                                 case "medialabel":
                                     if (prop.PropertyType == typeof(string) || prop.PropertyType == typeof(Int64) || prop.PropertyType == typeof(List<string>))