Revert "Added a check for the DB and a delay at start up if the database is not available (#148)"

This reverts commit f9d6cc4bdc.

.github/dependabot.yml

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

.github/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

@@ -0,0 +1,37 @@
+name: Build Release Docker Image
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[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:latest,gaseousgames/gaseousserver:${{ github.ref_name}}

.github/workflows/BuildDockerOnTag.yml

@@ -1,34 +0,0 @@
-name: Build Docker Image on New Tag
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        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:latest,gaseousgames/gaseousserver:${{ github.ref_name}}

.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

.gitignore

@@ -1,405 +1,405 @@
-# globs
-Makefile.in
-*.userprefs
-*.usertasks
-config.make
-config.status
-aclocal.m4
-install-sh
-autom4te.cache/
-*.tar.gz
-tarballs/
-test-results/
-
-# Mac bundle stuff
-*.dmg
-*.app
-
-# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
-# Windows thumbnail cache files
-Thumbs.db
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/

.gitmodules

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

CODE_OF_CONDUCT.md

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

Directory.Build.props

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

Gaseous.sln

@@ -1,16 +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}"
@@ -21,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Dockerfile = Dockerfile
 		README.MD = README.MD
 		LICENSE = LICENSE
+		.gitignore = .gitignore
+		.github\dependabot.yml = .github\dependabot.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "screenshots", "screenshots", "{F1A847C7-57BC-4DA9-8F83-CD060A7F5122}"
@@ -35,30 +29,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

README.MD

@@ -1,21 +1,38 @@
 # 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)
 ![Game](./screenshots/Game.png)
+![Emulator](./screenshots/Emulator.png)
 
 ## Requirements
-* MySQL Server 8+
+* MySQL Server 8+*
 * Internet Game Database API Key. See: https://api-docs.igdb.com/#account-creation
 
+***Note**: MariaDB is currently not supported as Gaseous uses features present only in MySQL. This is being tracked in https://github.com/gaseous-project/gaseous-server/issues/93
+
 ## Third Party Projects
 The following projects are used by Gaseous
 * https://dotnet.microsoft.com/en-us/apps/aspnet
 * https://github.com/JamesNK/Newtonsoft.Json
 * https://www.nuget.org/packages/MySql.Data/8.0.32.1
 * https://github.com/kamranayub/igdb-dotnet
+* https://github.com/EmulatorJS/EmulatorJS
+
+## Discord Server
+[![Join our Discord server!](https://invite.casperiv.dev/?inviteCode=Nhu7wpT3k4&format=svg)](https://discord.gg/Nhu7wpT3k4)
+
+# Setup
 
 ## Configuration File
 When Gaseous-Server is started for the first time, it creates a configuration file at ~/.gaseous-server/config.json if it doesn't exist. Some values can be filled in using environment variables (such as in the case of using docker).
@@ -55,38 +72,110 @@ When Gaseous-Server is started for the first time, it creates a configuration fi
 
 ```
 
-## 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. 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.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
-4. Run the command "docker-compose up -d"
-5. Connect to the host on port 5198
+1. Download the docker-compose.yml file
+2. Open the docker-compose.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+3. Run the command ```docker-compose up -d```
+4. Connect to the host on port 5198
 
-## Adding Content
-While games can be added to the server without them, it is recommended adding some signature DAT files beforehand to allow for better matching of ROM to game.
+### 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```
+2. Change into the gaseous-server directory
+3. Clone the submodules with the command ```git submodule update --init```
+4. Open the docker-compose-build.yml file and edit the igdbclientid and igdbclientsecret to the values retrieved from your IGDB account
+5. Run the command ```docker-compose --file docker-compose-build.yml up -d```
+6. Connect to the host on port 5198
+
+## Source
+### Build and deploy
+1. Install and configure a MySQL instance
+2. Install the dotnet 7.0 packages appropriate for your operating system
+    * See: https://learn.microsoft.com/en-us/dotnet/core/install/linux
+3. Create a database user with permission to create a databse. Gaseous will create the new database and apply the database schema on it's first startup.
+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
-1. Ensure your game image file is unzipped, and clearly named. Attempting a search for the game name on https://www.igdb.com can help with file naming. If a hash search is unsuccessful, Gaseous will fall back to attempting to search by the file name.
-2. Copy the file to ~/.gaseous-server/Data/Import
+### MAME Arcade
+1. Download the DAT files from the source website. For example; from https://www.progettosnaps.net/dats/MAME
+2. Extract the archive
+3. Copy the file name "MAME 0.257 (arcade).dat" files to ~/.gaseous-server/Data/Signatures/MAME Arcade/
 
+### 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
@@ -97,5 +186,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.

build/Version.props

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

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/Bios.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography;
+using gaseous_tools;
+
+namespace gaseous_server.Classes
+{
+	public class Bios
+	{
+		public Bios()
+		{
+            
+		}
+
+        public static Models.PlatformMapping.PlatformMapItem? BiosHashSignatureLookup(string MD5)
+        {
+            foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
+            {
+                if (platformMapping.Bios != null)
+                {
+                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBiosItem in platformMapping.Bios)
+                    {
+                        if (emulatorBiosItem.hash.ToLower() == MD5.ToLower())
+                        {
+                            return platformMapping;
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public static List<BiosItem> GetBios()
+        {
+            return BuildBiosList();
+        }
+
+        public static List<BiosItem> GetBios(long PlatformId, bool HideUnavailable)
+        {
+            List<BiosItem> biosItems = new List<BiosItem>();
+            foreach (BiosItem biosItem in BuildBiosList())
+            {
+                if (biosItem.platformid == PlatformId)
+                {
+                    if (HideUnavailable == true)
+                    {
+                        if (biosItem.Available == true)
+                        {
+                            biosItems.Add(biosItem);
+                        }
+                    }
+                    else
+                    {
+                        biosItems.Add(biosItem);
+                    }
+                }
+            }
+
+            return biosItems;
+        }
+
+        private static List<BiosItem> BuildBiosList()
+        {
+            List<BiosItem> biosItems = new List<BiosItem>();
+
+            foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
+            {
+                if (platformMapping.Bios != null)
+                {
+                    IGDB.Models.Platform platform = Metadata.Platforms.GetPlatform(platformMapping.IGDBId);
+
+                    foreach (Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem emulatorBios in platformMapping.Bios)
+                    {
+                        BiosItem biosItem = new BiosItem
+                        {
+                            platformid = platformMapping.IGDBId,
+                            platformslug = platform.Slug,
+                            platformname = platform.Name,
+                            description = emulatorBios.description,
+                            filename = emulatorBios.filename,
+                            hash = emulatorBios.hash.ToLower()
+                        };
+                        biosItems.Add(biosItem);
+                    }
+                }
+            }
+            return biosItems;
+        }
+
+        public class BiosItem : Models.PlatformMapping.PlatformMapItem.EmulatorBiosItem
+        {
+            public long platformid { get; set; }
+            public string platformslug { get; set; }
+            public string platformname { get; set; }
+            public string biosPath
+            {
+                get
+                {
+                    return Path.Combine(Config.LibraryConfiguration.LibraryBIOSDirectory, platformslug, base.filename);
+                }
+            }
+            public bool Available {
+                get
+                {
+                    bool fileExists = File.Exists(biosPath);
+                    return fileExists;
+                }
+            }
+        }
+    }
+}
+

gaseous-server/Classes/Collections.cs

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

gaseous-server/Classes/ImportGames.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Data;
+using System.IO.Compression;
 using System.Security.Policy;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using gaseous_tools;
+using IGDB.Models;
 using MySqlX.XDevAPI;
 using Org.BouncyCastle.Utilities.IO.Pem;
 using static gaseous_server.Classes.Metadata.Games;
@@ -21,7 +23,7 @@ namespace gaseous_server.Classes
 
 				// import files first
 				foreach (string importContent in importContents_Files) {
-					ImportGame.ImportGameFile(importContent);
+					ImportGame.ImportGameFile(importContent, null, false);
 				}
             }
 			else
@@ -36,64 +38,142 @@ 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, bool IsDirectory = false)
 		{
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 			string sql = "";
 			Dictionary<string, object> dbDict = new Dictionary<string, object>();
 
-			string[] SkippableFiles = {
-				".DS_STORE",
-				"desktop.ini"
-			};
-            if (SkippableFiles.Contains<string>(Path.GetFileName(GameFileImportPath), StringComparer.OrdinalIgnoreCase))
+            if (Common.SkippableFiles.Contains<string>(Path.GetFileName(GameFileImportPath), StringComparer.OrdinalIgnoreCase))
 			{ 
                 Logging.Log(Logging.LogType.Debug, "Import Game", "Skipping item " + GameFileImportPath);
             }
 			else
 			{
-				//Logging.Log(Logging.LogType.Information, "Import Game", "Processing item " + GameFileImportPath);
 				if (IsDirectory == false)
 				{
 					FileInfo fi = new FileInfo(GameFileImportPath);
                     Common.hashObject hash = new Common.hashObject(GameFileImportPath);
 
-					// 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)
-					{
-						if (!GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryImportDirectory))
-						{
-							Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping");
-						}
-					}
-					else
-					{
-						Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
+                    Models.PlatformMapping.PlatformMapItem? IsBios = Classes.Bios.BiosHashSignatureLookup(hash.md5hash);
 
-						// process as a single file
-						Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
+                    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)
+                        {
+                            if (!GameFileImportPath.StartsWith(Config.LibraryConfiguration.LibraryImportDirectory))
+                            {
+                                Logging.Log(Logging.LogType.Warning, "Import Game", "  " + GameFileImportPath + " already in database - skipping");
+                            }
+                        }
+                        else
+                        {
+                            Logging.Log(Logging.LogType.Information, "Import Game", "  " + GameFileImportPath + " not in database - processing");
 
-						// get discovered platform
-						IGDB.Models.Platform determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
-						if (determinedPlatform == null)
-						{
-							determinedPlatform = new IGDB.Models.Platform();
-						}
+                            Models.Signatures_Games discoveredSignature = GetFileSignature(hash, fi, GameFileImportPath);
 
-                        IGDB.Models.Game determinedGame = SearchForGame(discoveredSignature.Game.Name, discoveredSignature.Flags.IGDBPlatformId);
+                            // get discovered platform
+                            IGDB.Models.Platform? determinedPlatform = null;
+                            if (OverridePlatform == null)
+                            {
+                                determinedPlatform = Metadata.Platforms.GetPlatform(discoveredSignature.Flags.IGDBPlatformId);
+                                if (determinedPlatform == null)
+                                {
+                                    determinedPlatform = new IGDB.Models.Platform();
+                                }
+                            }
+                            else
+                            {
+                                determinedPlatform = OverridePlatform;
+                                discoveredSignature.Flags.IGDBPlatformId = (long)determinedPlatform.Id;
+                                discoveredSignature.Flags.IGDBPlatformName = determinedPlatform.Name;
+                            }
 
-                        // add to database
-                        StoreROM(hash, determinedGame, determinedPlatform, discoveredSignature, GameFileImportPath);
+                            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
+                        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))
+                                    {
+                                        Directory.CreateDirectory(biosPath);
+                                    }
+
+                                    File.Move(GameFileImportPath, biosItem.biosPath, true);
+
+                                    break;
+                                }
+                            }
+                        }
                     }
                 }
 			}
 		}
 
-		public static Models.Signatures_Games GetFileSignature(Common.hashObject hash, FileInfo fi, string GameFileImportPath)
+        public static Models.Signatures_Games GetFileSignature(Common.hashObject hash, FileInfo fi, string GameFileImportPath)
+        {
+            Models.Signatures_Games discoveredSignature = _GetFileSignature(hash, fi, GameFileImportPath);
+
+            if ((Path.GetExtension(GameFileImportPath) == ".zip") && (fi.Length < 1073741824))
+            {
+                // file is a zip and less than 1 GiB
+                // extract the zip file and search the contents
+                string ExtractPath = Path.Combine(Config.LibraryConfiguration.LibraryTempDirectory, Path.GetRandomFileName());
+                if (!Directory.Exists(ExtractPath)) { Directory.CreateDirectory(ExtractPath); }
+                ZipFile.ExtractToDirectory(GameFileImportPath, ExtractPath);
+
+                // loop through contents until we find the first signature match
+                foreach (string file in Directory.GetFiles(ExtractPath))
+                {
+                    FileInfo zfi = new FileInfo(file);
+                    Common.hashObject zhash = new Common.hashObject(file);
+
+                    Models.Signatures_Games zDiscoveredSignature = _GetFileSignature(zhash, zfi, file);
+                    zDiscoveredSignature.Rom.Name = Path.ChangeExtension(zDiscoveredSignature.Rom.Name, ".zip");
+
+                    if (zDiscoveredSignature.Score > discoveredSignature.Score)
+                    {
+                        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;
+                    }
+                }
+
+                if (Directory.Exists(ExtractPath)) { Directory.Delete(ExtractPath, true); }
+            }
+
+            return discoveredSignature;
+        }
+
+		private static Models.Signatures_Games _GetFileSignature(Common.hashObject hash, FileInfo fi, string GameFileImportPath)
 		{
             // check 1: do we have a signature for it?
             gaseous_server.Controllers.SignaturesController sc = new Controllers.SignaturesController();
@@ -175,7 +255,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;
                 }
             }
 
@@ -204,7 +284,7 @@ namespace gaseous_server.Classes
                     if (games.Length == 1)
                     {
                         // exact match!
-                        determinedGame = Metadata.Games.GetGame((long)games[0].Id, false, false);
+                        determinedGame = Metadata.Games.GetGame((long)games[0].Id, false, false, false);
                         Logging.Log(Logging.LogType.Information, "Import Game", "  IGDB game: " + determinedGame.Name);
                         GameFound = true;
                         break;
@@ -212,6 +292,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
                     {
@@ -277,11 +368,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(": "))
@@ -304,36 +401,38 @@ 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) VALUES (@platformid, @gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @Attributes, @romtype, @romtypemedia, @medialabel, @path, @metadatasource, @metadatagamename, @metadataversion); SELECT CAST(LAST_INSERT_ID() AS SIGNED);";
             } else
             {
-                sql = "UPDATE Games_Roms SET PlatformId=platformid, GameId=@gameid, Name=@name, Size=@size, DevelopmentStatus=@developmentstatus, 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));
             dbDict.Add("gameid", Common.ReturnValueIfNull(determinedGame.Id, 0));
-            dbDict.Add("name", Common.ReturnValueIfNull(discoveredSignature.Rom.Name, ""));
+            dbDict.Add("name", Common.ReturnValueIfNull(discoveredSignature.Rom.Name, 0));
             dbDict.Add("size", Common.ReturnValueIfNull(discoveredSignature.Rom.Size, 0));
             dbDict.Add("md5", hash.md5hash);
             dbDict.Add("sha1", hash.sha1hash);
             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);
 
-            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, ""));
@@ -362,7 +461,7 @@ namespace gaseous_server.Classes
 
 			// get metadata
 			IGDB.Models.Platform platform = gaseous_server.Classes.Metadata.Platforms.GetPlatform(rom.PlatformId);
-			IGDB.Models.Game game = gaseous_server.Classes.Metadata.Games.GetGame(rom.GameId, false, false);
+			IGDB.Models.Game game = gaseous_server.Classes.Metadata.Games.GetGame(rom.GameId, false, false, false);
 
 			// build path
 			string platformSlug = "Unknown Platform";
@@ -509,43 +608,46 @@ namespace gaseous_server.Classes
             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++)
+                if (!Common.SkippableFiles.Contains<string>(Path.GetFileName(LibraryFile), StringComparer.OrdinalIgnoreCase))
                 {
-                    long romId = (long)dtRoms.Rows[i]["Id"];
-                    string romPath = (string)dtRoms.Rows[i]["Path"];
-                    string romMd5 = (string)dtRoms.Rows[i]["MD5"];
+                    Common.hashObject LibraryFileHash = new Common.hashObject(LibraryFile);
 
-                    if ((LibraryFile == romPath) || (LibraryFileHash.md5hash == romMd5))
+                    // check if file is in database
+                    bool romFound = false;
+                    for (var i = 0; i < dtRoms.Rows.Count; i++)
                     {
-                        romFound = true;
-                        break;
-                    }
-                }
+                        long romId = (long)dtRoms.Rows[i]["Id"];
+                        string romPath = (string)dtRoms.Rows[i]["Path"];
+                        string romMd5 = (string)dtRoms.Rows[i]["MD5"];
 
-                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();
+                        if ((LibraryFile == romPath) || (LibraryFileHash.md5hash == romMd5))
+                        {
+                            romFound = true;
+                            break;
+                        }
                     }
 
-                    IGDB.Models.Game determinedGame = SearchForGame(sig.Game.Name, sig.Flags.IGDBPlatformId);
+                    if (romFound == false)
+                    {
+                        // file is not in database - process it
+                        Common.hashObject hash = new Common.hashObject(LibraryFile);
+                        FileInfo fi = new FileInfo(LibraryFile);
 
-                    StoreROM(hash, determinedGame, determinedPlatform, sig, 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);
+                    }
                 }
             }
 
@@ -560,24 +662,27 @@ namespace gaseous_server.Classes
                 {
                     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"];
+                    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))
                     {
                         // 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)
+                        if (
+                            romMetadataSource == gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None ||
+                            (int)dtRoms.Rows[i]["MetadataVersion"] == 1
+                        )
                         {
                             Common.hashObject hash = new Common.hashObject
                             {
-                                md5hash = "",
-                                sha1hash = ""
+                                md5hash = (string)dtRoms.Rows[i]["MD5"],
+                                sha1hash = (string)dtRoms.Rows[i]["SHA1"]
                             };
                             FileInfo fi = new FileInfo(romPath);
 
                             Models.Signatures_Games sig = GetFileSignature(hash, fi, romPath);
-                            if (sig.Rom.SignatureSource != Models.Signatures_Games.RomItem.SignatureSourceType.None)
+                            if (sig.Rom.SignatureSource != gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType.None)
                             {
                                 Logging.Log(Logging.LogType.Information, "Library Scan", " Update signature found for " + romPath);
 

gaseous-server/Classes/Metadata/AgeRating.cs

@@ -77,10 +77,17 @@ namespace gaseous_server.Classes.Metadata
                     UpdateSubClasses(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    UpdateSubClasses(returnValue);
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AgeRating>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AgeRating>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs

@@ -75,9 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AgeRatingContentDescription>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AgeRatingContentDescription>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/AlternativeNames.cs

@@ -75,9 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<AlternativeName>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<AlternativeName>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/Artworks.cs

@@ -78,10 +78,17 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
-                    Storage.NewCacheValue(returnValue, true);
-                    forceImageDownload = true;
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Artwork>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Artwork>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/Collections.cs

@@ -75,9 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Collection>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Collection>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/Company.cs

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

gaseous-server/Classes/Metadata/CompanyLogos.cs

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

gaseous-server/Classes/Metadata/Covers.cs

@@ -77,10 +77,18 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
-                    Storage.NewCacheValue(returnValue, true);
-                    forceImageDownload = true;
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                        forceImageDownload = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Cover>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Cover>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/ExternalGames.cs

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

gaseous-server/Classes/Metadata/Franchises.cs

@@ -75,9 +75,17 @@ namespace gaseous_server.Classes.Metadata
                     Storage.NewCacheValue(returnValue);
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Franchise>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Franchise>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/GameModes.cs

@@ -0,0 +1,115 @@
+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
+{
+    public class GameModes
+    {
+        const string fieldList = "fields checksum,created_at,name,slug,updated_at,url;";
+
+        public GameModes()
+        {
+        }
+
+        private static IGDBClient igdb = new IGDBClient(
+                    // Found in Twitch Developer portal for your app
+                    Config.IGDB.ClientId,
+                    Config.IGDB.Secret
+                );
+
+        public static GameMode? GetGame_Modes(long? Id)
+        {
+            if ((Id == 0) || (Id == null))
+            {
+                return null;
+            }
+            else
+            {
+                Task<GameMode> RetVal = _GetGame_Modes(SearchUsing.id, Id);
+                return RetVal.Result;
+            }
+        }
+
+        public static GameMode GetGame_Modes(string Slug)
+        {
+            Task<GameMode> RetVal = _GetGame_Modes(SearchUsing.slug, Slug);
+            return RetVal.Result;
+        }
+
+        private static async Task<GameMode> _GetGame_Modes(SearchUsing searchUsing, object searchValue)
+        {
+            // check database first
+            Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
+            if (searchUsing == SearchUsing.id)
+            {
+                cacheStatus = Storage.GetCacheStatus("GameMode", (long)searchValue);
+            }
+            else
+            {
+                cacheStatus = Storage.GetCacheStatus("GameMode", (string)searchValue);
+            }
+
+            // set up where clause
+            string WhereClause = "";
+            switch (searchUsing)
+            {
+                case SearchUsing.id:
+                    WhereClause = "where id = " + searchValue;
+                    break;
+                case SearchUsing.slug:
+                    WhereClause = "where slug = " + searchValue;
+                    break;
+                default:
+                    throw new Exception("Invalid search type");
+            }
+
+            GameMode returnValue = new GameMode();
+            switch (cacheStatus)
+            {
+                case Storage.CacheStatus.NotPresent:
+                    returnValue = await GetObjectFromServer(WhereClause);
+                    Storage.NewCacheValue(returnValue);
+                    break;
+                case Storage.CacheStatus.Expired:
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<GameMode>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
+                case Storage.CacheStatus.Current:
+                    returnValue = Storage.GetCacheValue<GameMode>(returnValue, "id", (long)searchValue);
+                    break;
+                default:
+                    throw new Exception("How did you get here?");
+            }
+
+            return returnValue;
+        }
+
+        private enum SearchUsing
+        {
+            id,
+            slug
+        }
+
+        private static async Task<GameMode> GetObjectFromServer(string WhereClause)
+        {
+            // get Game_Modes metadata
+            var results = await igdb.QueryAsync<GameMode>(IGDBClient.Endpoints.GameModes, query: fieldList + " " + WhereClause + ";");
+            var result = results.First();
+
+            return result;
+        }
+    }
+}
+

gaseous-server/Classes/Metadata/GameVideos.cs

@@ -68,19 +68,24 @@ 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);
-                    Storage.NewCacheValue(returnValue, true);
-                    forceImageDownload = true;
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<GameVideo>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<GameVideo>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/Games.cs

@@ -21,7 +21,7 @@ namespace gaseous_server.Classes.Metadata
                     Config.IGDB.Secret
                 );
 
-        public static Game? GetGame(long Id, bool followSubGames, bool forceRefresh)
+        public static Game? GetGame(long Id, bool getAllMetadata, bool followSubGames, bool forceRefresh)
         {
             if (Id == 0)
             {
@@ -45,14 +45,14 @@ namespace gaseous_server.Classes.Metadata
             }
             else
             {
-                Task<Game> RetVal = _GetGame(SearchUsing.id, Id, followSubGames, forceRefresh);
+                Task<Game> RetVal = _GetGame(SearchUsing.id, Id, getAllMetadata, followSubGames, forceRefresh);
                 return RetVal.Result;
             }
         }
 
-        public static Game GetGame(string Slug, bool followSubGames, bool forceRefresh)
+        public static Game GetGame(string Slug, bool getAllMetadata, bool followSubGames, bool forceRefresh)
         {
-            Task<Game> RetVal = _GetGame(SearchUsing.slug, Slug, followSubGames, forceRefresh);
+            Task<Game> RetVal = _GetGame(SearchUsing.slug, Slug, getAllMetadata, followSubGames, forceRefresh);
             return RetVal.Result;
         }
 
@@ -61,7 +61,7 @@ namespace gaseous_server.Classes.Metadata
             return Storage.BuildCacheObject<Game>(new Game(), dataRow);
         }
 
-        private static async Task<Game> _GetGame(SearchUsing searchUsing, object searchValue, bool followSubGames = false, bool forceRefresh = false)
+        private static async Task<Game> _GetGame(SearchUsing searchUsing, object searchValue, bool getAllMetadata = true, bool followSubGames = false, bool forceRefresh = false)
         {
             // check database first
             Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
@@ -99,12 +99,19 @@ namespace gaseous_server.Classes.Metadata
                 case Storage.CacheStatus.NotPresent:
                     returnValue = await GetObjectFromServer(WhereClause);
                     Storage.NewCacheValue(returnValue);
-                    UpdateSubClasses(returnValue, followSubGames);
+                    UpdateSubClasses(returnValue, getAllMetadata, followSubGames);
                     return returnValue;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    Storage.NewCacheValue(returnValue, true);
-                    UpdateSubClasses(returnValue, followSubGames);
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
+                    }
                     return returnValue;
                 case Storage.CacheStatus.Current:
                     return Storage.GetCacheValue<Game>(returnValue, "id", (long)searchValue);
@@ -113,117 +120,152 @@ namespace gaseous_server.Classes.Metadata
             }
         }
 
-        private static void UpdateSubClasses(Game Game, bool followSubGames)
+        private static void UpdateSubClasses(Game Game, bool getAllMetadata, bool followSubGames)
         {
-            if (Game.AgeRatings != null)
-            {
-                foreach (long AgeRatingId in Game.AgeRatings.Ids)
-                {
-                    AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
-                }
-            }
-
-            if (Game.AlternativeNames != null)
-            {
-                foreach (long AlternativeNameId in Game.AlternativeNames.Ids)
-                {
-                    AlternativeName GameAlternativeName = AlternativeNames.GetAlternativeNames(AlternativeNameId);
-                }
-            }
-
-            if (Game.Artworks != null)
-            {
-                foreach (long ArtworkId in Game.Artworks.Ids)
-                {
-                    Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
-                }
-            }
-
-            if (followSubGames)
-            {
-                List<long> gamesToFetch = new List<long>();
-                if (Game.Bundles != null) { gamesToFetch.AddRange(Game.Bundles.Ids); }
-                if (Game.Dlcs != null) { gamesToFetch.AddRange(Game.Dlcs.Ids); }
-                if (Game.Expansions != null) { gamesToFetch.AddRange(Game.Expansions.Ids); }
-                if (Game.ParentGame != null) { gamesToFetch.Add((long)Game.ParentGame.Id); }
-                //if (Game.SimilarGames != null) { gamesToFetch.AddRange(Game.SimilarGames.Ids); }
-                if (Game.StandaloneExpansions != null) { gamesToFetch.AddRange(Game.StandaloneExpansions.Ids); }
-                if (Game.VersionParent != null) { gamesToFetch.Add((long)Game.VersionParent.Id); }
-
-                foreach (long gameId in gamesToFetch)
-                {
-                    Game relatedGame = GetGame(gameId, false, false);
-                }
-            }
-
-            if (Game.Collection != null)
-            {
-                Collection GameCollection = Collections.GetCollections(Game.Collection.Id);
-            }
-
             if (Game.Cover != null)
             {
                 Cover GameCover = Covers.GetCover(Game.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
             }
 
-            if (Game.ExternalGames != null)
+            if (getAllMetadata == true)
             {
-                foreach (long ExternalGameId in Game.ExternalGames.Ids)
+                if (Game.AgeRatings != null)
                 {
-                    ExternalGame GameExternalGame = ExternalGames.GetExternalGames(ExternalGameId);
+                    foreach (long AgeRatingId in Game.AgeRatings.Ids)
+                    {
+                        AgeRating GameAgeRating = AgeRatings.GetAgeRatings(AgeRatingId);
+                    }
                 }
-            }
 
-            if (Game.Franchise != null)
-            {
-                Franchise GameFranchise = Franchises.GetFranchises(Game.Franchise.Id);
-            }
-
-            if (Game.Franchises != null)
-            {
-                foreach (long FranchiseId in Game.Franchises.Ids)
+                if (Game.AlternativeNames != null)
                 {
-                    Franchise GameFranchise = Franchises.GetFranchises(FranchiseId);
+                    foreach (long AlternativeNameId in Game.AlternativeNames.Ids)
+                    {
+                        AlternativeName GameAlternativeName = AlternativeNames.GetAlternativeNames(AlternativeNameId);
+                    }
                 }
-            }
 
-            if (Game.Genres != null)
-            {
-                foreach (long GenreId in Game.Genres.Ids)
+                if (Game.Artworks != null)
                 {
-                    Genre GameGenre = Genres.GetGenres(GenreId);
+                    foreach (long ArtworkId in Game.Artworks.Ids)
+                    {
+                        Artwork GameArtwork = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
+                    }
                 }
-            }
 
-            if (Game.InvolvedCompanies != null)
-            {
-                foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
+                if (followSubGames)
                 {
-                    InvolvedCompany involvedCompany = InvolvedCompanies.GetInvolvedCompanies(involvedCompanyId);
+                    List<long> gamesToFetch = new List<long>();
+                    if (Game.Bundles != null) { gamesToFetch.AddRange(Game.Bundles.Ids); }
+                    if (Game.Dlcs != null) { gamesToFetch.AddRange(Game.Dlcs.Ids); }
+                    if (Game.Expansions != null) { gamesToFetch.AddRange(Game.Expansions.Ids); }
+                    if (Game.ParentGame != null) { gamesToFetch.Add((long)Game.ParentGame.Id); }
+                    //if (Game.SimilarGames != null) { gamesToFetch.AddRange(Game.SimilarGames.Ids); }
+                    if (Game.StandaloneExpansions != null) { gamesToFetch.AddRange(Game.StandaloneExpansions.Ids); }
+                    if (Game.VersionParent != null) { gamesToFetch.Add((long)Game.VersionParent.Id); }
+
+                    foreach (long gameId in gamesToFetch)
+                    {
+                        Game relatedGame = GetGame(gameId, false, true, false);
+                    }
                 }
-            }
 
-            if (Game.Platforms != null)
-            {
-                foreach (long PlatformId in Game.Platforms.Ids)
+                if (Game.Collection != null)
                 {
-                    Platform GamePlatform = Platforms.GetPlatform(PlatformId);
+                    Collection GameCollection = Collections.GetCollections(Game.Collection.Id);
                 }
-            }
 
-            if (Game.Screenshots != null)
-            {
-                foreach (long ScreenshotId in Game.Screenshots.Ids)
+                if (Game.ExternalGames != null)
                 {
-                    Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
+                    foreach (long ExternalGameId in Game.ExternalGames.Ids)
+                    {
+                        ExternalGame GameExternalGame = ExternalGames.GetExternalGames(ExternalGameId);
+                    }
                 }
-            }
 
-            if (Game.Videos != null)
-            {
-                foreach (long GameVideoId in Game.Videos.Ids)
+                if (Game.Franchise != null)
                 {
-                    GameVideo gameVideo = GamesVideos.GetGame_Videos(GameVideoId);
+                    Franchise GameFranchise = Franchises.GetFranchises(Game.Franchise.Id);
+                }
+
+                if (Game.Franchises != null)
+                {
+                    foreach (long FranchiseId in Game.Franchises.Ids)
+                    {
+                        Franchise GameFranchise = Franchises.GetFranchises(FranchiseId);
+                    }
+                }
+
+                if (Game.Genres != null)
+                {
+                    foreach (long GenreId in Game.Genres.Ids)
+                    {
+                        Genre GameGenre = Genres.GetGenres(GenreId);
+                    }
+                }
+
+                if (Game.InvolvedCompanies != null)
+                {
+                    foreach (long involvedCompanyId in Game.InvolvedCompanies.Ids)
+                    {
+                        InvolvedCompany involvedCompany = InvolvedCompanies.GetInvolvedCompanies(involvedCompanyId);
+                    }
+                }
+
+                if (Game.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)
+                    {
+                        Platform GamePlatform = Platforms.GetPlatform(PlatformId);
+                    }
+                }
+
+                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)
+                    {
+                        Screenshot GameScreenshot = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(Game));
+                    }
+                }
+
+                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)
+                    {
+                        GameVideo gameVideo = GamesVideos.GetGame_Videos(GameVideoId);
+                    }
                 }
             }
         }

gaseous-server/Classes/Metadata/Genres.cs

@@ -68,19 +68,24 @@ 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);
-                    Storage.NewCacheValue(returnValue, true);
-                    forceImageDownload = true;
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Genre>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Genre>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/InvolvedCompany.cs

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

gaseous-server/Classes/Metadata/MultiplayerModes.cs

@@ -0,0 +1,115 @@
+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
+{
+    public class MultiplayerModes
+    {
+        const string fieldList = "fields campaigncoop,checksum,dropin,game,lancoop,offlinecoop,offlinecoopmax,offlinemax,onlinecoop,onlinecoopmax,onlinemax,platform,splitscreen,splitscreenonline;";
+
+        public MultiplayerModes()
+        {
+        }
+
+        private static IGDBClient igdb = new IGDBClient(
+                    // Found in Twitch Developer portal for your app
+                    Config.IGDB.ClientId,
+                    Config.IGDB.Secret
+                );
+
+        public static MultiplayerMode? GetGame_MultiplayerModes(long? Id)
+        {
+            if ((Id == 0) || (Id == null))
+            {
+                return null;
+            }
+            else
+            {
+                Task<MultiplayerMode> RetVal = _GetGame_MultiplayerModes(SearchUsing.id, Id);
+                return RetVal.Result;
+            }
+        }
+
+        public static MultiplayerMode GetGame_MultiplayerModes(string Slug)
+        {
+            Task<MultiplayerMode> RetVal = _GetGame_MultiplayerModes(SearchUsing.slug, Slug);
+            return RetVal.Result;
+        }
+
+        private static async Task<MultiplayerMode> _GetGame_MultiplayerModes(SearchUsing searchUsing, object searchValue)
+        {
+            // check database first
+            Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
+            if (searchUsing == SearchUsing.id)
+            {
+                cacheStatus = Storage.GetCacheStatus("MultiplayerMode", (long)searchValue);
+            }
+            else
+            {
+                cacheStatus = Storage.GetCacheStatus("MultiplayerMode", (string)searchValue);
+            }
+
+            // set up where clause
+            string WhereClause = "";
+            switch (searchUsing)
+            {
+                case SearchUsing.id:
+                    WhereClause = "where id = " + searchValue;
+                    break;
+                case SearchUsing.slug:
+                    WhereClause = "where slug = " + searchValue;
+                    break;
+                default:
+                    throw new Exception("Invalid search type");
+            }
+
+            MultiplayerMode returnValue = new MultiplayerMode();
+            switch (cacheStatus)
+            {
+                case Storage.CacheStatus.NotPresent:
+                    returnValue = await GetObjectFromServer(WhereClause);
+                    Storage.NewCacheValue(returnValue);
+                    break;
+                case Storage.CacheStatus.Expired:
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<MultiplayerMode>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
+                case Storage.CacheStatus.Current:
+                    returnValue = Storage.GetCacheValue<MultiplayerMode>(returnValue, "id", (long)searchValue);
+                    break;
+                default:
+                    throw new Exception("How did you get here?");
+            }
+
+            return returnValue;
+        }
+
+        private enum SearchUsing
+        {
+            id,
+            slug
+        }
+
+        private static async Task<MultiplayerMode> GetObjectFromServer(string WhereClause)
+        {
+            // get Game_MultiplayerModes metadata
+            var results = await igdb.QueryAsync<MultiplayerMode>(IGDBClient.Endpoints.MultiplayerModes, query: fieldList + " " + WhereClause + ";");
+            var result = results.First();
+
+            return result;
+        }
+    }
+}
+

gaseous-server/Classes/Metadata/PlatformLogos.cs

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

gaseous-server/Classes/Metadata/PlatformVersions.cs

@@ -78,12 +78,17 @@ namespace gaseous_server.Classes.Metadata
                     }
                     return returnValue;
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause);
-                    if (returnValue != null)
+                    try
                     {
+                        returnValue = await GetObjectFromServer(WhereClause);
                         Storage.NewCacheValue(returnValue, true);
                         UpdateSubClasses(ParentPlatform, returnValue);
                     }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<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

@@ -22,7 +22,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 +46,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 +70,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 +96,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);
-                    Storage.NewCacheValue(returnValue, true);
-                    UpdateSubClasses(returnValue);
-                    return returnValue;
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        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 +135,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

@@ -0,0 +1,117 @@
+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
+{
+    public class PlayerPerspectives
+    {
+        const string fieldList = "fields checksum,created_at,name,slug,updated_at,url;";
+
+        public PlayerPerspectives()
+        {
+        }
+
+        private static IGDBClient igdb = new IGDBClient(
+                    // Found in Twitch Developer portal for your app
+                    Config.IGDB.ClientId,
+                    Config.IGDB.Secret
+                );
+
+        public static PlayerPerspective? GetGame_PlayerPerspectives(long? Id)
+        {
+            if ((Id == 0) || (Id == null))
+            {
+                return null;
+            }
+            else
+            {
+                Task<PlayerPerspective> RetVal = _GetGame_PlayerPerspectives(SearchUsing.id, Id);
+                return RetVal.Result;
+            }
+        }
+
+        public static PlayerPerspective GetGame_PlayerPerspectives(string Slug)
+        {
+            Task<PlayerPerspective> RetVal = _GetGame_PlayerPerspectives(SearchUsing.slug, Slug);
+            return RetVal.Result;
+        }
+
+        private static async Task<PlayerPerspective> _GetGame_PlayerPerspectives(SearchUsing searchUsing, object searchValue)
+        {
+            // check database first
+            Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
+            if (searchUsing == SearchUsing.id)
+            {
+                cacheStatus = Storage.GetCacheStatus("PlayerPerspective", (long)searchValue);
+            }
+            else
+            {
+                cacheStatus = Storage.GetCacheStatus("PlayerPerspective", (string)searchValue);
+            }
+
+            // set up where clause
+            string WhereClause = "";
+            switch (searchUsing)
+            {
+                case SearchUsing.id:
+                    WhereClause = "where id = " + searchValue;
+                    break;
+                case SearchUsing.slug:
+                    WhereClause = "where slug = " + searchValue;
+                    break;
+                default:
+                    throw new Exception("Invalid search type");
+            }
+
+            PlayerPerspective returnValue = new PlayerPerspective();
+            bool forceImageDownload = false;
+            switch (cacheStatus)
+            {
+                case Storage.CacheStatus.NotPresent:
+                    returnValue = await GetObjectFromServer(WhereClause);
+                    Storage.NewCacheValue(returnValue);
+                    forceImageDownload = true;
+                    break;
+                case Storage.CacheStatus.Expired:
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<PlayerPerspective>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
+                case Storage.CacheStatus.Current:
+                    returnValue = Storage.GetCacheValue<PlayerPerspective>(returnValue, "id", (long)searchValue);
+                    break;
+                default:
+                    throw new Exception("How did you get here?");
+            }
+
+            return returnValue;
+        }
+
+        private enum SearchUsing
+        {
+            id,
+            slug
+        }
+
+        private static async Task<PlayerPerspective> GetObjectFromServer(string WhereClause)
+        {
+            // get Game_PlayerPerspectives metadata
+            var results = await igdb.QueryAsync<PlayerPerspective>(IGDBClient.Endpoints.PlayerPerspectives, query: fieldList + " " + WhereClause + ";");
+            var result = results.First();
+
+            return result;
+        }
+    }
+}
+

gaseous-server/Classes/Metadata/Screenshots.cs

@@ -78,10 +78,18 @@ namespace gaseous_server.Classes.Metadata
                     forceImageDownload = true;
                     break;  
                 case Storage.CacheStatus.Expired:
-                    returnValue = await GetObjectFromServer(WhereClause, LogoPath);
-                    Storage.NewCacheValue(returnValue, true);
-                    forceImageDownload = true;
-                    break;  
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause, LogoPath);
+                        Storage.NewCacheValue(returnValue, true);
+                        forceImageDownload = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex);
+                        returnValue = Storage.GetCacheValue<Screenshot>(returnValue, "id", (long)searchValue);
+                    }
+                    break;
                 case Storage.CacheStatus.Current:
                     returnValue = Storage.GetCacheValue<Screenshot>(returnValue, "id", (long)searchValue);
                     break;

gaseous-server/Classes/Metadata/Storage.cs

@@ -4,6 +4,7 @@ using System.Reflection;
 using gaseous_tools;
 using IGDB;
 using IGDB.Models;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace gaseous_server.Classes.Metadata
 {
@@ -16,14 +17,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)
@@ -164,6 +183,21 @@ namespace gaseous_server.Classes.Metadata
 		{
             string Endpoint = EndpointType.GetType().Name;
 
+            if (ObjectCache.ContainsKey(Endpoint + SearchValue))
+            {
+                MemoryCacheObject cacheObject = ObjectCache[Endpoint + SearchValue];
+                if (cacheObject.ExpiryTime < DateTime.UtcNow)
+                {
+                    // object has expired, remove it
+                    ObjectCache.Remove(Endpoint + SearchValue);
+                }
+                else
+                {
+                    // object is valid, return it
+                    return (T)cacheObject.Object;
+                }
+            }
+
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
             string sql = "SELECT * FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField;
@@ -181,7 +215,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 +418,35 @@ namespace gaseous_server.Classes.Metadata
 
             return EndpointType;
         }
+
+        private static void CacheClean()
+        {
+            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);
+                }
+            }
+        }
+
+        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

@@ -0,0 +1,117 @@
+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
+{
+    public class Themes
+    {
+        const string fieldList = "fields checksum,created_at,name,slug,updated_at,url;";
+
+        public Themes()
+        {
+        }
+
+        private static IGDBClient igdb = new IGDBClient(
+                    // Found in Twitch Developer portal for your app
+                    Config.IGDB.ClientId,
+                    Config.IGDB.Secret
+                );
+
+        public static Theme? GetGame_Themes(long? Id)
+        {
+            if ((Id == 0) || (Id == null))
+            {
+                return null;
+            }
+            else
+            {
+                Task<Theme> RetVal = _GetGame_Themes(SearchUsing.id, Id);
+                return RetVal.Result;
+            }
+        }
+
+        public static Theme GetGame_Themes(string Slug)
+        {
+            Task<Theme> RetVal = _GetGame_Themes(SearchUsing.slug, Slug);
+            return RetVal.Result;
+        }
+
+        private static async Task<Theme> _GetGame_Themes(SearchUsing searchUsing, object searchValue)
+        {
+            // check database first
+            Storage.CacheStatus? cacheStatus = new Storage.CacheStatus();
+            if (searchUsing == SearchUsing.id)
+            {
+                cacheStatus = Storage.GetCacheStatus("Theme", (long)searchValue);
+            }
+            else
+            {
+                cacheStatus = Storage.GetCacheStatus("Theme", (string)searchValue);
+            }
+
+            // set up where clause
+            string WhereClause = "";
+            switch (searchUsing)
+            {
+                case SearchUsing.id:
+                    WhereClause = "where id = " + searchValue;
+                    break;
+                case SearchUsing.slug:
+                    WhereClause = "where slug = " + searchValue;
+                    break;
+                default:
+                    throw new Exception("Invalid search type");
+            }
+
+            Theme returnValue = new Theme();
+            bool forceImageDownload = false;
+            switch (cacheStatus)
+            {
+                case Storage.CacheStatus.NotPresent:
+                    returnValue = await GetObjectFromServer(WhereClause);
+                    Storage.NewCacheValue(returnValue);
+                    forceImageDownload = true;
+                    break;
+                case Storage.CacheStatus.Expired:
+                    try
+                    {
+                        returnValue = await GetObjectFromServer(WhereClause);
+                        Storage.NewCacheValue(returnValue, true);
+                        return returnValue;
+                    }
+                    catch (Exception ex)
+                    {
+                        gaseous_tools.Logging.Log(gaseous_tools.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;
+                default:
+                    throw new Exception("How did you get here?");
+            }
+
+            return returnValue;
+        }
+
+        private enum SearchUsing
+        {
+            id,
+            slug
+        }
+
+        private static async Task<Theme> GetObjectFromServer(string WhereClause)
+        {
+            // get Game_Themes metadata
+            var results = await igdb.QueryAsync<Theme>(IGDBClient.Endpoints.Themes, query: fieldList + " " + WhereClause + ";");
+            var result = results.First();
+
+            return result;
+        }
+    }
+}
+

gaseous-server/Classes/MetadataManagement.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Data;
+using gaseous_server.Models;
 using gaseous_tools;
 
 namespace gaseous_server.Classes
@@ -9,15 +10,36 @@ namespace gaseous_server.Classes
 		public static void RefreshMetadata(bool forceRefresh = false)
 		{
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT Id, `Name` FROM Game;";
-			DataTable dt = db.ExecuteCMD(sql);
+            string 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)
 			{
 				try
 				{
 					Logging.Log(Logging.LogType.Information, "Metadata Refresh", "Refreshing metadata for game " + dr["name"] + " (" + dr["id"] + ")");
-					Metadata.Games.GetGame((long)dr["id"], true, forceRefresh);
+					Metadata.Games.GetGame((long)dr["id"], true, true, forceRefresh);
 				}
 				catch (Exception ex)
 				{

gaseous-server/Classes/Roms.cs

@@ -6,12 +6,19 @@ namespace gaseous_server.Classes
 {
 	public class Roms
 	{
-		public static List<GameRomItem> GetRoms(long GameId)
+		public static List<GameRomItem> GetRoms(long GameId, long PlatformId = -1)
 		{
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
-            string sql = "SELECT * FROM Games_Roms WHERE GameId = @id ORDER BY `Name`";
-            Dictionary<string, object> dbDict = new Dictionary<string, object>();
+            string sql = "";
+			Dictionary<string, object> dbDict = new Dictionary<string, object>();
             dbDict.Add("id", GameId);
+            
+			if (PlatformId == -1) {
+				sql = "SELECT * FROM Games_Roms WHERE GameId = @id ORDER BY `Name`";
+			} else {
+				sql = "SELECT * FROM Games_Roms WHERE GameId = @id AND PlatformId = @platformid ORDER BY `Name`";
+				dbDict.Add("platformid", PlatformId);
+			}
             DataTable romDT = db.ExecuteCMD(sql, dbDict);
 
             if (romDT.Rows.Count > 0)
@@ -56,7 +63,7 @@ namespace gaseous_server.Classes
 			IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId);
 
 			// ensure metadata for gameid is present
-			IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false);
+			IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
             string sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid WHERE Id = @id";
@@ -88,7 +95,7 @@ namespace gaseous_server.Classes
 
 		private static GameRomItem BuildRom(DataRow romDR)
 		{
-            GameRomItem romItem = new GameRomItem
+			GameRomItem romItem = new GameRomItem
             {
                 Id = (long)romDR["id"],
                 PlatformId = (long)romDR["platformid"],
@@ -96,17 +103,31 @@ namespace gaseous_server.Classes
                 GameId = (long)romDR["gameid"],
                 Name = (string)romDR["name"],
                 Size = (long)romDR["size"],
-                CRC = (string)romDR["crc"],
-                MD5 = (string)romDR["md5"],
-                SHA1 = (string)romDR["sha1"],
+                CRC = ((string)romDR["crc"]).ToLower(),
+                MD5 = ((string)romDR["md5"]).ToLower(),
+                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"], "")
             };
+
+			// check for a web emulator and update the romItem
+			foreach (Models.PlatformMapping.PlatformMapItem platformMapping in Models.PlatformMapping.PlatformMap)
+			{
+				if (platformMapping.IGDBId == romItem.PlatformId)
+				{
+					if (platformMapping.WebEmulator != null)
+					{
+						romItem.Emulator = platformMapping.WebEmulator;
+					}
+				}
+			}
+
             return romItem;
         }
 
@@ -115,7 +136,9 @@ namespace gaseous_server.Classes
 			public long Id { get; set; }
 			public long PlatformId { get; set; }
 			public IGDB.Models.Platform Platform { get; set; }
-			public long GameId { get; set; }
+			//public Dictionary<string, object>? Emulator { get; set; }
+            public Models.PlatformMapping.PlatformMapItem.WebEmulatorItem? Emulator { get; set; }
+            public long GameId { get; set; }
 			public string? Name { get; set; }
 			public long Size { get; set; }
 			public string? CRC { get; set; }
@@ -123,17 +146,13 @@ 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 string? MediaLabel { get; set; }
 			public string? Path { get; set; }
-            public SourceType Source { get; set; }
-
-            public enum SourceType
-            {
-                None = 0,
-                TOSEC = 1
-            }
+            public gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType Source { get; set; }
+			public string? SignatureSourceGameTitle { 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,248 @@
+using System;
+using System.IO;
+using MySql.Data.MySqlClient;
+using gaseous_signature_parser.models.RomSignatureObject;
+using gaseous_tools;
+using MySqlX.XDevAPI;
+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 gaseous_tools.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>();
+                            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", Common.ReturnValueIfNull(Object.Url, ""));
+                            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);
+
+                                            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) VALUES (@gameid, @name, @size, @crc, @md5, @sha1, @developmentstatus, @attributes, @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 - XML", "Invalid import file: " + XMLFile, ex);
+                    }
+                }
+                else
+                {
+                    Logging.Log(Logging.LogType.Debug, "Signature Ingestor - XML", "Rejecting already imported file: " + XMLFile);
+                }
+            }
+        }
+    }
+}

gaseous-server/Controllers/BackgroundTasksController.cs

@@ -25,13 +25,16 @@ namespace gaseous_server.Controllers
         {
             foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)
             {
-                if (TaskType == qi.ItemType)
-                {
-                    if (ForceRun == true)
+                if (qi.AllowManualStart == true)
+                {
+                    if (TaskType == qi.ItemType)
                     {
-                        qi.ForceExecute();
+                        if (ForceRun == true)
+                        {
+                            qi.ForceExecute();
+                        }
+                        return qi;
                     }
-                    return qi;
                 }
             }
 

gaseous-server/Controllers/BiosController.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v1/[controller]")]
+    public class BiosController : Controller
+    {
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public List<Classes.Bios.BiosItem> GetBios()
+        {
+            return Classes.Bios.GetBios();
+        }
+
+        [HttpGet]
+        [Route("{PlatformId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public List<Classes.Bios.BiosItem> GetBios(long PlatformId, bool AvailableOnly = true)
+        {
+            return Classes.Bios.GetBios(PlatformId, AvailableOnly);
+        }
+
+        [HttpGet]
+        [HttpHead]
+        [Route("zip/{PlatformId}")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetBiosCompressed(long PlatformId)
+        {
+            try
+            {
+                IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId);
+
+                string biosPath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryBIOSDirectory, platform.Slug);
+
+                string tempFile = Path.GetTempFileName();
+
+                using (FileStream zipFile = System.IO.File.Create(tempFile))
+                using (var zipArchive = new ZipArchive(zipFile, ZipArchiveMode.Create))
+                {
+                    foreach (string file in Directory.GetFiles(biosPath))
+                    {
+                        zipArchive.CreateEntryFromFile(file, Path.GetFileName(file));
+                    }
+                }
+
+                var stream = new FileStream(tempFile, FileMode.Open);
+                return File(stream, "application/zip", platform.Slug + ".zip");
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpGet]
+        [HttpHead]
+        [Route("{PlatformId}/{BiosName}")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult BiosFile(long PlatformId, string BiosName)
+        {
+            try
+            {
+                foreach (Classes.Bios.BiosItem biosItem in Classes.Bios.GetBios(PlatformId, true))
+                {
+                    if (biosItem.filename == BiosName)
+                    {
+                        if (System.IO.File.Exists(biosItem.biosPath))
+                        {
+                            string filename = Path.GetFileName(biosItem.biosPath);
+                            string filepath = biosItem.biosPath;
+                            byte[] filedata = System.IO.File.ReadAllBytes(filepath);
+                            string contentType = "application/octet-stream";
+
+                            var cd = new System.Net.Mime.ContentDisposition
+                            {
+                                FileName = filename,
+                                Inline = false,
+                            };
+
+                            Response.Headers.Add("Content-Disposition", cd.ToString());
+                            Response.Headers.Add("Cache-Control", "public, max-age=604800");
+
+                            return File(filedata, contentType);
+                        }
+                        else
+                        {
+                            return NotFound();
+                        }
+                    }
+                }
+
+                return NotFound();
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+    }
+}
+

gaseous-server/Controllers/CollectionsController.cs

@@ -0,0 +1,228 @@
+using System;
+using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+using gaseous_server.Classes;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v1/[controller]")]
+    public class CollectionsController : Controller
+    {
+        /// <summary>
+        /// Gets all ROM collections
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public List<Classes.Collections.CollectionItem> GetCollections()
+        {
+            return Classes.Collections.GetCollections();
+        }
+
+        /// <summary>
+        /// Gets a specific ROM collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <param name="Build">Set to true to begin the collection build process</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("{CollectionId}")]
+        [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetCollection(long CollectionId, bool Build = false)
+        {
+            try
+            {
+                if (Build == true)
+                {
+                    Classes.Collections.StartCollectionItemBuild(CollectionId);
+                }
+
+                return Ok(Classes.Collections.GetCollection(CollectionId));
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Gets the contents of the specified ROM collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("{CollectionId}/Roms")]
+        [ProducesResponseType(typeof(List<Classes.Collections.CollectionContents.CollectionPlatformItem>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetCollectionRoms(long CollectionId)
+        {
+            try
+            {
+                Classes.Collections.CollectionItem collectionItem = Classes.Collections.GetCollection(CollectionId);
+                return Ok(Classes.Collections.GetCollectionContent(collectionItem));
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Gets a preview of the provided collection item
+        /// </summary>
+        /// <param name="Item"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Preview")]
+        [ProducesResponseType(typeof(List<Classes.Collections.CollectionContents.CollectionPlatformItem>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetCollectionRomsPreview(Classes.Collections.CollectionItem Item)
+        {
+            try
+            {
+                return Ok(Classes.Collections.GetCollectionContent(Item));
+            }
+            catch (Exception ex)
+            {
+               return NotFound(ex);
+            }
+        }
+
+        /// <summary>
+        /// Gets ROM collection in zip format
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("{CollectionId}/Roms/Zip")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GetCollectionRomsZip(long CollectionId)
+        {
+            try
+            {
+                Classes.Collections.CollectionItem collectionItem = Classes.Collections.GetCollection(CollectionId);
+
+                string ZipFilePath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryCollectionsDirectory, CollectionId + ".zip");
+
+                if (System.IO.File.Exists(ZipFilePath))
+                {
+                    var stream = new FileStream(ZipFilePath, FileMode.Open);
+                    return File(stream, "application/zip", collectionItem.Name + ".zip");
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Creates a new ROM collection
+        /// </summary>
+        /// <param name="Item"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        public ActionResult NewCollection(Classes.Collections.CollectionItem Item)
+        {
+            try
+            {
+                return Ok(Classes.Collections.NewCollection(Item));
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex);
+            }
+        }
+
+        /// <summary>
+        /// Edits an existing collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <param name="Item"></param>
+        /// <returns></returns>
+        [HttpPatch]
+        [Route("{CollectionId}")]
+        [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, true));
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Edits an existing collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        /// <param name="Item"></param>
+        /// <returns></returns>
+        [HttpPatch]
+        [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
+            {
+                return NotFound();
+            }
+        }
+
+        /// <summary>
+        /// Deletes the specified ROM collection
+        /// </summary>
+        /// <param name="CollectionId"></param>
+        [HttpDelete]
+        [Route("{CollectionId}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult DeleteCollection(long CollectionId)
+        {
+            try
+            {
+                Classes.Collections.DeleteCollection(CollectionId);
+                return Ok();
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+    }
+}

gaseous-server/Controllers/FilterController.cs

@@ -45,6 +45,39 @@ namespace gaseous_server.Controllers
             }
             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/GamesController.cs

@@ -1,29 +1,53 @@
-using System;
+using System;
 using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
-using System.Linq;
+using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using gaseous_server.Classes.Metadata;
 using gaseous_tools;
 using IGDB.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+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]")]
-    [ApiController]
-    public class GamesController : ControllerBase
-    {
-        [HttpGet]
-        [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
-        public ActionResult Game(string name = "", string platform = "", string genre = "", bool sortdescending = false)
+namespace gaseous_server.Controllers
+{
+    [Route("api/v1/[controller]")]
+    [ApiController]
+    public class GamesController : ControllerBase
+    {
+        [HttpGet]
+        [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
+        public ActionResult Game(
+            string name = "",
+            string platform = "",
+            string genre = "",
+            string gamemode = "",
+            string playerperspective = "",
+            string theme = "",
+            int minrating = -1,
+            int maxrating = -1,
+            bool sortdescending = false)
+            {
+
+            return Ok(GetGames(name, platform, genre, gamemode, playerperspective, theme, minrating, maxrating, sortdescending));
+        }
+
+        public static List<Game> GetGames(
+            string name = "",
+            string platform = "",
+            string genre = "",
+            string gamemode = "",
+            string playerperspective = "",
+            string theme = "",
+            int minrating = -1,
+            int maxrating = -1,
+            bool sortdescending = false)
         {
             string whereClause = "";
             string havingClause = "";
@@ -41,6 +65,20 @@ namespace gaseous_server.Controllers
                 havingClauses.Add(tempVal);
             }
 
+            if (minrating != -1)
+            {
+                string ratingTempMinVal = "totalRating >= @totalMinRating";
+                whereParams.Add("@totalMinRating", minrating);
+                havingClauses.Add(ratingTempMinVal);
+            }
+
+            if (maxrating != -1)
+            {
+                string ratingTempMaxVal = "totalRating <= @totalMaxRating";
+                whereParams.Add("@totalMaxRating", maxrating);
+                havingClauses.Add(ratingTempMaxVal);
+            }
+
             if (platform.Length > 0)
             {
                 tempVal = "Games_Roms.PlatformId IN (";
@@ -77,6 +115,60 @@ namespace gaseous_server.Controllers
                 whereClauses.Add(tempVal);
             }
 
+            if (gamemode.Length > 0)
+            {
+                tempVal = "(";
+                string[] gameModeClauseItems = gamemode.Split(",");
+                for (int i = 0; i < gameModeClauseItems.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string gameModeLabel = "@GameMode" + i;
+                    tempVal += "JSON_CONTAINS(Game.GameModes, " + gameModeLabel + ", '$')";
+                    whereParams.Add(gameModeLabel, gameModeClauseItems[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (playerperspective.Length > 0)
+            {
+                tempVal = "(";
+                string[] playerPerspectiveClauseItems = playerperspective.Split(",");
+                for (int i = 0; i < playerPerspectiveClauseItems.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string playerPerspectiveLabel = "@PlayerPerspective" + i;
+                    tempVal += "JSON_CONTAINS(Game.PlayerPerspectives, " + playerPerspectiveLabel + ", '$')";
+                    whereParams.Add(playerPerspectiveLabel, playerPerspectiveClauseItems[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
+            if (theme.Length > 0)
+            {
+                tempVal = "(";
+                string[] themeClauseItems = theme.Split(",");
+                for (int i = 0; i < themeClauseItems.Length; i++)
+                {
+                    if (i > 0)
+                    {
+                        tempVal += " AND ";
+                    }
+                    string themeLabel = "@Theme" + i;
+                    tempVal += "JSON_CONTAINS(Game.Themes, " + themeLabel + ", '$')";
+                    whereParams.Add(themeLabel, themeClauseItems[i]);
+                }
+                tempVal += ")";
+                whereClauses.Add(tempVal);
+            }
+
             // build where clause
             if (whereClauses.Count > 0)
             {
@@ -124,19 +216,19 @@ namespace gaseous_server.Controllers
                 RetVal.Add(Classes.Metadata.Games.GetGame(dr));
             }
 
-            return Ok(RetVal);
-        }
-
-        [HttpGet]
-        [Route("{GameId}")]
-        [ProducesResponseType(typeof(Game), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "5Minute")]
+            return RetVal;
+        }
+
+        [HttpGet]
+        [Route("{GameId}")]
+        [ProducesResponseType(typeof(Game), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "5Minute")]
         public ActionResult Game(long GameId, bool forceRefresh = false)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, forceRefresh);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, forceRefresh, false, forceRefresh);
 
                 if (gameObject != null)
                 {
@@ -151,18 +243,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/alternativename")]
-        [ProducesResponseType(typeof(List<AlternativeName>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/alternativename")]
+        [ProducesResponseType(typeof(List<AlternativeName>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameAlternativeNames(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 if (gameObject.AlternativeNames != null)
                 {
@@ -182,18 +274,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/agerating")]
-        [ProducesResponseType(typeof(List<AgeRatings.GameAgeRating>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/agerating")]
+        [ProducesResponseType(typeof(List<AgeRatings.GameAgeRating>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameAgeClassification(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 if (gameObject.AgeRatings != null)
                 {
@@ -213,12 +305,12 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/agerating/{RatingId}/image")]
-        [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/agerating/{RatingId}/image")]
+        [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameAgeClassification(long GameId, long RatingId)
         {
             try
@@ -292,18 +384,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/artwork")]
-        [ProducesResponseType(typeof(List<Artwork>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/artwork")]
+        [ProducesResponseType(typeof(List<Artwork>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameArtwork(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 List<Artwork> artworks = new List<Artwork>();
                 if (gameObject.Artworks != null)
@@ -321,18 +413,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/artwork/{ArtworkId}")]
-        [ProducesResponseType(typeof(Artwork), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/artwork/{ArtworkId}")]
+        [ProducesResponseType(typeof(Artwork), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameArtwork(long GameId, long ArtworkId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 try
                 {
@@ -355,17 +447,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/artwork/{ArtworkId}/image")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/artwork/{ArtworkId}/image")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameCoverImage(long GameId, long ArtworkId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 try
                 {
@@ -409,18 +501,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/cover")]
-        [ProducesResponseType(typeof(Cover), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/cover")]
+        [ProducesResponseType(typeof(Cover), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameCover(long GameId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
                 if (gameObject != null)
                 {
                     IGDB.Models.Cover coverObject = Covers.GetCover(gameObject.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
@@ -442,17 +534,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/cover/image")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/cover/image")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameCoverImage(long GameId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Cover.png");
                 if (System.IO.File.Exists(coverFilePath)) {
@@ -481,18 +573,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/genre")]
-        [ProducesResponseType(typeof(List<Genre>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/genre")]
+        [ProducesResponseType(typeof(List<Genre>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameGenre(long GameId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
                 if (gameObject != null)
                 {
                     List<IGDB.Models.Genre> genreObjects = new List<Genre>();
@@ -517,18 +609,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/companies")]
-        [ProducesResponseType(typeof(List<Dictionary<string, object>>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/companies")]
+        [ProducesResponseType(typeof(List<Dictionary<string, object>>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameInvolvedCompanies(long GameId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
                 if (gameObject != null)
                 {
                     List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
@@ -560,18 +652,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/companies/{CompanyId}")]
-        [ProducesResponseType(typeof(Dictionary<string, object>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/companies/{CompanyId}")]
+        [ProducesResponseType(typeof(Dictionary<string, object>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameInvolvedCompanies(long GameId, long CompanyId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
                 if (gameObject != null)
                 {
                     List<Dictionary<string, object>> icObjects = new List<Dictionary<string, object>>();
@@ -601,17 +693,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/companies/{CompanyId}/image")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/companies/{CompanyId}/image")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameCompanyImage(long GameId, long CompanyId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 InvolvedCompany involvedCompany = Classes.Metadata.InvolvedCompanies.GetInvolvedCompanies(CompanyId);
                 Company company = Classes.Metadata.Companies.GetCompanies(involvedCompany.Company.Id);
@@ -644,18 +736,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/roms")]
-        [ProducesResponseType(typeof(List<Classes.Roms.GameRomItem>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        //[ResponseCache(CacheProfileName = "5Minute")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/roms")]
+        [ProducesResponseType(typeof(List<Classes.Roms.GameRomItem>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        //[ResponseCache(CacheProfileName = "5Minute")]
         public ActionResult GameRom(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 List<Classes.Roms.GameRomItem> roms = Classes.Roms.GetRoms(GameId);
 
@@ -665,18 +757,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/roms/{RomId}")]
-        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/roms/{RomId}")]
+        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        //[ResponseCache(CacheProfileName = "5Minute")]
+        //[ResponseCache(CacheProfileName = "5Minute")]
         public ActionResult GameRom(long GameId, long RomId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
                 if (rom.GameId == GameId)
@@ -692,17 +784,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpPatch]
-        [Route("{GameId}/roms/{RomId}")]
-        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpPatch]
+        [Route("{GameId}/roms/{RomId}")]
+        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameRomRename(long GameId, long RomId, long NewPlatformId, long NewGameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
                 if (rom.GameId == GameId)
@@ -719,17 +811,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpDelete]
-        [Route("{GameId}/roms/{RomId}")]
-        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpDelete]
+        [Route("{GameId}/roms/{RomId}")]
+        [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameRomDelete(long GameId, long RomId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
                 if (rom.GameId == GameId)
@@ -746,17 +838,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/roms/{RomId}/file")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [HttpHead]
+        [Route("{GameId}/roms/{RomId}/file")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameRomFile(long GameId, long RomId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
                 if (rom.GameId != GameId)
@@ -767,21 +860,9 @@ namespace gaseous_server.Controllers
                 string romFilePath = rom.Path;
                 if (System.IO.File.Exists(romFilePath))
                 {
-                    string filename = Path.GetFileName(romFilePath);
-                    string filepath = romFilePath;
-                    byte[] filedata = System.IO.File.ReadAllBytes(filepath);
-                    string contentType = "application/octet-stream";
-
-                    var cd = new System.Net.Mime.ContentDisposition
-                    {
-                        FileName = filename,
-                        Inline = false,
-                    };
-
-                    Response.Headers.Add("Content-Disposition", cd.ToString());
-                    Response.Headers.Add("Cache-Control", "public, max-age=604800");
-
-                    return File(filedata, contentType);
+                    FileStream content = new FileStream(romFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    FileStreamResult response = File(content, "application/octet-stream", rom.Name);
+                    return response;
                 }
                 else
                 {
@@ -792,12 +873,47 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("search")]
-        [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [HttpHead]
+        [Route("{GameId}/roms/{RomId}/{FileName}")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult GameRomFile(long GameId, long RomId, string FileName)
+        {
+            try
+            {
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
+
+                Classes.Roms.GameRomItem rom = Classes.Roms.GetRom(RomId);
+                if (rom.GameId != GameId || rom.Name != FileName)
+                {
+                    return NotFound();
+                }
+
+                string romFilePath = rom.Path;
+                if (System.IO.File.Exists(romFilePath))
+                {
+                    FileStream content = new FileStream(romFilePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+                    FileStreamResult response = File(content, "application/octet-stream", rom.Name);
+                    return response;
+                }
+                else
+                {
+                    return NotFound();
+                }
+            }
+            catch
+            {
+                return NotFound();
+            }
+        }
+
+        [HttpGet]
+        [Route("search")]
+        [ProducesResponseType(typeof(List<Game>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameSearch(long RomId = 0, string SearchString = "")
         {
             try
@@ -829,18 +945,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/screenshots")]
-        [ProducesResponseType(typeof(List<Screenshot>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/screenshots")]
+        [ProducesResponseType(typeof(List<Screenshot>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameScreenshot(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 List<Screenshot> screenshots = new List<Screenshot>();
                 if (gameObject.Screenshots != null)
@@ -858,18 +974,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/screenshots/{ScreenshotId}")]
-        [ProducesResponseType(typeof(Screenshot), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/screenshots/{ScreenshotId}")]
+        [ProducesResponseType(typeof(Screenshot), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameScreenshot(long GameId, long ScreenshotId)
         {
             try
             { 
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
                 if (gameObject != null) { 
                     IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
                     if (screenshotObject != null)
@@ -890,17 +1006,17 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/screenshots/{ScreenshotId}/image")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/screenshots/{ScreenshotId}/image")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
         public ActionResult GameScreenshotImage(long GameId, long ScreenshotId)
         {
             try
             {
-                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                IGDB.Models.Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
 
@@ -932,18 +1048,18 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-
-        [HttpGet]
-        [Route("{GameId}/videos")]
-        [ProducesResponseType(typeof(List<GameVideo>), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ResponseCache(CacheProfileName = "7Days")]
+        }
+
+        [HttpGet]
+        [Route("{GameId}/videos")]
+        [ProducesResponseType(typeof(List<GameVideo>), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ResponseCache(CacheProfileName = "7Days")]
         public ActionResult GameVideo(long GameId)
         {
             try
             {
-                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false);
+                Game gameObject = Classes.Metadata.Games.GetGame(GameId, false, false, false);
 
                 List<GameVideo> videos = new List<GameVideo>();
                 if (gameObject.Videos != null)
@@ -961,6 +1077,6 @@ namespace gaseous_server.Controllers
             {
                 return NotFound();
             }
-        }
-    }
-}
+        }
+    }
+}

gaseous-server/Controllers/LogsController.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using gaseous_tools;
+using Microsoft.AspNetCore.Mvc;
+
+namespace gaseous_server.Controllers
+{
+    [ApiController]
+    [Route("api/v1/[controller]")]
+    public class LogsController : Controller
+    {
+        [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/PlatformMapsController.cs

@@ -0,0 +1,166 @@
+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_tools;
+using IGDB.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.Scripting;
+
+namespace gaseous_server.Controllers
+{
+    [Route("api/v1/[controller]")]
+    [ApiController]
+    public class PlatformMapsController : Controller
+    {
+        [HttpGet]
+        [ProducesResponseType(typeof(List<PlatformMapping.PlatformMapItem>), StatusCodes.Status200OK)]
+        public ActionResult GetPlatformMap(bool ResetToDefault = false)
+        {
+            if (ResetToDefault == true)
+            {
+                PlatformMapping.ExtractPlatformMap(true);
+            }
+
+            return Ok(PlatformMapping.PlatformMap);
+        }
+
+        [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();
+            }
+        }
+
+        [HttpPost]
+        [ProducesResponseType(typeof(List<IFormFile>), StatusCodes.Status200OK)]
+        [RequestSizeLimit(long.MaxValue)]
+        [DisableRequestSizeLimit, RequestFormLimits(MultipartBodyLengthLimit = long.MaxValue, ValueLengthLimit = int.MaxValue)]
+        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 });
+        }
+
+        // [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();
+        //     }
+        // }
+
+        [HttpPatch]
+        [Route("{PlatformId}")]
+        [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        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/PlatformsController.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using gaseous_server.Classes.Metadata;
+using gaseous_server.Models;
 using gaseous_tools;
 using IGDB.Models;
 using Microsoft.AspNetCore.Http;
@@ -21,6 +22,11 @@ namespace gaseous_server.Controllers
         [HttpGet]
         [ProducesResponseType(typeof(List<Platform>), StatusCodes.Status200OK)]
         public ActionResult Platform()
+        {
+            return Ok(PlatformsController.GetPlatforms());
+        }
+
+        public static List<Platform> GetPlatforms()
         {
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
@@ -34,7 +40,7 @@ namespace gaseous_server.Controllers
                 RetVal.Add(Classes.Metadata.Platforms.GetPlatform((long)dr["id"]));
             }
 
-            return Ok(RetVal);
+            return RetVal;
         }
 
         [HttpGet]

gaseous-server/Controllers/RomsController.cs

@@ -0,0 +1,85 @@
+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.Metadata;
+using gaseous_tools;
+using IGDB.Models;
+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]")]
+    [ApiController]
+    public class RomsController : ControllerBase
+    {
+        [HttpPost]
+        [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, long? OverridePlatformId = null)
+        {
+            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);
+                    }
+                }
+            }
+
+            // get override platform if specified
+            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"], OverridePlatform, false);
+            }
+
+            if (Directory.Exists(workPath))
+            {
+                Directory.Delete(workPath, true);
+            }
+
+            return Ok(new { count = files.Count, size });
+        }
+    }
+}

gaseous-server/Controllers/SignaturesController.cs

@@ -55,7 +55,7 @@ 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);
-            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 +88,14 @@ namespace gaseous_server.Controllers
                         Name = (string)sigDbRow["romname"],
                         Size = (Int64)sigDbRow["Size"],
                         Crc = (string)sigDbRow["CRC"],
-                        Md5 = (string)sigDbRow["MD5"],
-                        Sha1 = (string)sigDbRow["SHA1"],
+                        Md5 = ((string)sigDbRow["MD5"]).ToLower(),
+                        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"],
                         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/SystemController.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
+using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using gaseous_tools;
 using Microsoft.AspNetCore.Mvc;
@@ -14,35 +16,97 @@ namespace gaseous_server.Controllers
     {
         [HttpGet]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public Dictionary<string, object> GetSystemStatus()
+        public SystemInfo GetSystemStatus()
         {
             Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
 
-            Dictionary<string, object> ReturnValue = new Dictionary<string, object>();
+            SystemInfo ReturnValue = new SystemInfo();
 
             // disk size
-            List<Dictionary<string, object>> Disks = new List<Dictionary<string, object>>();
+            List<SystemInfo.PathItem> Disks = new List<SystemInfo.PathItem>();
             //Disks.Add(GetDisk(gaseous_tools.Config.ConfigurationPath));
             Disks.Add(GetDisk(gaseous_tools.Config.LibraryConfiguration.LibraryRootDirectory));
-            ReturnValue.Add("Paths", Disks);
+            ReturnValue.Paths = Disks;
 
             // database size
             string sql = "SELECT table_schema, SUM(data_length + index_length) FROM information_schema.tables WHERE table_schema = '" + Config.DatabaseConfiguration.DatabaseName + "'";
             DataTable dbResponse = db.ExecuteCMD(sql);
-            ReturnValue.Add("DatabaseSize", dbResponse.Rows[0][1]);
+            ReturnValue.DatabaseSize = (long)(System.Decimal)dbResponse.Rows[0][1];
+
+            // platform statistics
+            sql = "SELECT Platform.`name`, grc.Count, grs.Size FROM Platform INNER JOIN (SELECT Platform.`name` AS `Name`, SUM(grs.Size) AS Size FROM Platform JOIN Games_Roms AS grs ON (grs.PlatformId = Platform.Id) GROUP BY Platform.`name`) grs ON (grs.`Name` = Platform.`name`) INNER JOIN (SELECT Platform.`name` AS `Name`, COUNT(grc.Size) AS Count FROM Platform JOIN Games_Roms AS grc ON (grc.PlatformId = Platform.Id) GROUP BY Platform.`name`) grc ON (grc.`Name` = Platform.`name`) ORDER BY Platform.`name`;";
+            dbResponse = db.ExecuteCMD(sql);
+            ReturnValue.PlatformStatistics = new List<SystemInfo.PlatformStatisticsItem>();
+            foreach (DataRow dr in dbResponse.Rows)
+            {
+                SystemInfo.PlatformStatisticsItem platformStatisticsItem = new SystemInfo.PlatformStatisticsItem
+                {
+                    Platform = (string)dr["name"],
+                    RomCount = (long)dr["Count"],
+                    TotalSize = (long)(System.Decimal)dr["Size"]
+                };
+                ReturnValue.PlatformStatistics.Add(platformStatisticsItem);
+            }
 
             return ReturnValue;
         }
 
-        private Dictionary<string, object> GetDisk(string Path)
-        {
-            Dictionary<string, object> DiskValues = new Dictionary<string, object>();
-            DiskValues.Add("LibraryPath", Path);
-            DiskValues.Add("SpaceUsed", gaseous_tools.Common.DirSize(new DirectoryInfo(Path)));
-            DiskValues.Add("SpaceAvailable", new DriveInfo(Path).AvailableFreeSpace);
-            DiskValues.Add("TotalSpace", new DriveInfo(Path).TotalSize);
+        [HttpGet]
+        [Route("Version")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public Version GetSystemVersion() {
+            return Assembly.GetExecutingAssembly().GetName().Version;
+        }
 
-            return DiskValues;
+        [HttpGet]
+        [Route("VersionFile")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public FileContentResult GetSystemVersionAsFile() {
+            Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+            string ver = "var AppVersion = \"" + Assembly.GetExecutingAssembly().GetName().Version.ToString() + "\";" + Environment.NewLine +
+                "var DBSchemaVersion = \"" + db.GetDatabaseSchemaVersion() + "\";";
+            byte[] bytes = Encoding.UTF8.GetBytes(ver);
+            return File(bytes, "text/javascript");
+        }
+
+        private SystemInfo.PathItem GetDisk(string Path)
+        {
+            SystemInfo.PathItem pathItem = new SystemInfo.PathItem {
+                LibraryPath = Path,
+                SpaceUsed = gaseous_tools.Common.DirSize(new DirectoryInfo(Path)),
+                SpaceAvailable = new DriveInfo(Path).AvailableFreeSpace,
+                TotalSpace = new DriveInfo(Path).TotalSize
+            };
+
+            return pathItem;
+        }
+
+        public class SystemInfo
+        {
+            public Version ApplicationVersion { 
+                get
+                    {
+                        return Assembly.GetExecutingAssembly().GetName().Version;
+                    }
+            }
+            public List<PathItem>? Paths { get; set; }
+            public long DatabaseSize { get; set; }
+            public List<PlatformStatisticsItem>? PlatformStatistics { get; set; }
+
+            public class PathItem
+            {
+                public string LibraryPath { get; set; }
+                public long SpaceUsed { get; set; }
+                public long SpaceAvailable { get; set; }
+                public long TotalSpace { get; set; }
+            }
+
+            public class PlatformStatisticsItem
+            {
+                public string Platform { get; set; }
+                public long RomCount { get; set; }
+                public long TotalSize { get; set; }
+            }
         }
     }
 }

gaseous-server/Models/PlatformMapping.cs

@@ -1,54 +1,379 @@
 using System;
+using System.Collections;
+using System.Data;
+using System.Linq;
 using System.Reflection;
+using System.Text.Json.Serialization;
+using gaseous_server.Classes;
+using gaseous_server.Classes.Metadata;
+using gaseous_server.Controllers;
+using gaseous_tools;
+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);
+                    }
+                }
+            }
         }
 
-        private static List<PlatformMapItem> _PlatformMaps = new List<PlatformMapItem>();
+        /// <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)
+            {
+                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);
+                }
+            }
+        }
+        
         public static List<PlatformMapItem> PlatformMap
         {
             get
             {
-                if (_PlatformMaps.Count == 0)
+                Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+                string sql = "SELECT * FROM PlatformMap";
+                DataTable data = db.ExecuteCMD(sql);
+
+                List<PlatformMapItem> platformMaps = new List<PlatformMapItem>();
+                foreach (DataRow row in data.Rows)
                 {
-                    // load platform maps from: gaseous_server.Support.PlatformMap.json
-                    var assembly = Assembly.GetExecutingAssembly();
-                    var resourceName = "gaseous_server.Support.PlatformMap.json";
-                    using (Stream stream = assembly.GetManifestResourceStream(resourceName))
-                    using (StreamReader reader = new StreamReader(stream))
+                    long mapId = (long)row["Id"];
+                    if (PlatformMapCache.ContainsKey(mapId.ToString()))
                     {
-                        string rawJson = reader.ReadToEnd();
-                        _PlatformMaps.Clear();
-                        _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 gaseous_tools.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 gaseous_tools.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", 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 gaseous_tools.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; }
-                    }
-                    Signature.Flags.IGDBPlatformId = PlatformMapping.IGDBId;
-                    Signature.Flags.IGDBPlatformName = PlatformMapping.IGDBName;
+                        if (SetSystemName == true)
+                        {
+                            if (Signature.Game != null) { Signature.Game.System = PlatformMapping.IGDBName; }
+                        }
+                        Signature.Flags.IGDBPlatformId = PlatformMapping.IGDBId;
+                        Signature.Flags.IGDBPlatformName = PlatformMapping.IGDBName;
 
-                    PlatformFound = true;
-                    break;
+                        PlatformFound = true;
+                        break;
+                    }
                 }
             }
 
@@ -56,7 +381,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)
                         {
@@ -73,11 +401,52 @@ 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 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<AvailableWebEmulatorItem> AvailableWebEmulators { get; set; } = new List<AvailableWebEmulatorItem>();
+
+                public class AvailableWebEmulatorItem
+                {
+                    public string EmulatorType { get; set; }
+                    public List<AvailableWebEmulatorCoreItem> AvailableWebEmulatorCores { get; set; } = new List<AvailableWebEmulatorCoreItem>();
+
+                    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,5 @@
 using System;
 using System.Text.Json.Serialization;
-using static gaseous_romsignatureobject.RomSignatureObject.Game;
 
 namespace gaseous_server.Models
 {
@@ -127,19 +126,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 string? RomTypeMedia { get; set; }
             public string? MediaLabel { get; set; }
 
-            public SignatureSourceType SignatureSource { get; set; }
-
-            public enum SignatureSourceType
-            {
-                None = 0,
-                TOSEC = 1
-            }
+            public gaseous_signature_parser.models.RomSignatureObject.RomSignatureObject.Game.Rom.SignatureSourceType SignatureSource { get; set; }
 
             public enum RomTypes
             {
@@ -198,6 +191,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>))
@@ -236,7 +230,7 @@ namespace gaseous_server.Models
 
         public class SignatureFlags
         {
-            public int IGDBPlatformId { get; set; }
+            public long IGDBPlatformId { get; set; }
             public string IGDBPlatformName { get; set; }
         }
     }

gaseous-server/ProcessQueue.cs

@@ -9,31 +9,52 @@ namespace gaseous_server
 
         public class QueueItem
         {
-            public QueueItem(QueueItemType ItemType, int ExecutionInterval)
+            public QueueItem(QueueItemType ItemType, int ExecutionInterval, bool AllowManualStart = true, bool RemoveWhenStopped = false)
             {
                 _ItemType = ItemType;
                 _ItemState = QueueItemState.NeverStarted;
-                _LastRunTime = DateTime.UtcNow.AddMinutes(ExecutionInterval);
+                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ")));
                 _Interval = ExecutionInterval;
+                _AllowManualStart = AllowManualStart;
+                _RemoveWhenStopped = RemoveWhenStopped;
             }
 
-            public QueueItem(QueueItemType ItemType, int ExecutionInterval, List<QueueItemType> Blocks)
+            public QueueItem(QueueItemType ItemType, int ExecutionInterval, List<QueueItemType> Blocks, bool AllowManualStart = true, bool RemoveWhenStopped = false)
             {
                 _ItemType = ItemType;
                 _ItemState = QueueItemState.NeverStarted;
-                _LastRunTime = DateTime.UtcNow.AddMinutes(ExecutionInterval);
+                _LastRunTime = DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ")));
                 _Interval = ExecutionInterval;
+                _AllowManualStart = AllowManualStart;
+                _RemoveWhenStopped = RemoveWhenStopped;
                 _Blocks = Blocks;
             }
 
             private QueueItemType _ItemType = QueueItemType.NotConfigured;
             private QueueItemState _ItemState = QueueItemState.NeverStarted;
             private DateTime _LastRunTime = DateTime.UtcNow;
-            private DateTime _LastFinishTime = DateTime.UtcNow;
+            private DateTime _LastFinishTime
+            {
+                get
+                {
+                    return DateTime.Parse(Config.ReadSetting("LastRun_" + _ItemType.ToString(), DateTime.UtcNow.ToString("yyyy-MM-ddThh:mm:ssZ")));
+                }
+                set
+                {
+                    if (_SaveLastRunTime == true)
+                    {
+                        Config.SetSetting("LastRun_" + _ItemType.ToString(), value.ToString("yyyy-MM-ddThh:mm:ssZ"));
+                    }
+                }
+            }
+            private bool _SaveLastRunTime = false;
             private int _Interval = 0;
             private string _LastResult = "";
             private string? _LastError = null;
             private bool _ForceExecute = false;
+            private bool _AllowManualStart = true;
+            private bool _RemoveWhenStopped = false;
+            private bool _IsBlocked = false;
             private List<QueueItemType> _Blocks = new List<QueueItemType>();
 
             public QueueItemType ItemType => _ItemType;
@@ -50,6 +71,10 @@ namespace gaseous_server
             public string LastResult => _LastResult;
             public string? LastError => _LastError;
             public bool Force => _ForceExecute;
+            public bool AllowManualStart => _AllowManualStart;
+            public bool RemoveWhenStopped => _RemoveWhenStopped;
+            public bool IsBlocked => _IsBlocked;
+            public object? Options { get; set; } = null;
             public List<QueueItemType> Blocks => _Blocks;
 
             public void Execute()
@@ -64,36 +89,69 @@ namespace gaseous_server
                         _LastResult = "";
                         _LastError = null;
 
-                        Logging.Log(Logging.LogType.Information, "Timered Event", "Executing " + _ItemType);
+                        Logging.Log(Logging.LogType.Debug, "Timered Event", "Executing " + _ItemType);
 
                         try
                         {
                             switch (_ItemType)
                             {
                                 case QueueItemType.SignatureIngestor:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Signature Ingestor");
-                                    SignatureIngestors.TOSEC.TOSECIngestor tIngest = new SignatureIngestors.TOSEC.TOSECIngestor();
-                                    tIngest.Import(Config.LibraryConfiguration.LibrarySignatureImportDirectory_TOSEC);
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Signature Ingestor");
+                                    SignatureIngestors.XML.XMLIngestor tIngest = new SignatureIngestors.XML.XMLIngestor();
+                                    
+                                    Logging.Log(Logging.LogType.Debug, "Signature Import", "Processing TOSEC files");
+                                    tIngest.Import(Path.Combine(Config.LibraryConfiguration.LibrarySignatureImportDirectory, "TOSEC"), gaseous_signature_parser.parser.SignatureParser.TOSEC);
+                                    
+                                    Logging.Log(Logging.LogType.Debug, "Signature Import", "Processing MAME Arcade files");
+                                    tIngest.Import(Path.Combine(Config.LibraryConfiguration.LibrarySignatureImportDirectory, "MAME Arcade"), gaseous_signature_parser.parser.SignatureParser.MAMEArcade);
+
+                                    Logging.Log(Logging.LogType.Debug, "Signature Import", "Processing MAME MESS files");
+                                    tIngest.Import(Path.Combine(Config.LibraryConfiguration.LibrarySignatureImportDirectory, "MAME MESS"), gaseous_signature_parser.parser.SignatureParser.MAMEMess);
+                                    
+                                    _SaveLastRunTime = true;
+
                                     break;
 
                                 case QueueItemType.TitleIngestor:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Title Ingestor");
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Title Ingestor");
                                     Classes.ImportGames importGames = new Classes.ImportGames(Config.LibraryConfiguration.LibraryImportDirectory);
+
+                                    _SaveLastRunTime = true;
+
                                     break;
 
                                 case QueueItemType.MetadataRefresh:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Metadata Refresher");
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Metadata Refresher");
                                     Classes.MetadataManagement.RefreshMetadata(true);
+
+                                    _SaveLastRunTime = true;
+
                                     break;
 
                                 case QueueItemType.OrganiseLibrary:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Library Organiser");
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Library Organiser");
                                     Classes.ImportGame.OrganiseLibrary();
+
+                                    _SaveLastRunTime = true;
+
                                     break;
 
                                 case QueueItemType.LibraryScan:
-                                    Logging.Log(Logging.LogType.Information, "Timered Event", "Starting Library Scanner");
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Library Scanner");
                                     Classes.ImportGame.LibraryScan();
+
+                                    _SaveLastRunTime = true;
+
+                                    break;
+
+                                case QueueItemType.CollectionCompiler:
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Collection Compiler");
+                                    Classes.Collections.CompileCollections((long)Options);
+                                    break;
+
+                                case QueueItemType.BackgroundDatabaseUpgrade:
+                                    Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Background Upgrade");
+                                    gaseous_tools.DatabaseMigration.UpgradeScriptBackgroundTasks();
                                     break;
 
                             }
@@ -116,16 +174,59 @@ namespace gaseous_server
             {
                 _ForceExecute = true;
             }
+
+            public void BlockedState(bool BlockState)
+            {
+                _IsBlocked = BlockState;
+            }
         }
 
         public enum QueueItemType
         {
+            /// <summary>
+            /// Reserved for blocking all services - no actual background service is tied to this type
+            /// </summary>
+            All,
+
+            /// <summary>
+            /// Default type - no background service is tied to this type
+            /// </summary>
             NotConfigured,
+
+            /// <summary>
+            /// Ingests signature DAT files into the database
+            /// </summary>
             SignatureIngestor,
+
+            /// <summary>
+            /// Imports game files into the database and moves them to the required location on disk
+            /// </summary>
             TitleIngestor,
+
+            /// <summary>
+            /// Forces stored metadata to be refreshed
+            /// </summary>
             MetadataRefresh,
+
+            /// <summary>
+            /// Ensures all managed files are where they are supposed to be
+            /// </summary>
             OrganiseLibrary,
-            LibraryScan
+
+            /// <summary>
+            /// Looks for orphaned files in the library and re-adds them to the database
+            /// </summary>
+            LibraryScan,
+
+            /// <summary>
+            /// Builds collections - set the options attribute to the id of the collection to build
+            /// </summary>
+            CollectionCompiler,
+
+            /// <summary>
+            /// Performs and post database upgrade scripts that can be processed as a background task
+            /// </summary>
+            BackgroundDatabaseUpgrade
         }
 
         public enum QueueItemState

gaseous-server/Program.cs

@@ -1,9 +1,16 @@
-using System.Text.Json.Serialization;
+using System.Reflection;
+using System.Text.Json.Serialization;
 using gaseous_server;
+using gaseous_server.Models;
+using gaseous_server.SignatureIngestors.XML;
 using gaseous_tools;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.OpenApi.Models;
 
-Logging.Log(Logging.LogType.Information, "Startup", "Starting Gaseous Server");
+Logging.WriteToDiskOnly = true;
+Logging.Log(Logging.LogType.Information, "Startup", "Starting Gaseous Server " + Assembly.GetExecutingAssembly().GetName().Version);
 
 // set up db
 Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
@@ -11,6 +18,8 @@ db.InitDB();
 
 // load app settings
 Config.InitSettings();
+// write updated settings back to the config file
+Config.UpdateConfig();
 
 // set initial values
 Guid APIKey = Guid.NewGuid();
@@ -21,6 +30,23 @@ if (Config.ReadSetting("API Key", "Test API Key") == "Test API Key")
     Config.SetSetting("API Key", APIKey.ToString());
 }
 
+// kick off any delayed upgrade tasks
+// run 1002 background updates in the background on every start
+DatabaseMigration.BackgroundUpgradeTargetSchemaVersions.Add(1002);
+// start the task
+ProcessQueue.QueueItem queueItem = new ProcessQueue.QueueItem(
+        ProcessQueue.QueueItemType.BackgroundDatabaseUpgrade,
+        1,
+        new List<ProcessQueue.QueueItemType>
+        {
+            ProcessQueue.QueueItemType.All
+        },
+        false,
+        true
+    );
+queueItem.ForceExecute();
+ProcessQueue.QueueItems.Add(queueItem);
+
 // set up server
 var builder = WebApplication.CreateBuilder(args);
 
@@ -32,6 +58,9 @@ builder.Services.AddControllers().AddJsonOptions(x =>
 
     // suppress nulls
     x.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+
+    // set max depth
+    x.JsonSerializerOptions.MaxDepth = 64;
 });
 builder.Services.AddResponseCaching();
 builder.Services.AddControllers(options =>
@@ -55,9 +84,49 @@ builder.Services.AddControllers(options =>
         });
 });
 
+// set max upload size
+builder.Services.Configure<IISServerOptions>(options =>
+{
+    options.MaxRequestBodySize = int.MaxValue;
+});
+builder.Services.Configure<KestrelServerOptions>(options =>
+{
+    options.Limits.MaxRequestBodySize = int.MaxValue;
+});
+builder.Services.Configure<FormOptions>(options =>
+{
+    options.ValueLengthLimit = int.MaxValue;
+    options.MultipartBodyLengthLimit = int.MaxValue;
+    options.MultipartHeadersLengthLimit = int.MaxValue;
+});
+
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(options =>
+    {
+        options.SwaggerDoc("v1", new OpenApiInfo
+        {
+            Version = "v1",
+            Title = "Gaseous Server API",
+            Description = "An API for managing the Gaseous Server",
+            TermsOfService = new Uri("https://github.com/gaseous-project/gaseous-server"),
+            Contact = new OpenApiContact
+            {
+                Name = "GitHub Repository",
+                Url = new Uri("https://github.com/gaseous-project/gaseous-server")
+            },
+            License = new OpenApiLicense
+            {
+                Name = "Gaseous Server License",
+                Url = new Uri("https://github.com/gaseous-project/gaseous-server/blob/main/LICENSE")
+            }
+        });
+
+        // using System.Reflection;
+        var xmlFilename = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+        options.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFilename));
+    }
+);
 builder.Services.AddHostedService<TimedHostedService>();
 
 var app = builder.Build();
@@ -76,7 +145,11 @@ app.UseResponseCaching();
 app.UseAuthorization();
 
 app.UseDefaultFiles();
-app.UseStaticFiles();
+app.UseStaticFiles(new StaticFileOptions
+{
+    ServeUnknownFileTypes = true, //allow unkown file types also to be served
+    DefaultContentType = "plain/text" //content type to returned if fileType is not known.
+});
 
 app.MapControllers();
 
@@ -84,11 +157,11 @@ app.MapControllers();
 Config.LibraryConfiguration.InitLibrary();
 
 // insert unknown platform and game if not present
-gaseous_server.Classes.Metadata.Games.GetGame(0, false, false);
+gaseous_server.Classes.Metadata.Games.GetGame(0, false, false, false);
 gaseous_server.Classes.Metadata.Platforms.GetPlatform(0);
 
-// organise library
-//gaseous_server.Classes.ImportGame.OrganiseLibrary();
+// extract platform map if not present
+PlatformMapping.ExtractPlatformMap();
 
 // add background tasks
 ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(ProcessQueue.QueueItemType.SignatureIngestor, 60));
@@ -102,19 +175,20 @@ ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(
     );
 ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(ProcessQueue.QueueItemType.MetadataRefresh, 360));
 ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(
-    ProcessQueue.QueueItemType.OrganiseLibrary, 2040, new List<ProcessQueue.QueueItemType>
+    ProcessQueue.QueueItemType.OrganiseLibrary, 1440, new List<ProcessQueue.QueueItemType>
     {
         ProcessQueue.QueueItemType.LibraryScan,
         ProcessQueue.QueueItemType.TitleIngestor
     })
     );
 ProcessQueue.QueueItems.Add(new ProcessQueue.QueueItem(
-    ProcessQueue.QueueItemType.LibraryScan, 30, new List<ProcessQueue.QueueItemType>
+    ProcessQueue.QueueItemType.LibraryScan, 1440, new List<ProcessQueue.QueueItemType>
     {
-        ProcessQueue.QueueItemType.TitleIngestor,
         ProcessQueue.QueueItemType.OrganiseLibrary
     })
     );
 
+Logging.WriteToDiskOnly = false;
+
 // start the app
 app.Run();

gaseous-server/Timer.cs

@@ -33,9 +33,23 @@ namespace gaseous_server
             //_logger.LogInformation(
             //    "Timed Hosted Service is working. Count: {Count}", count);
 
-            foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems) {
-                if ((DateTime.UtcNow > qi.NextRunTime || qi.Force == true) && CheckProcessBlockList(qi) == true) {
-                    qi.Execute();
+            List<ProcessQueue.QueueItem> ActiveList = new List<ProcessQueue.QueueItem>();
+            ActiveList.AddRange(ProcessQueue.QueueItems);
+            foreach (ProcessQueue.QueueItem qi in ActiveList) {
+                if (CheckIfProcessIsBlockedByOthers(qi) == false) {
+                    qi.BlockedState(false);
+                    if (DateTime.UtcNow > qi.NextRunTime || qi.Force == true)
+                    {
+                        qi.Execute();
+                        if (qi.RemoveWhenStopped == true && qi.ItemState == ProcessQueue.QueueItemState.Stopped)
+                        {
+                            ProcessQueue.QueueItems.Remove(qi);
+                        }
+                    }
+                }
+                else
+                {
+                    qi.BlockedState(true);
                 }
             }
         }
@@ -55,24 +69,24 @@ namespace gaseous_server
             _timer?.Dispose();
         }
 
-        private bool CheckProcessBlockList(ProcessQueue.QueueItem queueItem)
+        private bool CheckIfProcessIsBlockedByOthers(ProcessQueue.QueueItem queueItem)
         {
-            if (queueItem.Blocks.Count > 0)
+            foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)
             {
-                foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems)
-                {
-                    if (queueItem.Blocks.Contains(qi.ItemType) && qi.ItemState == ProcessQueue.QueueItemState.Running)
+                if (qi.ItemState == ProcessQueue.QueueItemState.Running) {
+                    // other service is running, check if queueItem is blocked by it
+                    if (
+                        qi.Blocks.Contains(queueItem.ItemType) ||
+                        qi.Blocks.Contains(ProcessQueue.QueueItemType.All)
+                    )
                     {
-                        return false;
+                        Console.WriteLine(queueItem.ItemType.ToString() + " is blocked by " + qi.ItemType.ToString());
+                        return true;
                     }
                 }
+            }
 
-                return true;
-            }
-            else
-            {
-                return true;
-            }
+            return false;
         }
     }
 }

gaseous-server/gaseous-server.csproj

@@ -13,11 +13,16 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\net7.0\gaseous-server.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\net7.0\gaseous-server.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.8" />
+    <PackageReference Include="gaseous-signature-parser" Version="2.0.0" />
+    <PackageReference Include="gaseous.IGDB" Version="1.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.7" />
-    <PackageReference Include="IGDB" Version="2.3.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
   </ItemGroup>
 
   <ItemGroup>
@@ -88,37 +93,26 @@
     <Folder Include="Classes\" />
     <Folder Include="Classes\SignatureIngestors\" />
     <Folder Include="Support\" />
-    <Folder Include="wwwroot\" />
     <Folder Include="Classes\Metadata\" />
     <Folder Include="Assets\" />
     <Folder Include="Assets\Ratings\" />
     <Folder Include="Assets\Ratings\ESRB\" />
     <Folder Include="Assets\Ratings\ACB\" />
     <Folder Include="Assets\Ratings\PEGI\" />
-    <Folder Include="wwwroot\scripts\" />
-    <Folder Include="wwwroot\images\" />
-    <Folder Include="wwwroot\styles\" />
-    <Folder Include="wwwroot\pages\" />
     <Folder Include="Assets\Ratings\CERO\" />
     <Folder Include="Assets\Ratings\USK\" />
     <Folder Include="Assets\Ratings\GRAC\" />
     <Folder Include="Assets\Ratings\CLASS_IND\" />
-    <Folder Include="wwwroot\fonts\" />
-    <Folder Include="wwwroot\pages\dialogs\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="wwwroot\**">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\gaseous-tools\gaseous-tools.csproj">
       <GlobalPropertiesToRemove></GlobalPropertiesToRemove>
     </ProjectReference>
-    <ProjectReference Include="..\gaseous-romsignatureobject\gaseous-romsignatureobject.csproj">
-      <GlobalPropertiesToRemove></GlobalPropertiesToRemove>
-    </ProjectReference>
-    <ProjectReference Include="..\gaseous-signature-parser\gaseous-signature-parser.csproj">
-      <GlobalPropertiesToRemove></GlobalPropertiesToRemove>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Remove="Support\PlatformMap.json" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Support\PlatformMap.json" Condition="'$(ExcludeConfigFilesFromBuildOutput)'!='true'">

gaseous-server/wwwroot/images/IGDB_logo.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="249.44 647.1 1461.24 702.85">
+<title>IGDB logo</title>
+<g id="text_logo">
+<path fill="#000000" d=" M 249.44 647.14 C 736.51 647.13 1223.59 647.21 1710.67 647.10 C 1710.68 881.38 1710.69 1115.67 1710.66 1349.95 C 1615.86 1334.68 1520.63 1321.89 1425.05 1312.53 C 1080.16 1278.28 731.31 1284.02 387.73 1329.60 C 341.52 1335.59 295.47 1342.74 249.44 1349.92 C 249.43 1115.66 249.45 881.40 249.44 647.14 M 292.45 690.16 C 292.47 893.35 292.45 1096.55 292.45 1299.74 C 747.32 1230.12 1212.80 1230.06 1667.66 1299.76 C 1667.69 1096.55 1667.67 893.34 1667.67 690.13 C 1209.26 690.20 750.85 690.15 292.45 690.16 Z"/>
+<path fill="#000000" d=" M 606.98 849.96 C 636.79 820.94 678.61 805.48 720.03 806.13 C 748.31 806.03 777.18 810.46 802.61 823.37 C 815.72 829.91 827.70 838.49 838.88 847.92 C 824.81 864.91 810.62 881.79 796.71 898.90 C 788.34 892.63 780.20 885.94 770.94 880.98 C 752.35 870.49 730.45 866.86 709.32 868.40 C 683.46 870.61 659.80 886.20 645.79 907.79 C 627.73 934.91 624.92 970.60 635.86 1000.97 C 642.48 1019.42 655.12 1035.79 671.77 1046.24 C 688.33 1056.88 708.44 1061.15 727.96 1059.98 C 747.98 1059.21 768.36 1053.75 784.66 1041.78 C 784.50 1027.38 784.66 1012.97 784.58 998.57 C 762.15 998.63 739.71 998.55 717.28 998.61 C 717.23 979.29 717.40 959.97 717.20 940.66 C 761.32 940.38 805.45 940.76 849.57 940.47 C 849.84 984.58 849.54 1028.70 849.72 1072.81 C 819.35 1099.03 781.02 1116.23 740.99 1120.14 C 701.91 1124.43 660.71 1117.24 627.40 1095.69 C 600.71 1078.68 580.09 1052.59 569.30 1022.87 C 558.65 993.63 556.55 961.41 562.53 930.93 C 568.76 900.29 584.34 871.56 606.98 849.96 Z"/>
+<path fill="#000000" d=" M 412.22 811.37 C 434.59 811.42 456.96 811.33 479.33 811.42 C 479.28 912.90 479.33 1014.39 479.31 1115.88 C 456.95 1115.87 434.59 1115.84 412.23 1115.89 C 412.22 1014.39 412.24 912.88 412.22 811.37 Z"/>
+<path fill="#000000" d=" M 931.25 811.38 C 972.17 811.39 1013.09 811.38 1054.01 811.39 C 1091.21 811.80 1128.88 823.34 1157.99 846.93 C 1183.44 867.28 1201.49 896.55 1208.37 928.40 C 1216.70 966.86 1211.27 1008.80 1190.62 1042.63 C 1174.23 1069.90 1148.49 1091.13 1119.07 1103.04 C 1098.46 1111.41 1076.23 1115.81 1053.98 1115.87 C 1013.08 1115.87 972.17 1115.85 931.26 1115.88 C 931.26 1014.38 931.28 912.88 931.25 811.38 M 998.55 871.86 C 998.45 933.04 998.56 994.22 998.49 1055.41 C 1011.33 1055.39 1024.18 1055.40 1037.02 1055.40 C 1047.36 1055.32 1057.79 1055.89 1068.03 1053.99 C 1088.10 1050.87 1107.44 1041.22 1120.71 1025.65 C 1132.31 1012.31 1139.05 995.20 1141.08 977.75 C 1142.97 960.03 1141.47 941.67 1134.60 925.11 C 1127.53 907.51 1114.31 892.45 1097.61 883.42 C 1082.53 875.02 1065.11 871.85 1047.99 871.84 C 1031.51 871.88 1015.03 871.84 998.55 871.86 Z"/>
+<path fill="#000000" d=" M 1288.80 811.57 C 1330.15 811.13 1371.54 811.51 1412.90 811.38 C 1424.26 811.54 1435.65 810.91 1446.97 812.08 C 1467.08 813.95 1487.46 819.82 1503.55 832.45 C 1517.54 843.24 1527.36 859.35 1530.07 876.86 C 1532.03 893.42 1531.12 911.06 1522.97 925.99 C 1516.04 939.38 1504.10 949.32 1491.26 956.78 C 1508.37 963.22 1525.29 972.72 1535.94 988.04 C 1545.87 1002.19 1548.77 1020.07 1547.80 1037.03 C 1547.40 1054.27 1541.09 1071.56 1529.28 1084.27 C 1517.35 1097.30 1500.95 1105.31 1484.12 1109.96 C 1470.05 1113.75 1455.50 1115.70 1440.94 1115.84 C 1390.26 1115.88 1339.58 1115.89 1288.90 1115.84 C 1288.82 1014.41 1289.01 912.99 1288.80 811.57 M 1354.30 870.27 C 1354.37 891.67 1354.24 913.08 1354.36 934.49 C 1376.56 934.35 1398.76 934.52 1420.96 934.40 C 1431.03 933.86 1441.46 932.43 1450.36 927.35 C 1457.39 923.37 1462.73 916.24 1463.78 908.14 C 1465.26 899.01 1463.69 888.76 1457.02 881.93 C 1449.00 873.67 1437.04 871.03 1425.95 870.37 C 1402.07 870.17 1378.18 870.37 1354.30 870.27 M 1354.29 990.41 C 1354.32 1012.64 1354.35 1034.89 1354.27 1057.13 C 1375.50 1057.33 1396.74 1057.15 1417.98 1057.21 C 1428.58 1057.08 1439.29 1057.80 1449.79 1055.91 C 1458.99 1054.43 1468.48 1050.97 1474.69 1043.71 C 1480.95 1036.44 1482.26 1026.10 1480.69 1016.93 C 1479.44 1009.15 1474.55 1002.16 1467.79 998.15 C 1458.62 992.57 1447.64 990.81 1437.06 990.45 C 1409.47 990.37 1381.88 990.45 1354.29 990.41 Z"/>
+</g>
+</svg>

gaseous-server/wwwroot/images/collections.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.0656 8.00389L11.25 7.99875H18.75C20.483 7.99875 21.8992 9.3552 21.9949 11.0643L22 11.2487V18.7487C22 20.4818 20.6435 21.898 18.9344 21.9936L18.75 21.9987H11.25C9.51697 21.9987 8.10075 20.6423 8.00515 18.9332L8 18.7487V11.2487C8 9.51571 9.35646 8.0995 11.0656 8.00389ZM18.75 9.49875H11.25C10.3318 9.49875 9.57881 10.2059 9.5058 11.1052L9.5 11.2487V18.7487C9.5 19.6669 10.2071 20.4199 11.1065 20.4929L11.25 20.4987H18.75C19.6682 20.4987 20.4212 19.7916 20.4942 18.8923L20.5 18.7487V11.2487C20.5 10.2822 19.7165 9.49875 18.75 9.49875ZM15 11C15.4142 11 15.75 11.3358 15.75 11.75V14.248L18.25 14.2487C18.6642 14.2487 19 14.5845 19 14.9987C19 15.413 18.6642 15.7487 18.25 15.7487L15.75 15.748V18.25C15.75 18.6642 15.4142 19 15 19C14.5858 19 14.25 18.6642 14.25 18.25V15.748L11.75 15.7487C11.3358 15.7487 11 15.413 11 14.9987C11 14.5845 11.3358 14.2487 11.75 14.2487L14.25 14.248V11.75C14.25 11.3358 14.5858 11 15 11ZM15.5818 4.23284L15.6345 4.40964L16.327 6.998H14.774L14.1856 4.79787C13.9355 3.86431 12.9759 3.31029 12.0423 3.56044L4.79787 5.50158C3.91344 5.73856 3.36966 6.61227 3.52756 7.49737L3.56044 7.64488L5.50158 14.8893C5.69372 15.6064 6.30445 16.0996 7.00045 16.1764L7.00056 17.6816C5.69932 17.6051 4.52962 16.7445 4.10539 15.4544L4.05269 15.2776L2.11155 8.03311C1.66301 6.35913 2.6067 4.6401 4.23284 4.10539L4.40964 4.05269L11.6541 2.11155C13.3281 1.66301 15.0471 2.6067 15.5818 4.23284Z" fill="#212121"/>
+</svg>

gaseous-server/wwwroot/images/delete.svg

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" class="icon"  version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M960 160h-291.2a160 160 0 0 0-313.6 0H64a32 32 0 0 0 0 64h896a32 32 0 0 0 0-64zM512 96a96 96 0 0 1 90.24 64h-180.48A96 96 0 0 1 512 96zM844.16 290.56a32 32 0 0 0-34.88 6.72A32 32 0 0 0 800 320a32 32 0 1 0 64 0 33.6 33.6 0 0 0-9.28-22.72 32 32 0 0 0-10.56-6.72zM832 416a32 32 0 0 0-32 32v96a32 32 0 0 0 64 0v-96a32 32 0 0 0-32-32zM832 640a32 32 0 0 0-32 32v224a32 32 0 0 1-32 32H256a32 32 0 0 1-32-32V320a32 32 0 0 0-64 0v576a96 96 0 0 0 96 96h512a96 96 0 0 0 96-96v-224a32 32 0 0 0-32-32z" fill="#231815" /><path d="M384 768V352a32 32 0 0 0-64 0v416a32 32 0 0 0 64 0zM544 768V352a32 32 0 0 0-64 0v416a32 32 0 0 0 64 0zM704 768V352a32 32 0 0 0-64 0v416a32 32 0 0 0 64 0z" fill="#231815" /></svg>

gaseous-server/wwwroot/images/download.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M24 12a5 5 0 0 1-5 5h-2v-1h2a3.99 3.99 0 0 0 .623-7.934l-.79-.124-.052-.798a5.293 5.293 0 0 0-10.214-1.57L8.17 6.59l-.977-.483A2.277 2.277 0 0 0 6.19 5.87a2.18 2.18 0 0 0-1.167.339 2.206 2.206 0 0 0-.98 1.395l-.113.505-.476.2A4 4 0 0 0 5 16h3v1H5a5 5 0 0 1-1.934-9.611 3.21 3.21 0 0 1 1.422-2.025 3.17 3.17 0 0 1 1.702-.493 3.268 3.268 0 0 1 1.446.34 6.293 6.293 0 0 1 12.143 1.867A4.988 4.988 0 0 1 24 12zm-11-1h-1v10.292l-2.646-2.646-.707.707 3.854 3.854 3.853-3.852-.707-.707L13 21.294z"/><path fill="none" d="M0 0h24v24H0z"/></svg>

gaseous-server/wwwroot/images/edit.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.2799 6.40005L11.7399 15.94C10.7899 16.89 7.96987 17.33 7.33987 16.7C6.70987 16.07 7.13987 13.25 8.08987 12.3L17.6399 2.75002C17.8754 2.49308 18.1605 2.28654 18.4781 2.14284C18.7956 1.99914 19.139 1.92124 19.4875 1.9139C19.8359 1.90657 20.1823 1.96991 20.5056 2.10012C20.8289 2.23033 21.1225 2.42473 21.3686 2.67153C21.6147 2.91833 21.8083 3.21243 21.9376 3.53609C22.0669 3.85976 22.1294 4.20626 22.1211 4.55471C22.1128 4.90316 22.0339 5.24635 21.8894 5.5635C21.7448 5.88065 21.5375 6.16524 21.2799 6.40005V6.40005Z" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 4H6C4.93913 4 3.92178 4.42142 3.17163 5.17157C2.42149 5.92172 2 6.93913 2 8V18C2 19.0609 2.42149 20.0783 3.17163 20.8284C3.92178 21.5786 4.93913 22 6 22H17C19.21 22 20 20.2 20 18V13" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

gaseous-server/wwwroot/images/help.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 17H12.01M12 14C12.8906 12.0938 15 12.2344 15 10C15 8.5 14 7 12 7C10.4521 7 9.50325 7.89844 9.15332 9M12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

gaseous-server/wwwroot/images/library.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>library</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Combined-Shape" fill="#000000" transform="translate(42.666667, 85.333333)">
+            <path d="M3.55271368e-14,298.666667 L426.666667,298.666667 L426.666667,341.333333 L3.55271368e-14,341.333333 L3.55271368e-14,298.666667 Z M42.6666667,1.42108547e-14 L106.666667,1.42108547e-14 L106.666667,277.333333 L42.6666667,277.333333 L42.6666667,1.42108547e-14 Z M128,21.3333333 L192,21.3333333 L192,277.333333 L128,277.333333 L128,21.3333333 Z M288.933802,36.9522088 L351.961498,25.8387255 L399.909944,277.333333 L330.641827,277.70319 L288.933802,36.9522088 Z M213.333333,21.3333333 L277.333333,21.3333333 L277.333333,277.333333 L213.333333,277.333333 L213.333333,21.3333333 Z">
+
+</path>
+        </g>
+    </g>
+</svg>

gaseous-server/wwwroot/images/map.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M10 7L8.364 1H2.636L1 7zM7.6 2l1.09 4H2.31L3.4 2zm8.036 15l-.818 3H6v-7h8.545L14 15h9l-1.636-6h-5.728l-.818 3H6V9h4l-.273-1H1.273L1 9h4v12h9.545L14 23h9l-1.636-6zm.764-7h4.2l1.09 4h-6.38zm-1.09 12l1.09-4h4.2l1.09 4z"/><path fill="none" d="M0 0h24v24H0z"/></svg>

gaseous-server/wwwroot/images/refresh.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 3V8M3 8H8M3 8L6 5.29168C7.59227 3.86656 9.69494 3 12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.71683 21 4.13247 18.008 3.22302 14" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

gaseous-server/wwwroot/images/settings.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<path d="M230.4,358.4V76.8c0-14.13,11.48-25.6,25.6-25.6c14.15,0,25.6,11.47,25.6,25.6v281.6h25.6c14.15,0,25.6,11.48,25.6,25.6
+		c0,14.15-11.45,25.6-25.6,25.6h-25.6v25.6c0,14.15-11.45,25.6-25.6,25.6c-14.13,0-25.6-11.45-25.6-25.6v-25.6h-25.6
+		c-14.13,0-25.6-11.45-25.6-25.6c0-14.13,11.48-25.6,25.6-25.6H230.4z M409.6,102.4V76.8c0-14.13,11.48-25.6,25.6-25.6
+		c14.15,0,25.6,11.47,25.6,25.6v25.6h25.6c14.15,0,25.6,11.47,25.6,25.6c0,14.15-11.45,25.6-25.6,25.6h-25.6v281.6
+		c0,14.15-11.45,25.6-25.6,25.6c-14.13,0-25.6-11.45-25.6-25.6V153.6H384c-14.13,0-25.6-11.45-25.6-25.6
+		c0-14.13,11.48-25.6,25.6-25.6H409.6z M102.4,179.2H128c14.15,0,25.6,11.48,25.6,25.6c0,14.15-11.45,25.6-25.6,25.6h-25.6v204.8
+		c0,14.15-11.45,25.6-25.6,25.6c-14.13,0-25.6-11.45-25.6-25.6V230.4H25.6C11.48,230.4,0,218.95,0,204.8
+		c0-14.13,11.48-25.6,25.6-25.6h25.6V76.8c0-14.13,11.47-25.6,25.6-25.6c14.15,0,25.6,11.47,25.6,25.6V179.2z"/>
+</g>
+</svg>

gaseous-server/wwwroot/images/upload.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<path d="M509,261.1c-3.3-12.7-9.3-24-16.9-33.4c-5.7-7.1-12.4-13.2-19.6-18.4c-10.8-7.8-22.8-13.6-35-17.7
+		c-7.8-2.5-15.7-4.4-23.5-5.6c-3-18-8.4-34.6-15.7-49.6c-13.6-27.9-34-50.1-58.7-65.3C315,55.8,286.2,47.8,256,47.8
+		c-19,0-36.6,3.2-52.4,8.8c-11.9,4.2-22.7,9.8-32.5,16.4c-14.7,9.9-26.9,22-36.7,35.2c-7.5,10.2-13.6,21.1-18.1,32.2
+		c-12.9,2-25.3,5.3-37.1,10c-11.1,4.5-21.6,10.2-31.1,17.1c-14.3,10.4-26.4,23.7-34.8,39.5c-4.3,8-7.6,16.5-9.9,25.6
+		C1.2,241.7,0,251.4,0,261.4c0,17.9,3.9,34.8,11,49.8c5.3,11.3,12.4,21.5,20.9,30.4c12.7,13.4,28.5,23.9,46.2,31.1
+		c17.7,7.2,37.4,11,57.9,11h56c8.8,0,16-7.2,16-16s-7.2-16-16-16h-56c-14.7,0-28.7-2.4-41.2-6.9c-9.4-3.3-18.1-7.8-25.7-13.2
+		c-11.5-8.1-20.7-18.3-27.1-30.1c-6.4-11.8-9.9-25.2-10-40.2c0-13.4,2.8-25.1,7.6-35.4c3.6-7.8,8.4-14.8,14.3-21
+		c8.8-9.4,20-17.2,32.9-23c12.9-5.8,27.5-9.6,42.7-11c6.4-0.6,11.8-4.9,13.7-11c3.2-9.8,8-19.9,14.4-29.3
+		c4.8-7.1,10.5-13.8,17.1-19.9c9.8-9.1,21.5-16.8,35-22.3c13.5-5.4,28.9-8.7,46.3-8.7c16.4,0,32,2.9,46.4,8.4
+		c21.6,8.2,40.3,22.2,54.6,41.3s24.1,43.5,27.1,72.8c0.8,7.8,7.3,13.9,15.1,14.3c9.2,0.5,19.3,2.3,28.9,5.5
+		c7.2,2.4,14.2,5.6,20.5,9.5c4.7,2.9,9.1,6.2,12.9,9.8c5.8,5.5,10.3,11.6,13.5,18.7c3.2,7,5,14.9,5,24.2c0,5.7-0.6,10.9-1.7,15.7
+		c-1.9,8.4-5.2,15.6-9.8,21.8c-3.4,4.7-7.6,8.9-12.4,12.6c-7.3,5.5-16.2,9.9-26.4,12.9s-21.6,4.6-33.7,4.6h-76c-8.8,0-16,7.2-16,16
+		s7.2,16,16,16h76c15.2,0,29.8-2,43.4-6.1c10.2-3.1,19.8-7.3,28.6-12.8c6.6-4.1,12.6-8.9,18-14.4c8.1-8.3,14.7-18.1,19.1-29.3
+		c4.5-11.2,6.8-23.6,6.8-37C511.9,276.1,510.9,268.4,509,261.1z"/>
+	<path d="M308.7,267.1c6.2,6.2,16.4,6.2,22.6,0c6.3-6.2,6.3-16.4,0-22.6l-64-64c-6.2-6.2-16.4-6.2-22.6,0l-64,64
+		c-6.2,6.2-6.2,16.4,0,22.6c6.2,6.2,16.4,6.2,22.6,0l36.7-36.7v217.8c0,8.8,7.2,16,16,16s16-7.2,16-16V230.4L308.7,267.1z"/>
+</g>
+</svg>

gaseous-server/wwwroot/index.html

@@ -2,11 +2,17 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <link type="text/css" rel="stylesheet" href="/styles/style.css" />
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script src="https://momentjs.com/downloads/moment.js"></script>
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+    <script src="/api/v1/System/VersionFile"></script>
+    <link type="text/css" rel="stylesheet" dat-href="/styles/style.css" />
+    <script src="/scripts/jquery-3.6.0.min.js"></script>
+    <script src="/scripts/moment.js"></script>
+    <link href="/styles/select2.min.css" rel="stylesheet" />
+    <link href="/styles/dropzone.min.css" rel="stylesheet" type="text/css" />
+    <script src="/scripts/jquery.lazy.min.js"></script>
+    <script src="/scripts/jquery.lazy.plugins.min.js"></script>
+    <script src="/scripts/select2.min.js"></script>
+    <script src="/scripts/dropzone.min.js"></script>
+    <script src="/scripts/simpleUpload.min.js"></script>
     <script src="/scripts/main.js" type="text/javascript"></script>
     <script src="/scripts/filterformating.js" type="text/javascript"></script>
     <script src="/scripts/gamesformating.js" type="text/javascript"></script>
@@ -15,17 +21,53 @@
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
     <link rel="manifest" href="/site.webmanifest">
     <title>Gaseous Games</title>
+
+    <script type="text/javascript">
+        var head = document.getElementsByTagName('head')[0];
+
+        // update links
+        var headLinks = document.getElementsByTagName('link');
+        for (var i = 0; i < headLinks.length; i++) {
+            if (headLinks[i].getAttribute('dat-href') && headLinks[i].rel == "stylesheet") {
+                var newLink = document.createElement('link');
+                newLink.rel = "stylesheet";
+                newLink.href = headLinks[i].getAttribute('dat-href') + '?v=' + AppVersion;
+                newLink.type = "text/css";
+
+                headLinks[i].parentElement.removeChild(headLinks[i]);
+                head.appendChild(newLink);
+            }
+        }
+    </script>
 </head>
 <body>
     <div id="banner_icon" onclick="window.location.href = '/index.html';">
         <img src="/images/logo.png" alt="Gaseous" id="banner_icon_image" />
     </div>
     <div id="banner_header">
-        <div id="banner_header_label">Gaseous Games</div>
-    </div>
-    <div id="banner_cog" onclick="window.location.href = '/index.html?page=system';">
-        <img src="/images/cog.jpg" alt="System" id="banner_system_image" />
+        <div id="banner_cog" onclick="window.location.href = '/index.html?page=settings';" class="banner_button">
+            <img src="/images/settings.svg" alt="Settings" title="Settings" id="banner_system_image" class="banner_button_image" />
+            <span id="banner_system_label">Settings</span>
+        </div>
+
+        <div id="banner_upload" onclick="showDialog('upload');" class="banner_button">
+            <img src="/images/upload.svg" alt="Upload" title="Upload" id="banner_upload_image" class="banner_button_image" />
+            <span id="banner_upload_label">Upload</span>
+        </div>
+
+        <div id="banner_collections" onclick="window.location.href = '/index.html?page=collections';" class="banner_button">
+            <img src="/images/collections.svg" alt="Collections" title="Collections" id="banner_collections_image" class="banner_button_image" />
+            <span id="banner_collections_label">Collections</span>
+        </div>
+
+        <div id="banner_library" onclick="window.location.href = '/index.html';" class="banner_button">
+            <img src="/images/library.svg" alt="Library" title="Library" id="banner_library_image" class="banner_button_image" />
+            <span id="banner_library_label">Library</span>
+        </div>
+
+        <div id="banner_header_label" onclick="window.location.href = '/index.html';">Gaseous Games</div>
     </div>
+    
 
     <div id="content">
 
@@ -43,17 +85,29 @@
 
     </div>
 
+    <!-- The Modal -->
+    <div id="myModalSub" class="modal">
+
+        <!-- Modal content -->
+        <div class="modal-content-sub">
+            <span id="modal-close-sub" class="close">&times;</span>
+            <div id="modal-content-sub">Some text in the Modal..</div>
+        </div>
+
+    </div>
+
     <script type="text/javascript">var modalVariables = null;
+        
 
         $(document).ready(function () {
-            const urlParams = new URLSearchParams(window.location.search);
-            var myParam = urlParams.get('page');
+            var myParam = getQueryString('page', 'string');
 
             if (!myParam) {
                 myParam = 'home';
             }
 
-            $('#content').load('/pages/' + myParam + '.html');
-        });</script>
+            $('#content').load('/pages/' + myParam + '.html?v=' + AppVersion);
+        });
+    </script>
 </body>
 </html>

gaseous-server/wwwroot/pages/EmulatorJS.html

@@ -0,0 +1,32 @@
+<div style='width:640px;height:480px;max-width:100%'>
+    <div id='game'></div>
+</div>
+
+<script type='text/javascript'>
+    EJS_player = '#game';
+
+    // Can also be fceumm or nestopia
+    EJS_core = getQueryString('core', 'string');
+
+    // Lightgun
+    EJS_lightgun = false; // can be true or false
+
+    // URL to BIOS file
+    EJS_biosUrl = emuBios;
+
+    // URL to Game rom
+    EJS_gameUrl = decodeURIComponent(getQueryString('rompath', 'string'));
+
+    // Path to the data directory
+    EJS_pathtodata = '/emulators/EmulatorJS/data/';
+
+    EJS_DEBUG_XX = false;
+
+    EJS_startOnLoaded = false;
+
+    EJS_backgroundImage = emuBackground;
+    EJS_backgroundBlur = true;
+
+    EJS_gameName = emuGameTitle;
+</script>
+<script src='/emulators/EmulatorJS/data/loader.js'></script>

gaseous-server/wwwroot/pages/collections.html

@@ -0,0 +1,80 @@
+<div id="bgImage" style="background-image: url('/images/CollectionsWallpaper.jpg'); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);">
+    <div id="bgImage_Opacity"></div>
+</div>
+
+<div id="gamepage">
+    <div id="gametitle">
+        <h1 id="gametitle_label">Collections</h1>
+    </div>
+    <button id="collection_new" style="float: right;" onclick="showDialog('collectionedit');">New Collection</button>
+    <div id="collection_table_location">
+
+    </div>
+</div>
+
+<div id="settings_photocredit">
+    Wallpaper by <a href="https://wallpapercave.com/u/andrea16" class="romlink">andrea16</a> / <a href="https://wallpapercave.com/w/wp5206111" class="romlink">Wallpaper Cave</a>
+</div>
+
+<script type="text/javascript">
+    GetCollections();
+    
+    function GetCollections() {
+        ajaxCall('/api/v1/Collections', 'GET', function (result) {
+            if (result) {
+                var targetDiv = document.getElementById('collection_table_location');
+                targetDiv.innerHTML = '';
+
+                var newTable = document.createElement('table');
+                newTable.id = 'romtable';
+                newTable.className = 'romtable';
+                newTable.setAttribute('cellspacing', 0);
+                newTable.appendChild(createTableRow(true, [ 'Name', 'Description', 'Download Status', 'Size', '' ]));
+
+                for (var i = 0; i < result.length; i++) {
+                    var statusText = result[i].buildStatus;
+                    var downloadLink = '';
+                    var packageSize = '-';
+                    switch (result[i].buildStatus) {
+                        case 'NoStatus':
+                            statusText = '-';
+                            break;
+                        case "WaitingForBuild":
+                            statusText = 'Build pending';
+                            break;
+                        case "Building":
+                            statusText = 'Building';
+                            break;
+                        case "Completed":
+                            statusText = 'Available';
+                            downloadLink = '<a href="/api/v1/Collections/' + result[i].id + '/Roms/Zip" class="romlink"><img src="/images/download.svg" class="banner_button_image" alt="Download" title="Download" /></a>';
+                            packageSize = formatBytes(result[i].collectionBuiltSizeBytes);
+                            break;
+                        case "Failed":
+                            statusText = 'Build error';
+                            break;
+                        default:
+                            statusText = result[i].buildStatus;
+                            break;
+                    }
+
+                    var editButton = '<a href="#" onclick="showDialog(\'collectionedit\', ' + result[i].id + ');" class="romlink"><img src="/images/edit.svg" class="banner_button_image" alt="Edit" title="Edit" /></a>';
+
+                    var deleteButton = '<a href="#" onclick="showSubDialog(\'collectiondelete\', ' + result[i].id + ');" class="romlink"><img src="/images/delete.svg" class="banner_button_image" alt="Delete" title="Delete" /></a>';
+
+                    var newRow = [
+                        result[i].name,
+                        result[i].description,
+                        statusText,
+                        packageSize,
+                        '<div style="text-align: right;">' + downloadLink + editButton + deleteButton + '</div>'
+                    ];
+
+                    newTable.appendChild(createTableRow(false, newRow, 'romrow', 'romcell'));
+                }
+
+                targetDiv.appendChild(newTable);
+            }
+        });
+    }
+</script>

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

@@ -0,0 +1,74 @@
+<p>
+    Select collection to add game to:
+</p>
+
+<table style="width: 100%;">
+    <tr>
+        <td colspan="2">
+            <select id="collection_addgame" style="width: 100%;"></select>
+        </td>
+    </tr>
+    <tr>
+        <td style="padding-top: 15px;">
+            <input type="checkbox" id="collection_rebuild" style="margin-right: 5px;" /><label for="collection_rebuild">Rebuild Collection</label>
+        </td>
+        <td style="text-align: right; padding-top: 15px;">
+            <button id="collection_cancelbtn" value="Cancel" onclick="closeSubDialog();">Cancel</button>
+            <button id="collection_addbtn" value="Add" onclick="AddToCollection();">Add</button>
+        </td>
+    </tr>
+</table>
+
+<script type="text/javascript">
+    document.getElementById('collection_addgame').innerHTML = "<option value='0' selected='selected'>Select collection</option>";
+
+    $('#collection_addgame').select2({
+        ajax: {
+            url: '/api/v1/Collections',
+            placeholder: 'Select collection',
+            processResults: function (data) {
+                var arr = [];
+                
+                for (var i = 0; i < data.length; i++) {
+                    arr.push({
+                        id: data[i].id,
+                        text: data[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+            }
+        }
+    });
+
+    function AddToCollection() {
+        var CollectionId = Number(document.getElementById('collection_addgame').value);
+        var PlatformId = modalVariables;
+        var GameId = getQueryString('id', 'int');
+        var RebuildCollection = '';
+        if (document.getElementById('collection_rebuild').checked == true) {
+            RebuildCollection = '?Rebuild=true';
+        }
+        var responseBody = {
+            "PlatformId": PlatformId,
+            "GameId": GameId,
+            "InclusionState": "AlwaysInclude"
+        };
+
+        if (CollectionId != 0) {
+            ajaxCall(
+                '/api/v1/Collections/' + CollectionId + '/AlwaysInclude' + RebuildCollection,
+                'PATCH',
+                function (result) {
+                    closeSubDialog();
+                },
+                function (error) {
+                    console.log(JSON.stringify(error));
+                },
+                JSON.stringify(responseBody)
+            );
+        }
+    }
+</script>

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

@@ -0,0 +1,27 @@
+<p>Are you sure you want to delete this collection?</p>
+<p><strong>Warning:</strong> This cannot be undone!</p>
+<div style="width: 100%; text-align: center;">
+    <div style="display: inline-block; margin-right: 20px;">
+        <button class="redbutton" value="Delete" onclick="deleteCollection();">Delete</button>
+    </div>
+    <div style="display: inline-block; margin-left: 20px;">
+        <button value="Cancel" onclick="closeSubDialog();">Cancel</button>
+    </div>
+</div>
+
+<script type="text/javascript">
+    function deleteCollection() {
+        ajaxCall(
+            '/api/v1/Collections/' + subModalVariables,
+            'DELETE', 
+            function (result) {
+                GetCollections();
+                closeSubDialog();
+            },
+            function (error) {
+                GetCollections();
+                closeSubDialog();
+            }
+        );
+    }
+</script>

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

@@ -0,0 +1,657 @@
+<input id="collection_name" type="text" placeholder="Collection Name" style="width: 80%; font-size: 2em;" />
+<input id="collection_description" type="text" placeholder="Description" style="width: 80%; margin-top: 5px;" />
+
+<div style="position: absolute; top: 90px; right: 5px; left: 10px; bottom: 5px;">
+    <div style="position: relative; width: 100%; height: 100%;">
+        <table style="position: absolute; top: 0px; left: 0px; bottom: 0px; width: 40%;">
+            <tr>
+                <td>
+                    <h3>Filter</h3>
+                </td>
+            </tr>
+        </table>
+        <div id="collection_filter_box" style="position: absolute; top: 40px; left: 0px; bottom: 5px; width: 40%; max-width: 40%; overflow-x: scroll;">
+            <table style="width: 100%;">
+                <tr>
+                    <th style="width: 25%;">Platforms</th>
+                    <td><select id="collection_platform" style="width: 100%;" multiple="multiple"></select></td>
+                </tr>
+                <tr>
+                    <th>Genres</th>
+                    <td><select id="collection_genres" style="width: 100%;" multiple="multiple"></select></td>
+                </tr>
+                <tr>
+                    <th>Players</th>
+                    <td><select id="collection_players" style="width: 100%;" multiple="multiple"></select></td>
+                </tr>
+                <tr>
+                    <th>Player Perspectives</th>
+                    <td><select id="collection_playerperspectives" style="width: 100%;" multiple="multiple"></select></td>
+                </tr>
+                <tr>
+                    <th>Themes</th>
+                    <td><select id="collection_themes" style="width: 100%;" multiple="multiple"></select></td>
+                </tr>
+                <tr>
+                    <th>Rating</th>
+                    <td>
+                        <input id="collection_userrating_min" type="number" placeholder="0" min="0" max="100">
+                        <input id="collection_userrating_max" type="number" placeholder="100" min="0" max="100">
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2">
+                        <h3>Options</h3>
+                    </td>
+                </tr>
+                <tr>
+                    <th>Maximum ROMs per platform</th>
+                    <td><input id="collection_maxroms" type="number" placeholder="0"></td>
+                </tr>
+                <tr>
+                    <th>Maximum size per platform (bytes)</th>
+                    <td><input id="collection_maxplatformsize" type="number" placeholder="0" step="1048576" oninput="DisplayFormattedBytes('collection_maxplatformsize', 'maxplatformsize_label');"><span id="maxplatformsize_label" style="margin-left: 10px;"></span></td>
+                </tr>
+                <tr>
+                    <th>Maximum collection size (bytes)</th>
+                    <td><input id="collection_maxcollectionsize" type="number" placeholder="0" step="1048576" oninput="DisplayFormattedBytes('collection_maxcollectionsize', 'maxcollectionsize_label');"><span id="maxcollectionsize_label" style="margin-left: 10px;"></span></td></td>
+                </tr>
+                <tr>
+                    <th>Directory Layout</th>
+                    <td>
+                        <select id="collection_directorylayout" style="width: 100%;" onchange="DisplayDirectoryLabel();">
+                            <option id="collection_directorylayout_gaseous" selected="selected" value="Gaseous">Standard</option>
+                            <option id="collection_directorylayout_retropie" value="RetroPie">RetroPie</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+
+                    </td>
+                    <td>
+                        <span id="collection_directorylayout_gaseous_label" name="collection_directorylayout_label">
+                            <p>Standard layout: /&lt;IGDB Platform Slug&gt;/&lt;IGDB Game Slug&gt;/Game ROM's</p>
+                            <p>Example: /genesis-slash-megadrive/sonic-the-hedgehog/Sonic the Hedgehog.smd</p>
+                        </span>
+                        <span id="collection_directorylayout_retropie_label" style="display: none;" name="collection_directorylayout_label">
+                            <p>RetroPie layout: /roms/&lt;RetroPie Platform Label&gt;/Game ROM's</p>
+                            <p>Example: /roms/megadrive/Sonic the Hedgehog.smd</p>
+                        </span>
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        Include BIOS files (if available)
+                    </th>
+                    <td>
+                        <select id="collection_includebios" style="width: 100%;">
+                            <option id="collection_includebios_yes" selected="selected" value="true">Yes</option>
+                            <option id="collection_includebios_no" value="false">No</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr id="collection_includebios_label">
+                    <td></td>
+                    <td>
+                        BIOS files for each platform will be stored in /BIOS
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <table style="position: absolute; top: 0px; right: 0px; bottom: 0px; width: 60%;">
+            <tr>
+                <td>
+                    <h3>Collection</h3>
+                </td>
+            </tr>
+        </table>
+        <div id="collectionedit_previewbox" style="position: absolute; top: 40px; right: 0px; bottom: 60px; width: 60%; overflow-x: scroll;">
+            <div id="collectionedit_previewbox_content" style="margin: 5px;">
+                
+            </div>
+        </div>
+        <div id="collectionedit_previewbox_size" style="position: absolute; right: 10px; bottom: 30px; width: 60%; height: 20px; text-align: right;">
+        
+        </div>
+        <div id="collectionedit_previewbox_controls" style="position: absolute; right: 10px; bottom: 0px; width: 60%; height: 25px; text-align: right;">
+            <button id="collectionedit_preview" onclick="GetPreview();">Preview</button>
+            <button id="collectionedit_cancel" onclick="closeDialog();">Cancel</button>
+            <button id="collectionedit_ok" onclick="SaveCollection();">Ok</button>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    var headerToRemove = document.getElementById('modal-heading');
+    if (headerToRemove) {
+        headerToRemove.parentNode.removeChild(headerToRemove);
+    }
+
+    var modalContent = document.getElementsByClassName('modal-content');
+    if (!modalContent[0].classList.contains('collections_modal')) {
+        modalContent[0].classList.add('collections_modal');
+    }
+
+    // setup dropdowns
+    $('#collection_platform').select2({
+        ajax: {
+            url: '/api/v1/Filter',
+            processResults: function (data) {
+                var filter = data['platforms'];
+                
+                var arr = [];
+                
+                for (var i = 0; i < filter.length; i++) {
+                    arr.push({
+                        id: filter[i].id,
+                        text: filter[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+
+            }
+        }
+    });
+
+    $('#collection_genres').select2({
+        ajax: {
+            url: '/api/v1/Filter',
+            processResults: function (data) {
+                var filter = data['genres'];
+
+                var arr = [];
+
+                for (var i = 0; i < filter.length; i++) {
+                    arr.push({
+                        id: filter[i].id,
+                        text: filter[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+
+            }
+        }
+    });
+
+    $('#collection_players').select2({
+        ajax: {
+            url: '/api/v1/Filter',
+            processResults: function (data) {
+                var filter = data['gamemodes'];
+
+                var arr = [];
+
+                for (var i = 0; i < filter.length; i++) {
+                    arr.push({
+                        id: filter[i].id,
+                        text: filter[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+
+            }
+        }
+    });
+
+    $('#collection_playerperspectives').select2({
+        ajax: {
+            url: '/api/v1/Filter',
+            processResults: function (data) {
+                var filter = data['playerperspectives'];
+
+                var arr = [];
+
+                for (var i = 0; i < filter.length; i++) {
+                    arr.push({
+                        id: filter[i].id,
+                        text: filter[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+
+            }
+        }
+    });
+
+    $('#collection_themes').select2({
+        ajax: {
+            url: '/api/v1/Filter',
+            processResults: function (data) {
+                var filter = data['themes'];
+
+                var arr = [];
+
+                for (var i = 0; i < filter.length; i++) {
+                    arr.push({
+                        id: filter[i].id,
+                        text: filter[i].name
+                    });
+                }
+
+                return {
+                    results: arr
+                };
+
+            }
+        }
+    });
+
+    $('#collection_directorylayout').select2();
+
+    $('#collection_includebios').select2();
+
+    if (modalVariables) {
+        var modalAlwaysInclude = [];
+
+        // edit mode
+        ajaxCall(
+            '/api/v1/Collections/' + modalVariables,
+            'GET',
+            function(result) {
+                if (result.name) { document.getElementById('collection_name').value = result.name; }
+                if (result.description) { document.getElementById('collection_description').value = result.description; }
+                if (result.minimumRating != -1) { document.getElementById('collection_userrating_min').value = result.minimumRating; }
+                if (result.maximumRating != -1) { document.getElementById('collection_userrating_max').value = result.maximumRating; }
+                if (result.maximumRomsPerPlatform != -1) { document.getElementById('collection_maxroms').value = result.maximumRomsPerPlatform; }
+                if (result.maximumBytesPerPlatform != -1) { document.getElementById('collection_maxplatformsize').value = result.maximumBytesPerPlatform; }
+                if (result.maximumCollectionSizeInBytes != -1) { document.getElementById('collection_maxcollectionsize').value = result.maximumCollectionSizeInBytes; }
+                if (result.folderStructure) {
+                    $('#collection_directorylayout').val(result.folderStructure).trigger('change');
+                }
+                $('#collection_includebios').val(result.includeBIOSFiles.toString()).trigger('change');
+                modalAlwaysInclude = result.alwaysInclude;
+                console.log(JSON.stringify(modalAlwaysInclude));
+
+                // fill select2 controls
+                $.ajax(
+                    {
+                        url: '/api/v1/Filter',
+                        type: 'GET',
+                        indexValue: result,
+                        dataType: 'json',
+                        contentType: 'application/json',
+                        success: function (data) {
+                            // platforms
+                            for (var i = 0; i < data.platforms.length; i++) {
+                                if (this.indexValue.platforms.includes(data.platforms[i].id)) {
+                                    var newOption = new Option(data.platforms[i].name, data.platforms[i].id, true, true);
+                                    $('#collection_platform').append(newOption).trigger('change');
+                                }
+                            }
+
+                            // genres
+                            for (var i = 0; i < data.genres.length; i++) {
+                                if (this.indexValue.genres.includes(data.genres[i].id)) {
+                                    var newOption = new Option(data.genres[i].name, data.genres[i].id, true, true);
+                                    $('#collection_genres').append(newOption).trigger('change');
+                                }
+                            }
+
+                            // players
+                            for (var i = 0; i < data.gamemodes.length; i++) {
+                                if (this.indexValue.players.includes(data.gamemodes[i].id)) {
+                                    var newOption = new Option(data.gamemodes[i].name, data.gamemodes[i].id, true, true);
+                                    $('#collection_players').append(newOption).trigger('change');
+                                }
+                            }
+
+                            // playerperspectives
+                            for (var i = 0; i < data.playerperspectives.length; i++) {
+                                if (this.indexValue.playerPerspectives.includes(data.playerperspectives[i].id)) {
+                                    var newOption = new Option(data.playerperspectives[i].name, data.playerperspectives[i].id, true, true);
+                                    $('#collection_playerperspectives').append(newOption).trigger('change');
+                                }
+                            }
+
+                            // themes
+                            for (var i = 0; i < data.themes.length; i++) {
+                                if (this.indexValue.themes.includes(data.themes[i].id)) {
+                                    var newOption = new Option(data.themes[i].name, data.themes[i].id, true, true);
+                                    $('#collection_themes').append(newOption).trigger('change');
+                                }
+                            }
+
+                            // generate preview
+                            GetPreview();
+                        },
+                        error: function (error) {
+                            console.log(`Error ${error}`);
+                        }
+                    }
+                );
+            }
+        );
+    } else {
+        // new mode
+    }
+
+    function SaveCollection() {
+        var item = GenerateCollectionItem();
+        if (modalVariables) {
+            // existing object - save over the top
+            item.id = modalVariables;
+            ajaxCall(
+                '/api/v1/Collections/' + modalVariables,
+                'PATCH',
+                function(result) {
+                    location.reload();
+                },
+                function(error) {
+                    alert(error);
+                },
+                JSON.stringify(item)
+            );
+        } else {
+            // new object
+            ajaxCall(
+                '/api/v1/Collections',
+                'POST',
+                function(result) {
+                    location.reload();
+                },
+                function(error) {
+                    alert(error);
+                },
+                JSON.stringify(item)
+            );
+        }
+    }
+
+    function GenerateCollectionItem() {
+        var platforms = GetDropDownIds('#collection_platform');
+        var genres = GetDropDownIds('#collection_genres');
+        var players = GetDropDownIds('#collection_players');
+        var playerperspectives = GetDropDownIds('#collection_playerperspectives');
+        var themes = GetDropDownIds('#collection_themes');
+        var alwaysInclude = [];
+        var alwaysIncludeSelections = document.getElementsByName('collections_preview_always');
+        if (alwaysIncludeSelections.length > 0) {
+            for (var i = 0; i < alwaysIncludeSelections.length; i++) {
+                if (alwaysIncludeSelections[i].value != "None") {
+                    var alwaysIncludeItem = {
+                        "platformId": Number(alwaysIncludeSelections[i].getAttribute('data-platform')),
+                        "gameId": Number(alwaysIncludeSelections[i].getAttribute('data-game')),
+                        "inclusionState": alwaysIncludeSelections[i].value
+                    };
+                    alwaysInclude.push(alwaysIncludeItem);
+                }
+            }
+        } else {
+            alwaysInclude = modalAlwaysInclude;
+        }
+
+        modalAlwaysInclude = alwaysInclude;
+
+        if (!alwaysInclude) {
+            alwaysInclude = [];
+        }
+
+        var item = {
+            "name": document.getElementById('collection_name').value,
+            "description": document.getElementById('collection_description').value,
+            "platforms": platforms,
+            "genres": genres,
+            "players": players,
+            "playerPerspectives": playerperspectives,
+            "themes": themes,
+            "minimumRating": GetNumberFieldValue('collection_userrating_min'),
+            "maximumRating": GetNumberFieldValue('collection_userrating_max'),
+            "maximumRomsPerPlatform": GetNumberFieldValue('collection_maxroms'),
+            "maximumBytesPerPlatform": GetNumberFieldValue('collection_maxplatformsize'),
+            "maximumCollectionSizeInBytes": GetNumberFieldValue('collection_maxcollectionsize'),
+            "folderStructure": GetNumberFieldValue('collection_directorylayout', "Standard"),
+            "includeBIOSFiles": GetBooleanFieldValue('collection_includebios'),
+            "alwaysInclude": alwaysInclude
+        }
+
+        console.log("Item: " + JSON.stringify(item));
+
+        return item;
+    }
+
+    function GetPreview() {
+        var item = GenerateCollectionItem();
+
+        ajaxCall(
+            '/api/v1/Collections/Preview',
+            'POST',
+            function(result) {
+                DisplayPreview(result, 'collectionedit_previewbox_content');
+            },
+            function(error) {
+                console.log(JSON.stringify(error));
+            },
+            JSON.stringify(item)
+        );
+    }
+
+    function GetDropDownIds(objectName) {
+        var obj = $(objectName).select2('data');
+
+        if (obj.length > 0) {
+            var ids = [];
+            for (var i = 0; i < obj.length; i++) {
+                ids.push(obj[i].id);
+            }
+
+            return ids;
+        } else {
+            return [];
+        }
+    }
+
+    function GetNumberFieldValue(objectName, defaultValue) {
+        var obj = document.getElementById(objectName);
+        var objVal = obj.value;
+
+        if (objVal) {
+            return objVal;
+        } else {
+            if (defaultValue) {
+                return defaultValue;
+            } else {
+                return -1;
+            }
+        }
+    }
+
+    function GetBooleanFieldValue(objectName) {
+        var obj = document.getElementById(objectName);
+        var objVal = obj.value;
+
+        if (objVal == "false") {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function DisplayPreview(data, targetDiv) {
+        console.log(JSON.stringify(data));
+        var container = document.getElementById(targetDiv);
+        container.innerHTML = '';
+
+        if (data.collection) {
+            var collectionTable = document.createElement('table');
+            collectionTable.setAttribute('cellspacing', 0);
+            collectionTable.style.width = '100%';
+
+            // loop the platforms
+            for (var p = 0; p < data.collection.length; p++) {
+                var platformItem = data.collection[p];
+
+                var platformLabelRow = document.createElement('tr');
+                var platformLabelCell = document.createElement('th');
+                platformLabelCell.setAttribute('colspan', 2);
+                platformLabelCell.className = 'collections_preview_platform_header';
+                platformLabelCell.innerHTML = '<span style="float: right;">' + formatBytes(platformItem.romSize) + '</span>' + platformItem.name;
+
+                platformLabelRow.appendChild(platformLabelCell);
+                collectionTable.appendChild(platformLabelRow);
+
+                var bgaltindex = 0;
+
+                // loop the games
+                for (var g = 0; g < platformItem.games.length; g++) {
+                    var gameItem = platformItem.games[g];
+
+                    var bgalt = '';
+                    if (bgaltindex == 1) {
+                        bgaltindex = 0;
+                        bgalt = 'bgalt1';
+                    } else {
+                        bgaltindex = 1;
+                        bgalt = 'bgalt0';
+                    }
+
+                    var gameItemRow = document.createElement('tr');
+                    gameItemRow.className = bgalt;
+                    
+                    // game title
+                    var gameTitleCell = document.createElement('th');
+                    gameTitleCell.setAttribute('colspan', 2);
+                    gameTitleCell.className = 'collections_preview_gametitlecell';
+                    
+                    // game always include popup
+                    var gameTitleInclusion = document.createElement('select');
+                    gameTitleInclusion.id = 'collections_preview_always_' + platformItem.id + '_' + gameItem.id;
+                    gameTitleInclusion.name = 'collections_preview_always';
+                    gameTitleInclusion.setAttribute('data-platform', platformItem.id);
+                    gameTitleInclusion.setAttribute('data-game', gameItem.id);
+                    gameTitleInclusion.style.float = 'right';
+
+                    var gameTitleInclusionOptions = [
+                        {
+                            "value": "None",
+                            "text": "Automatic"
+                        },
+                        {
+                            "value": "AlwaysInclude",
+                            "text": "Always Include"
+                        },
+                        {
+                            "value": "AlwaysExclude",
+                            "text": "Always Exclude"
+                        }
+                    ];
+                    for (var i = 0; i < gameTitleInclusionOptions.length; i++) {
+                        var gameTitleInclusionOption = document.createElement('option');
+                        gameTitleInclusionOption.value = gameTitleInclusionOptions[i].value;
+                        gameTitleInclusionOption.innerHTML = gameTitleInclusionOptions[i].text;
+
+                        if (gameItem.inclusionStatus) {
+                            if (gameItem.inclusionStatus.inclusionState == gameTitleInclusionOptions[i].value) {
+                                gameTitleInclusionOption.selected = 'selected';
+                            }
+                        }
+
+                        gameTitleInclusion.appendChild(gameTitleInclusionOption);
+                    }
+                    gameTitleCell.appendChild(gameTitleInclusion);
+
+                    // game title label
+                    var gameTitleLabel = document.createElement('span');
+                    gameTitleLabel.innerHTML = gameItem.name;
+                    gameTitleCell.appendChild(gameTitleLabel);
+
+                    gameItemRow.appendChild(gameTitleCell);
+
+                    // game cover
+                    var gameDetailRow = document.createElement('tr');
+                    gameDetailRow.className = bgalt;
+                    
+                    var gameCoverCell = document.createElement('td');
+                    gameCoverCell.className = 'collections_preview_gamecovercell';
+                    
+                    var gameImage = document.createElement('img');
+                    gameImage.className = 'game_tile_image game_tile_image_small';
+                    if (gameItem.cover) {
+                        gameImage.src = '/api/v1/Games/' + gameItem.id + '/cover/image';
+                    } else {
+                        gameImage.src = '/images/unknowngame.png';
+                        gameImage.className = 'game_tile_image game_tile_image_small unknown';
+                    }
+                    gameCoverCell.appendChild(gameImage);
+
+                    gameDetailRow.appendChild(gameCoverCell);
+
+                    // game detail
+                    var gameDetailCell = document.createElement('td');
+                    gameDetailCell.className = 'collections_preview_gamedetailcell';
+                    
+                    // loop roms
+                    for (var r = 0; r < gameItem.roms.length; r++) {
+                        var romItem = gameItem.roms[r];
+
+                        var romLabel = document.createElement('p');
+                        romLabel.innerHTML = romItem.name;
+
+                        gameDetailCell.appendChild(romLabel);
+                    }
+
+                    gameDetailRow.appendChild(gameDetailCell);
+
+                    collectionTable.appendChild(gameItemRow);
+                    collectionTable.appendChild(gameDetailRow);
+                }
+            }
+
+            container.appendChild(collectionTable);
+
+            var collectionSize = document.getElementById('collectionedit_previewbox_size');
+            collectionSize.innerHTML = "Estimated uncompressed collection size: " + formatBytes(data.collectionProjectedSizeBytes);
+        }
+    }
+
+    function DisplayFormattedBytes(inputElement, labelElement) {
+        var src = document.getElementById(inputElement);
+        var label = document.getElementById(labelElement);
+
+        if (src.value) {
+            label.innerHTML = formatBytes(src.value);
+        } else {
+            label.innerHTML = '';
+        }
+    }
+
+    function DisplayDirectoryLabel() {
+        // hide all labels
+        var directoryLayoutLabels = document.getElementsByName('collection_directorylayout_label');
+        for (var i = 0; i < directoryLayoutLabels.length; i++) {
+            directoryLayoutLabels[i].style.display = 'none';
+        }
+
+        // display the label associated with the selection
+        var directoryLayoutMode = document.getElementById('collection_directorylayout').value;
+
+        var labelToDisplay = '';
+        if (directoryLayoutMode) {
+            switch(directoryLayoutMode) {
+                case "Gaseous":
+                    // standard mode
+                    labelToDisplay = 'collection_directorylayout_gaseous_label';
+                    break;
+
+                case "RetroPie":
+                    labelToDisplay = 'collection_directorylayout_retropie_label'
+                    break;
+
+            }
+            
+            document.getElementById(labelToDisplay).style.display = '';
+        }
+    }
+</script>

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

@@ -0,0 +1,388 @@
+<div style="position: absolute; top: 60px; left: 10px; right: 10px; bottom: 40px; overflow-x: scroll;">
+    <div style="width: 985px;">
+        <h3>Title Matching</h3>
+        <table style="width: 100%;">
+            <tr>
+                <td style="width: 25%; vertical-align: top;">
+                    <h4>Alternative Names</h4>
+                </td>
+                <td>
+                    <select id="mapping_edit_alternativenames" multiple="multiple" style="width: 100%;"></select>
+                </td>
+            </tr>
+            <tr>
+                <td style="width: 25%; vertical-align: top;">
+                    <h4>Supported File Extensions</h4>
+                </td>
+                <td>
+                    <select id="mapping_edit_supportedfileextensions" multiple="multiple" style="width: 100%;"></select>
+                </td>
+            </tr>
+        </table>
+
+        <h3>Collections</h3>
+        <table style="width: 100%;">
+            <tr>
+                <td style="width: 25%;">
+                    <h4>Standard Directory Naming</h4>
+                </td>
+                <td style="text-align: right;">
+                    <input id="mapping_edit_igdbslug" readonly="readonly" type="text" style="width: 98%;"/>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2"><strong>Note</strong>: Standard directory naming uses the IGDB slug for the platform is not editable.</td>
+            </tr>
+            <tr>
+                <td>
+                    <h4>RetroPie Directory Naming</h4>
+                </td>
+                <td style="text-align: right;">
+                    <input id="mapping_edit_retropie" type="text" style="width: 98%;"/>
+                </td>
+            </tr>
+        </table>
+
+        <h3>Web Emulator</h3>
+        <table style="width: 100%;">
+            <tr>
+                <td style="width: 25%;">
+                    <h4>Web Emulator</h4>
+                </td>
+                <td>
+                    <input id="mapping_edit_enablewebemulator" type="checkbox"><label for="mapping_edit_enablewebemulator" style="margin-left: 5px;">Enabled</label>
+                </td>
+            </tr>
+            <tr name="mapping_edit_webemulator">
+                <td style="width: 25%;">
+                    <h4>Engine</h4>
+                </td>
+                <td>
+                    <select id="mapping_edit_webemulatorengine" style="width: 100%;">
+                        
+                    </select>
+                </td>
+            </tr>
+            <tr name="mapping_edit_webemulator">
+                <td style="width: 25%;">
+                    <h4>Core</h4>
+                </td>
+                <td>
+                    <select id="mapping_edit_webemulatorcore" style="width: 100%;">
+
+                    </select>
+                </td>
+            </tr>
+            <tr name="mapping_edit_webemulator">
+                <td style="width: 25%;">
+                
+                </td>
+                <td id="mapping_edit_webemulatorhelp">
+                    
+                </td>
+            </tr>
+        </table>
+
+        <h3>BIOS/Firmware</h3>
+        <div id="mapping_edit_bios"></div>
+    </div>
+</div>
+
+<div style="position: absolute; height: 35px; left: 10px; right: 10px; bottom: 0px; text-align: right;">
+    <button value="Ok" onclick="SubmitMappingItem();">Ok</button>
+</div>
+
+
+
+<script type="text/javascript">
+    var modalContent = document.getElementsByClassName('modal-content');
+    if (!modalContent[0].classList.contains('collections_modal')) {
+        modalContent[0].classList.add('collections_modal');
+    }
+
+    var availableWebEmulators = [];
+
+    DisplayWebEmulatorContent(false);
+
+    ajaxCall(
+        '/api/v1/PlatformMaps/' + modalVariables,
+        'GET',
+        function (result) {
+            // set heading
+            document.getElementById('modal-heading').innerHTML = result.igdbName;
+
+            // populate page
+            $('#mapping_edit_alternativenames').select2 ({
+                tags: true,
+                tokenSeparators: [',']
+            });
+            AddTokensFromList('#mapping_edit_alternativenames', result.alternateNames);
+
+            $('#mapping_edit_supportedfileextensions').select2 ({
+                tags: true,
+                tokenSeparators: [','],
+                createTag: function (params) {
+                    if (params.term.indexOf('.') === -1) {
+                        // Return null to disable tag creation
+                        return null;
+                    }
+
+                    return {
+                        id: params.term.toUpperCase(),
+                        text: params.term.toUpperCase()
+                    }
+                }
+            });
+            AddTokensFromList('#mapping_edit_supportedfileextensions', result.extensions.supportedFileExtensions);
+
+            document.getElementById('mapping_edit_igdbslug').value = result.igdbSlug;
+            document.getElementById('mapping_edit_retropie').value = result.retroPieDirectoryName;
+
+            // set up web emulator drop downs
+            $('#mapping_edit_webemulatorengine').select2();
+            $('#mapping_edit_webemulatorcore').select2();
+
+            // start populating drop downs
+            if (result.webEmulator) {
+                if (result.webEmulator.availableWebEmulators.length > 0) {
+                    availableWebEmulators = result.webEmulator.availableWebEmulators;
+
+                    var offOption = new Option("-", "", false, false);
+                    $('#mapping_edit_webemulatorengine').append(offOption).trigger('change');
+                    for (var e = 0; e < result.webEmulator.availableWebEmulators.length; e++) {
+                        var newOption = new Option(result.webEmulator.availableWebEmulators[e].emulatorType, result.webEmulator.availableWebEmulators[e].emulatorType, false, false);
+                        $('#mapping_edit_webemulatorengine').append(newOption).trigger('change');
+                    }
+                    $('#mapping_edit_webemulatorengine').val(result.webEmulator.type);
+                    $('#mapping_edit_webemulatorengine').trigger('change');
+
+                    // select cores
+                    RenderWebEmulatorCores(result.webEmulator.core);
+
+                    if (result.webEmulator.type.length > 0) {
+                        document.getElementById('mapping_edit_enablewebemulator').checked = true;
+                    }
+                    
+                    DisplayWebEmulatorHelp(result.webEmulator.type);
+
+                    $('#mapping_edit_webemulatorengine').on('change', function(e) {
+                        RenderWebEmulatorCores();
+                    });
+                    if (result.webEmulator.type.length > 0) {
+                        DisplayWebEmulatorContent(true);
+                    } else {
+                        DisplayWebEmulatorContent(false);
+                    }
+                } else {
+                    // no emulators available
+                    DisplayWebEmulatorContent(false);
+                }
+            } else {
+                // no emulators available
+                DisplayWebEmulatorContent(false);
+            }
+
+            var biosTableHeaders = [
+                        {
+                            "name": "filename",
+                            "label": "Filename"
+                        },
+                        {
+                            "name": "description",
+                            "label": "Description"
+                        },
+                        {
+                            "name": "hash",
+                            "label": "MD5 Hash"
+                        }
+                    ];
+            document.getElementById('mapping_edit_bios').appendChild(
+                CreateEditableTable(
+                    'bios',
+                    biosTableHeaders
+                )
+            );
+
+            LoadEditableTableData('bios', biosTableHeaders, result.bios);
+        }
+    );
+
+    function RenderWebEmulatorCores(preSelectCore) {
+        var selectedEngine = document.getElementById('mapping_edit_webemulatorengine').value;
+        console.log("Engine: " + selectedEngine);
+        console.log("Preselect: " + preSelectCore);
+        console.log(JSON.stringify(availableWebEmulators));
+        $('#mapping_edit_webemulatorcore').empty().trigger("change");
+
+        // get cores for currently selected emulator
+        if (availableWebEmulators && (selectedEngine != undefined && selectedEngine != "")) {
+            if (availableWebEmulators.length > 0) {
+                var emuFound = false;
+                for (var e = 0; e < availableWebEmulators.length; e++) {
+                    if (availableWebEmulators[e].emulatorType == selectedEngine) {
+                        emuFound = true;
+                        for (var c = 0; c < availableWebEmulators[e].availableWebEmulatorCores.length; c++) {
+                            var coreName = availableWebEmulators[e].availableWebEmulatorCores[c].core;
+                            if (availableWebEmulators[e].availableWebEmulatorCores[c].alternateCoreName) {
+                                coreName += " (Maps to core: " + availableWebEmulators[e].availableWebEmulatorCores[c].alternateCoreName + ")";
+                            }
+                            if (availableWebEmulators[e].availableWebEmulatorCores[c].default == true) {
+                                coreName += " (Default)";
+                            }
+                            console.log(coreName);
+
+                            var newOption;
+                            if (availableWebEmulators[e].availableWebEmulatorCores[c].core == preSelectCore) {
+                                newOption = new Option(coreName, availableWebEmulators[e].availableWebEmulatorCores[c].core, true, true);
+                            } else {
+                                newOption = new Option(coreName, availableWebEmulators[e].availableWebEmulatorCores[c].core, false, false);
+                            }
+                            $('#mapping_edit_webemulatorcore').append(newOption).trigger('change');
+                        }
+                    }
+                }
+
+                if (emuFound == false) {
+                    var newOption = new Option("-", "", true, true);
+                    $('#mapping_edit_webemulatorcore').append(newOption).trigger('change');
+                }
+            } else {
+                var newOption = new Option("-", "", true, true);
+                $('#mapping_edit_webemulatorcore').append(newOption).trigger('change');
+            }
+        } else {
+            var newOption = new Option("-", "", true, true);
+            $('#mapping_edit_webemulatorcore').append(newOption).trigger('change');
+        }
+    }
+
+    function AddTokensFromList(selectObj, tagList) {
+        for (var i = 0; i < tagList.length; i++) {
+            var data = {
+                id: tagList[i],
+                text: tagList[i]
+            }
+
+            var newOption = new Option(data.text, data.id, true, true);
+            $(selectObj).append(newOption).trigger('change');
+        }
+    }
+
+    function SubmitMappingItem() {
+        var alternateNames = [];
+        for (var i = 0; i < document.getElementById('mapping_edit_alternativenames').childNodes.length; i++) {
+            var optionObj = document.getElementById('mapping_edit_alternativenames').childNodes[i];
+            alternateNames.push(optionObj.innerHTML);
+        }
+
+        var knownExtensions = $('#mapping_edit_supportedfileextensions').val();
+        
+        var extensions = {
+            "IGDBId": modalVariables,
+            "supportedFileExtensions": knownExtensions,
+            "uniqueFileExtensions": knownExtensions
+        };
+
+        var emulator = null;
+        if (document.getElementById('mapping_edit_enablewebemulator').checked == true) {
+            emulator = {
+                "type": document.getElementById('mapping_edit_webemulatorengine').value,
+                "core": document.getElementById('mapping_edit_webemulatorcore').value
+            };
+        }
+
+        var bios = [];
+        var biosTable = document.getElementById('EditableTable_bios');
+        // get rows
+        for (var i = 0; i < biosTable.childNodes.length; i++) {
+            var rowObj = biosTable.childNodes[i];
+            var biosObj = {};
+            var addBiosObj = false;
+
+            // get cells
+            for (var v = 0; v < rowObj.childNodes.length; v++) {
+                var cell = rowObj.childNodes[v];
+                if (cell.tagName.toLowerCase() != 'th') {
+                    // get input boxes
+                    for (var c = 0; c < cell.childNodes.length; c++) {
+                        var element = cell.childNodes[c];
+                        if (element) {
+                            if (element.getAttribute('data-cell')) {
+                                var nodeName = element.getAttribute('data-cell');
+                                biosObj[nodeName] = element.value;
+                                addBiosObj = true;
+                                
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (addBiosObj == true) {
+                bios.push(biosObj);
+            }
+        }
+
+        var item = {
+            "igdbId": Number(modalVariables),
+            "igdbName": document.getElementById('modal-heading').innerHTML,
+            "igdbSlug": document.getElementById('mapping_edit_igdbslug').value,
+            "alternateNames": alternateNames,
+            "extensions": extensions,
+            "retroPieDirectoryName": document.getElementById('mapping_edit_retropie').value,
+            "webEmulator": emulator,
+            "bios": bios
+        };
+
+        console.log(JSON.stringify(item));
+
+        ajaxCall(
+            '/api/v1/PlatformMaps/' + modalVariables,
+            'PATCH',
+            function (result) {
+                loadPlatformMapping();
+                closeDialog();
+            },
+            function (error) {
+                console.error(JSON.stringify(error));
+            },
+            JSON.stringify(item)
+        );
+    }
+
+    $('#mapping_edit_webemulatorengine').on('select2:select', function (e) {
+        DisplayWebEmulatorHelp(e.params.data.id);
+    });
+
+    function DisplayWebEmulatorHelp(Emulator) {
+        var helpCell = document.getElementById('mapping_edit_webemulatorhelp');
+        switch (Emulator) {
+            case 'EmulatorJS':
+                helpCell.innerHTML = '<img src="/images/help.svg" class="banner_button_image banner_button_image_smaller" alt="Help" title="Help" /> See <a href="https://emulatorjs.org/docs4devs/Cores.html" target="_blank" class="romlink">https://emulatorjs.org/docs4devs/Cores.html</a> for more information regarding EmulatorJS cores.';
+                break;
+
+            default:
+                helpCell.innerHTML = '';
+                break;
+
+        }
+    }
+
+    $('#mapping_edit_enablewebemulator').change(function() {
+        DisplayWebEmulatorContent(this.checked);
+    });
+
+    function DisplayWebEmulatorContent(showContent) {
+        console.log(showContent);
+        var webEmulatorRows = document.getElementsByName('mapping_edit_webemulator');
+
+        for (var i = 0; i < webEmulatorRows.length; i++) {
+            if (showContent == true) {
+                webEmulatorRows[i].style.display = '';
+            } else {
+                webEmulatorRows[i].style.display = 'none';
+            }
+        }
+    }
+</script>

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

@@ -1,16 +1,6 @@
-<!-- The Modal -->
-<div id="myModalSub" class="modal">
-
-    <!-- Modal content -->
-    <div class="modal-content-sub">
-        <span id="modal-close-sub" class="close">&times;</span>
-       <div id="modal-content-sub">Some text in the Modal..</div>
-    </div>
-
-</div>
-
-<div id="properties_toc">
+<div id="properties_toc">
     <div id="properties_toc_general" name="properties_toc_item" onclick="SelectTab('general');">General</div>
+    <div id="properties_toc_attributes" name="properties_toc_item" onclick="SelectTab('attributes');">Attributes</div>
     <div id="properties_toc_match" name="properties_toc_item" onclick="SelectTab('match');">Title Match</div>
     <!--<div id="properties_toc_manage" name="properties_toc_item" onclick="SelectTab('manage');">Manage</div>-->
 </div>
@@ -50,8 +40,8 @@
                 <td id="rominfo_signaturematch"></td>
             </tr>
             <tr>
-                <th>Signature Source Flags</th>
-                <td id="rominfo_flags"></td>
+                <th>Signature Game Title</th>
+                <td id="rominfo_signaturetitle"></td>
             </tr>
             <tr>
                 <td colspan="2" style="text-align: right;"><button id="romDelete" class="redbutton">Delete</button></td>
@@ -59,6 +49,10 @@
         </table>
     </div>
 
+    <div id="properties_bodypanel_attributes" name="properties_tab" style="display: none;">
+        
+    </div>
+
     <div id="properties_bodypanel_match" name="properties_tab" style="display: none;">
         <table style="width: 100%;">
             <tr>
@@ -85,9 +79,10 @@
     </div>
 </div>
 
-<script type="text/javascript">document.getElementById('modal-heading').innerHTML = "Properties";
+<script type="text/javascript">
+    document.getElementById('modal-heading').innerHTML = "Properties";
 
-    var gameId = urlParams.get('id');
+    var gameId = getQueryString('id', 'int');
 
     var romData;
 
@@ -123,7 +118,6 @@
         romData = result;
         document.getElementById('modal-heading').innerHTML = result.name;
         document.getElementById('rominfo_platform').innerHTML = result.platform.name;
-        //document.getElementById('rominfo_filename').innerHTML = result.name;
         document.getElementById('rominfo_size').innerHTML = formatBytes(result.size, 2);
         document.getElementById('rominfo_type').innerHTML = getRomType(result.romType);
         document.getElementById('rominfo_mediatype').innerHTML = result.romTypeMedia;
@@ -131,10 +125,16 @@
         document.getElementById('rominfo_md5').innerHTML = result.mD5;
         document.getElementById('rominfo_sha1').innerHTML = result.shA1;
         document.getElementById('rominfo_signaturematch').innerHTML = result.source;
-        document.getElementById('rominfo_flags').innerHTML = result.flags;
+        document.getElementById('rominfo_signaturetitle').innerHTML = result.signatureSourceGameTitle;
 
         document.getElementById('properties_fixplatform').innerHTML = "<option value='" + result.platform.id + "' selected='selected'>" + result.platform.name + "</option>";
         document.getElementById('properties_fixgame').innerHTML = "<option value='" + gameData.id + "' selected='selected'>" + gameData.name + "</option>";
+
+        if (result.attributes.length > 0) {
+            document.getElementById('properties_bodypanel_attributes').appendChild(BuildAttributesTable(result.attributes, result.source));
+        } else {
+            document.getElementById('properties_toc_attributes').style.display = 'none';
+        }
     });
 
     function SelectTab(TabName) {
@@ -221,27 +221,6 @@
         }
     });
 
-    function DropDownRenderGameOption(state) {
-        console.log(JSON.stringify(state));
-
-        if (state.loading) {
-            return state;
-        }
-
-        var response;
-
-        if (state.cover) {
-            response = $(
-                '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="https://images.igdb.com/igdb/image/upload/t_cover_small/' + state.cover.value.imageId + '.jpg" /></td><td class="dropdown-label"><span>' + state.text + '</span></td></tr></table>'
-            );
-        } else {
-            response = $(
-                '<table class="dropdown-div"><tr><td class="dropdown-cover"><img src="/images/unknowngame.png" /></td><td class="dropdown-label"><span>' + state.text + '</span></td></tr></table>'
-            );
-        }
-        return response;
-    }
-
     function SaveFixedGame() {
         var fixplatform = $('#properties_fixplatform').select2('data');
         var fixgame = $('#properties_fixgame').select2('data');
@@ -253,46 +232,55 @@
         });
     }
 
-    var subModalVariables;
+    function BuildAttributesTable(attributes, sourceName) {
+        var aTable = document.createElement('table');
+        aTable.style.width = '100%';
 
-    function showSubDialog(dialogPage, variables) {
-        // Get the modal
-        var submodal = document.getElementById("myModalSub");
+        for (var i = 0; i < attributes.length; i++) {
+            var aRow = document.createElement('tr');
 
-        // Get the modal content
-        var subModalContent = document.getElementById("modal-content-sub");
+            var aTitleCell = document.createElement('th');
+            aTitleCell.width = "25%";
+            if (sourceName == "TOSEC") {
+                aTitleCell.innerHTML = ConvertTOSECAttributeName(attributes[i].key);
+            } else {
+                aTitleCell.innerHTML = attributes[i].key;
+            }
+            aRow.appendChild(aTitleCell);
 
-        // Get the button that opens the modal
-        var subbtn = document.getElementById("romDelete");
+            var aValueCell = document.createElement('td');
+            aValueCell.width = "75%";
+            aValueCell.innerHTML = attributes[i].value;
+            aRow.appendChild(aValueCell);
 
-        // Get the <span> element that closes the modal
-        var subspan = document.getElementById("modal-close-sub");
-
-        // When the user clicks on the button, open the modal 
-        submodal.style.display = "block";
-
-        // When the user clicks on <span> (x), close the modal
-        subspan.onclick = function () {
-            submodal.style.display = "none";
-            subModalContent.innerHTML = "";
-            subModalVariables = null;
+            aTable.appendChild(aRow);
         }
 
-        subModalVariables = modalVariables;
-
-        $('#modal-content-sub').load('/pages/dialogs/' + dialogPage + '.html');
+        return aTable;
     }
 
-    function closeSubDialog() {
-        // Get the modal
-        var submodal = document.getElementById("myModalSub");
+    function ConvertTOSECAttributeName(attributeName) {
+        var tosecAttributeNames = {
+            "cr": "Cracked",
+            "f" : "Fixed",
+            "h" : "Hacked",
+            "m" : "Modified",
+            "p" : "Pirated",
+            "t" : "Trained",
+            "tr": "Translated",
+            "o" : "Over Dump",
+            "u" : "Under Dump",
+            "v" : "Virus",
+            "b" : "Bad Dump",
+            "a" : "Alternate",
+            "!" : "Known Verified Dump"
+        };
 
-        // Get the modal content
-        var subModalContent = document.getElementById("modal-content-sub");
-
-        submodal.style.display = "none";
-        subModalContent.innerHTML = "";
-        subModalVariables = null;
+        if (attributeName in tosecAttributeNames) {
+            return tosecAttributeNames[attributeName];
+        } else {
+            return attributeName;
+        }
     }
 
     SelectTab('general');