diff --git a/Gaseous.sln b/Gaseous.sln index 0161b45..cca272b 100644 --- a/Gaseous.sln +++ b/Gaseous.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 25.0.1704.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-tools", "gaseous-tools\gaseous-tools.csproj", "{08FE408A-5EC1-4110-ABD8-D19A1155B8CE}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "gaseous-server", "gaseous-server\gaseous-server.csproj", "{A01D2EFF-C82E-473B-84D7-7C25E736F5D2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{17FA6F12-8532-420C-9489-CB8FDE42137C}" @@ -37,10 +35,6 @@ Global {FFCEC386-033F-4772-A45B-D33579F2E5EE}.Debug|Any CPU.Build.0 = Debug|Any CPU {FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {FFCEC386-033F-4772-A45B-D33579F2E5EE}.Release|Any CPU.Build.0 = Release|Any CPU - {08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08FE408A-5EC1-4110-ABD8-D19A1155B8CE}.Release|Any CPU.Build.0 = Release|Any CPU {A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Debug|Any CPU.Build.0 = Debug|Any CPU {A01D2EFF-C82E-473B-84D7-7C25E736F5D2}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/gaseous-server/Classes/Bios.cs b/gaseous-server/Classes/Bios.cs index aaf21c4..de1aea6 100644 --- a/gaseous-server/Classes/Bios.cs +++ b/gaseous-server/Classes/Bios.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.InteropServices; using System.Security.Cryptography; -using gaseous_tools; namespace gaseous_server.Classes { diff --git a/gaseous-server/Classes/Collections.cs b/gaseous-server/Classes/Collections.cs index 6f53637..e51af93 100644 --- a/gaseous-server/Classes/Collections.cs +++ b/gaseous-server/Classes/Collections.cs @@ -7,7 +7,6 @@ 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; @@ -21,7 +20,7 @@ namespace gaseous_server.Classes } public static List GetCollections() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM RomCollections ORDER BY `Name`"; DataTable data = db.ExecuteCMD(sql); @@ -36,7 +35,7 @@ namespace gaseous_server.Classes } public static CollectionItem GetCollection(long Id) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM RomCollections WHERE Id = @id ORDER BY `Name`"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -57,7 +56,7 @@ namespace gaseous_server.Classes public static CollectionItem NewCollection(CollectionItem item) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "INSERT INTO RomCollections (`Name`, Description, Platforms, Genres, Players, PlayerPerspectives, Themes, MinimumRating, MaximumRating, MaximumRomsPerPlatform, MaximumBytesPerPlatform, MaximumCollectionSizeInBytes, 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 dbDict = new Dictionary(); dbDict.Add("name", item.Name); @@ -88,7 +87,7 @@ namespace gaseous_server.Classes public static CollectionItem EditCollection(long Id, CollectionItem item, bool ForceRebuild = true) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "UPDATE RomCollections SET `Name`=@name, Description=@description, Platforms=@platforms, Genres=@genres, Players=@players, PlayerPerspectives=@playerperspectives, Themes=@themes, MinimumRating=@minimumrating, MaximumRating=@maximumrating, MaximumRomsPerPlatform=@maximumromsperplatform, MaximumBytesPerPlatform=@maximumbytesperplatform, MaximumCollectionSizeInBytes=@maximumcollectionsizeinbytes, FolderStructure=@folderstructure, IncludeBIOSFiles=@includebiosfiles, AlwaysInclude=@alwaysinclude, BuiltStatus=@builtstatus WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -143,7 +142,7 @@ namespace gaseous_server.Classes public static void DeleteCollection(long Id) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "DELETE FROM RomCollections WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -163,7 +162,7 @@ namespace gaseous_server.Classes if (collectionItem.BuildStatus != CollectionItem.CollectionBuildStatus.Building) { // set collection item to waitingforbuild - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "UPDATE RomCollections SET BuiltStatus=@bs WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -363,7 +362,7 @@ namespace gaseous_server.Classes public static void CompileCollections(long CollectionId) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); CollectionItem collectionItem = GetCollection(CollectionId); if (collectionItem.BuildStatus == CollectionItem.CollectionBuildStatus.WaitingForBuild) diff --git a/gaseous-tools/Common.cs b/gaseous-server/Classes/Common.cs similarity index 98% rename from gaseous-tools/Common.cs rename to gaseous-server/Classes/Common.cs index 6d30b63..5a2e893 100644 --- a/gaseous-tools/Common.cs +++ b/gaseous-server/Classes/Common.cs @@ -1,7 +1,7 @@ using System; using System.Security.Cryptography; -namespace gaseous_tools +namespace gaseous_server.Classes { public class Common { diff --git a/gaseous-tools/Config.cs b/gaseous-server/Classes/Config.cs similarity index 99% rename from gaseous-tools/Config.cs rename to gaseous-server/Classes/Config.cs index dc1a282..0c1eb2a 100644 --- a/gaseous-tools/Config.cs +++ b/gaseous-server/Classes/Config.cs @@ -3,7 +3,7 @@ using System.Data; using Newtonsoft.Json; using IGDB.Models; -namespace gaseous_tools +namespace gaseous_server.Classes { public static class Config { diff --git a/gaseous-tools/Database.cs b/gaseous-server/Classes/Database.cs similarity index 97% rename from gaseous-tools/Database.cs rename to gaseous-server/Classes/Database.cs index dd839a3..5b67b39 100644 --- a/gaseous-tools/Database.cs +++ b/gaseous-server/Classes/Database.cs @@ -4,9 +4,8 @@ using System.Data.SqlClient; using System.Diagnostics; using System.Reflection; using MySqlConnector; -using static gaseous_tools.Database; -namespace gaseous_tools +namespace gaseous_server.Classes { public class Database { @@ -81,7 +80,7 @@ namespace gaseous_tools for (int i = 1000; i < 10000; i++) { - string resourceName = "gaseous_tools.Database.MySQL.gaseous-" + i + ".sql"; + string resourceName = "gaseous_server.Support.Database.MySQL.gaseous-" + i + ".sql"; string dbScript = ""; string[] resources = Assembly.GetExecutingAssembly().GetManifestResourceNames(); @@ -109,7 +108,7 @@ namespace gaseous_tools if (SchemaVer < i) { // run pre-upgrade code - gaseous_tools.DatabaseMigration.PreUpgradeScript(i, _ConnectorType); + DatabaseMigration.PreUpgradeScript(i, _ConnectorType); // apply schema! Logging.Log(Logging.LogType.Information, "Database", "Updating schema to version " + i); @@ -121,7 +120,7 @@ namespace gaseous_tools ExecuteCMD(sql, dbDict); // run post-upgrade code - gaseous_tools.DatabaseMigration.PostUpgradeScript(i, _ConnectorType); + DatabaseMigration.PostUpgradeScript(i, _ConnectorType); } } } diff --git a/gaseous-tools/DatabaseMigration.cs b/gaseous-server/Classes/DatabaseMigration.cs similarity index 94% rename from gaseous-tools/DatabaseMigration.cs rename to gaseous-server/Classes/DatabaseMigration.cs index eb9487a..a101335 100644 --- a/gaseous-tools/DatabaseMigration.cs +++ b/gaseous-server/Classes/DatabaseMigration.cs @@ -1,20 +1,20 @@ using System; using System.Data; -namespace gaseous_tools +namespace gaseous_server.Classes { public static class DatabaseMigration { public static List BackgroundUpgradeTargetSchemaVersions = new List(); - public static void PreUpgradeScript(int TargetSchemaVersion, gaseous_tools.Database.databaseType? DatabaseType) + public static void PreUpgradeScript(int TargetSchemaVersion, Database.databaseType? DatabaseType) { } - public static void PostUpgradeScript(int TargetSchemaVersion, gaseous_tools.Database.databaseType? DatabaseType) + public static void PostUpgradeScript(int TargetSchemaVersion, Database.databaseType? DatabaseType) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); Dictionary dbDict = new Dictionary(); switch(DatabaseType) @@ -65,7 +65,7 @@ namespace gaseous_tools } public static void MySql_1002_MigrateMetadataVersion() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; Dictionary dbDict = new Dictionary(); diff --git a/gaseous-server/Classes/GameLibrary.cs b/gaseous-server/Classes/GameLibrary.cs index e7d7489..4626aff 100644 --- a/gaseous-server/Classes/GameLibrary.cs +++ b/gaseous-server/Classes/GameLibrary.cs @@ -1,7 +1,7 @@ using System; using System.Data; +using gaseous_server.Classes; using gaseous_server.Classes.Metadata; -using gaseous_tools; using IGDB.Models; using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow; @@ -39,7 +39,7 @@ namespace gaseous_server { get { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM GameLibraries WHERE DefaultLibrary=1 LIMIT 1"; DataTable data = db.ExecuteCMD(sql); DataRow row = data.Rows[0]; @@ -54,7 +54,7 @@ namespace gaseous_server get { List libraryItems = new List(); - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM GameLibraries"; DataTable data = db.ExecuteCMD(sql); foreach (DataRow row in data.Rows) @@ -86,7 +86,7 @@ namespace gaseous_server throw new PathNotFound(PathName); } - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "INSERT INTO GameLibraries (Name, Path, DefaultPlatform, DefaultLibrary) VALUES (@name, @path, @defaultplatform, 0); SELECT CAST(LAST_INSERT_ID() AS SIGNED);"; Dictionary dbDict = new Dictionary(); dbDict.Add("name", Name); @@ -103,7 +103,7 @@ namespace gaseous_server { if (GetLibrary(LibraryId).IsDefaultLibrary == false) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "DELETE FROM Games_Roms WHERE LibraryId=@id; DELETE FROM GameLibraries WHERE Id=@id;"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", LibraryId); @@ -117,7 +117,7 @@ namespace gaseous_server public static LibraryItem GetLibrary(int LibraryId) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM GameLibraries WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", LibraryId); diff --git a/gaseous-server/Classes/ImportGames.cs b/gaseous-server/Classes/ImportGames.cs index 6a71c6d..97ea9f4 100644 --- a/gaseous-server/Classes/ImportGames.cs +++ b/gaseous-server/Classes/ImportGames.cs @@ -5,7 +5,6 @@ using System.Security.Policy; using System.Text.RegularExpressions; using System.Threading.Tasks; using gaseous_server.Classes.Metadata; -using gaseous_tools; using IGDB.Models; using NuGet.Common; using static gaseous_server.Classes.Metadata.Games; @@ -45,7 +44,7 @@ namespace gaseous_server.Classes { public static void ImportGameFile(string GameFileImportPath, IGDB.Models.Platform? OverridePlatform) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; Dictionary dbDict = new Dictionary(); @@ -418,7 +417,7 @@ namespace gaseous_server.Classes public static long StoreROM(GameLibrary.LibraryItem library, Common.hashObject hash, IGDB.Models.Game determinedGame, IGDB.Models.Platform determinedPlatform, Models.Signatures_Games discoveredSignature, string GameFileImportPath, long UpdateId = 0) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; @@ -541,7 +540,7 @@ namespace gaseous_server.Classes File.Move(romPath, DestinationPath); // update the db - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "UPDATE Games_Roms SET Path=@path WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", RomId); @@ -566,7 +565,7 @@ namespace gaseous_server.Classes GameLibrary.LibraryItem library = GameLibrary.GetDefaultLibrary; // move rom files to their new location - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM Games_Roms WHERE LibraryId = @libraryid"; Dictionary dbDict = new Dictionary(); dbDict.Add("libraryid", library.Id); diff --git a/gaseous-tools/Logging.cs b/gaseous-server/Classes/Logging.cs similarity index 95% rename from gaseous-tools/Logging.cs rename to gaseous-server/Classes/Logging.cs index d8abc97..149be8c 100644 --- a/gaseous-tools/Logging.cs +++ b/gaseous-server/Classes/Logging.cs @@ -3,7 +3,7 @@ using System.Data; using System.Diagnostics; using System.Reflection; using System.Reflection.Metadata.Ecma335; -namespace gaseous_tools +namespace gaseous_server.Classes { public class Logging { @@ -69,7 +69,7 @@ namespace gaseous_tools if (LogToDiskOnly == false) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate; INSERT INTO ServerLogs (EventTime, EventType, Process, Message, Exception) VALUES (@EventTime, @EventType, @Process, @Message, @Exception);"; Dictionary dbDict = new Dictionary(); dbDict.Add("EventRententionDate", DateTime.UtcNow.AddDays(Config.LoggingConfiguration.LogRetention * -1)); @@ -112,7 +112,7 @@ namespace gaseous_tools static public List GetLogs(long? StartIndex, int PageNumber = 1, int PageSize = 100) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; if (StartIndex == null) { diff --git a/gaseous-server/Classes/Maintenance.cs b/gaseous-server/Classes/Maintenance.cs index 8b9c3f1..3e87e5c 100644 --- a/gaseous-server/Classes/Maintenance.cs +++ b/gaseous-server/Classes/Maintenance.cs @@ -1,7 +1,6 @@ using System; using System.Data; using gaseous_server.Models; -using gaseous_tools; using Microsoft.VisualStudio.Web.CodeGeneration; namespace gaseous_server.Classes @@ -46,7 +45,7 @@ namespace gaseous_server.Classes } Logging.Log(Logging.LogType.Information, "Maintenance", "Optimising database tables"); - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SHOW TABLES;"; DataTable tables = db.ExecuteCMD(sql); diff --git a/gaseous-server/Classes/Metadata/AgeRating.cs b/gaseous-server/Classes/Metadata/AgeRating.cs index 100b30a..1960874 100644 --- a/gaseous-server/Classes/Metadata/AgeRating.cs +++ b/gaseous-server/Classes/Metadata/AgeRating.cs @@ -1,9 +1,7 @@ using System; using System.Reflection; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; namespace gaseous_server.Classes.Metadata { @@ -83,7 +81,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs b/gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs index 6142c56..f9b15aa 100644 --- a/gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs +++ b/gaseous-server/Classes/Metadata/AgeRatingContentDescriptions.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/AlternativeNames.cs b/gaseous-server/Classes/Metadata/AlternativeNames.cs index 59aec3d..a64b873 100644 --- a/gaseous-server/Classes/Metadata/AlternativeNames.cs +++ b/gaseous-server/Classes/Metadata/AlternativeNames.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Artworks.cs b/gaseous-server/Classes/Metadata/Artworks.cs index 35b2c81..d3c7680 100644 --- a/gaseous-server/Classes/Metadata/Artworks.cs +++ b/gaseous-server/Classes/Metadata/Artworks.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -84,7 +83,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Collections.cs b/gaseous-server/Classes/Metadata/Collections.cs index 0c0b639..aabb400 100644 --- a/gaseous-server/Classes/Metadata/Collections.cs +++ b/gaseous-server/Classes/Metadata/Collections.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Company.cs b/gaseous-server/Classes/Metadata/Company.cs index fc21e66..73276f6 100644 --- a/gaseous-server/Classes/Metadata/Company.cs +++ b/gaseous-server/Classes/Metadata/Company.cs @@ -1,5 +1,4 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/CompanyLogos.cs b/gaseous-server/Classes/Metadata/CompanyLogos.cs index a25a468..2b83d70 100644 --- a/gaseous-server/Classes/Metadata/CompanyLogos.cs +++ b/gaseous-server/Classes/Metadata/CompanyLogos.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -87,7 +86,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Covers.cs b/gaseous-server/Classes/Metadata/Covers.cs index f2ce3d7..1e7dc12 100644 --- a/gaseous-server/Classes/Metadata/Covers.cs +++ b/gaseous-server/Classes/Metadata/Covers.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -84,7 +83,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/ExternalGames.cs b/gaseous-server/Classes/Metadata/ExternalGames.cs index c0c42e6..a36969f 100644 --- a/gaseous-server/Classes/Metadata/ExternalGames.cs +++ b/gaseous-server/Classes/Metadata/ExternalGames.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -84,7 +83,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Franchises.cs b/gaseous-server/Classes/Metadata/Franchises.cs index 63e10b1..191981f 100644 --- a/gaseous-server/Classes/Metadata/Franchises.cs +++ b/gaseous-server/Classes/Metadata/Franchises.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/GameModes.cs b/gaseous-server/Classes/Metadata/GameModes.cs index e80653e..d059082 100644 --- a/gaseous-server/Classes/Metadata/GameModes.cs +++ b/gaseous-server/Classes/Metadata/GameModes.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/GameVideos.cs b/gaseous-server/Classes/Metadata/GameVideos.cs index 1e28139..dec63fb 100644 --- a/gaseous-server/Classes/Metadata/GameVideos.cs +++ b/gaseous-server/Classes/Metadata/GameVideos.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Games.cs b/gaseous-server/Classes/Metadata/Games.cs index c89b4b9..863e360 100644 --- a/gaseous-server/Classes/Metadata/Games.cs +++ b/gaseous-server/Classes/Metadata/Games.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using gaseous_tools; using IGDB; using IGDB.Models; @@ -116,7 +115,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } return returnValue; diff --git a/gaseous-server/Classes/Metadata/Genres.cs b/gaseous-server/Classes/Metadata/Genres.cs index a889920..47c630b 100644 --- a/gaseous-server/Classes/Metadata/Genres.cs +++ b/gaseous-server/Classes/Metadata/Genres.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/InvolvedCompany.cs b/gaseous-server/Classes/Metadata/InvolvedCompany.cs index 8ff46ec..9c01074 100644 --- a/gaseous-server/Classes/Metadata/InvolvedCompany.cs +++ b/gaseous-server/Classes/Metadata/InvolvedCompany.cs @@ -1,5 +1,4 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/MultiplayerModes.cs b/gaseous-server/Classes/Metadata/MultiplayerModes.cs index 040eda1..e77072b 100644 --- a/gaseous-server/Classes/Metadata/MultiplayerModes.cs +++ b/gaseous-server/Classes/Metadata/MultiplayerModes.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -81,7 +80,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/PlatformLogos.cs b/gaseous-server/Classes/Metadata/PlatformLogos.cs index 072d2ec..08d855a 100644 --- a/gaseous-server/Classes/Metadata/PlatformLogos.cs +++ b/gaseous-server/Classes/Metadata/PlatformLogos.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -87,7 +86,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/PlatformVersions.cs b/gaseous-server/Classes/Metadata/PlatformVersions.cs index ba03fb8..ecb7890 100644 --- a/gaseous-server/Classes/Metadata/PlatformVersions.cs +++ b/gaseous-server/Classes/Metadata/PlatformVersions.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using gaseous_tools; using IGDB; using IGDB.Models; @@ -86,7 +85,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } return returnValue; diff --git a/gaseous-server/Classes/Metadata/Platforms.cs b/gaseous-server/Classes/Metadata/Platforms.cs index c360e3d..7cf5af4 100644 --- a/gaseous-server/Classes/Metadata/Platforms.cs +++ b/gaseous-server/Classes/Metadata/Platforms.cs @@ -1,7 +1,6 @@ using System; using System.Data; using System.Net; -using gaseous_tools; using IGDB; using IGDB.Models; diff --git a/gaseous-server/Classes/Metadata/PlayerPerspectives.cs b/gaseous-server/Classes/Metadata/PlayerPerspectives.cs index c85fc2d..f9310a6 100644 --- a/gaseous-server/Classes/Metadata/PlayerPerspectives.cs +++ b/gaseous-server/Classes/Metadata/PlayerPerspectives.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -83,7 +82,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Screenshots.cs b/gaseous-server/Classes/Metadata/Screenshots.cs index 5244dc1..32e59e9 100644 --- a/gaseous-server/Classes/Metadata/Screenshots.cs +++ b/gaseous-server/Classes/Metadata/Screenshots.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -85,7 +84,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); returnValue = Storage.GetCacheValue(returnValue, "id", (long)searchValue); } break; diff --git a/gaseous-server/Classes/Metadata/Storage.cs b/gaseous-server/Classes/Metadata/Storage.cs index 763cffd..20898ff 100644 --- a/gaseous-server/Classes/Metadata/Storage.cs +++ b/gaseous-server/Classes/Metadata/Storage.cs @@ -1,7 +1,6 @@ using System; using System.Data; using System.Reflection; -using gaseous_tools; using IGDB; using IGDB.Models; using Microsoft.Extensions.Caching.Memory; @@ -67,7 +66,7 @@ namespace gaseous_server.Classes.Metadata private static CacheStatus _GetCacheStatus(string Endpoint, string SearchField, object SearchValue) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT lastUpdated FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField; @@ -178,7 +177,7 @@ namespace gaseous_server.Classes.Metadata } // execute sql - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); db.ExecuteCMD(sql, objectDict); } @@ -201,7 +200,7 @@ namespace gaseous_server.Classes.Metadata } } - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM " + Endpoint + " WHERE " + SearchField + " = @" + SearchField; @@ -425,7 +424,7 @@ namespace gaseous_server.Classes.Metadata private static void StoreRelations(string PrimaryTable, string SecondaryTable, long ObjectId, string Relations) { string TableName = "Relation_" + PrimaryTable + "_" + SecondaryTable; - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM information_schema.tables WHERE table_schema = '" + Config.DatabaseConfiguration.DatabaseName + "' AND table_name = '" + TableName + "';"; DataTable data = db.ExecuteCMD(sql); if (data.Rows.Count == 0) diff --git a/gaseous-server/Classes/Metadata/Themes.cs b/gaseous-server/Classes/Metadata/Themes.cs index e29b811..7059770 100644 --- a/gaseous-server/Classes/Metadata/Themes.cs +++ b/gaseous-server/Classes/Metadata/Themes.cs @@ -1,8 +1,7 @@ using System; -using gaseous_tools; using IGDB; using IGDB.Models; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Classes.Metadata { @@ -84,7 +83,7 @@ namespace gaseous_server.Classes.Metadata } 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); + Logging.Log(Logging.LogType.Warning, "Metadata: " + returnValue.GetType().Name, "An error occurred while connecting to IGDB. WhereClause: " + WhereClause, ex); return Storage.GetCacheValue(returnValue, "id", (long)searchValue); } case Storage.CacheStatus.Current: diff --git a/gaseous-server/Classes/MetadataManagement.cs b/gaseous-server/Classes/MetadataManagement.cs index c788e64..00a1320 100644 --- a/gaseous-server/Classes/MetadataManagement.cs +++ b/gaseous-server/Classes/MetadataManagement.cs @@ -1,7 +1,6 @@ using System; using System.Data; using gaseous_server.Models; -using gaseous_tools; namespace gaseous_server.Classes { @@ -9,7 +8,7 @@ namespace gaseous_server.Classes { public static void RefreshMetadata(bool forceRefresh = false) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; DataTable dt = new DataTable(); diff --git a/gaseous-server/Classes/RomMediaGroup.cs b/gaseous-server/Classes/RomMediaGroup.cs index 0cc5859..79f7fe7 100644 --- a/gaseous-server/Classes/RomMediaGroup.cs +++ b/gaseous-server/Classes/RomMediaGroup.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using gaseous_tools; using gaseous_signature_parser.models.RomSignatureObject; using Microsoft.VisualBasic; using IGDB.Models; @@ -19,7 +18,7 @@ namespace gaseous_server.Classes public static GameRomMediaGroupItem CreateMediaGroup(long GameId, long PlatformId, List RomIds) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "INSERT INTO RomMediaGroup (Status, PlatformId, GameId) VALUES (@status, @platformid, @gameid); SELECT CAST(LAST_INSERT_ID() AS SIGNED);"; Dictionary dbDict = new Dictionary(); dbDict.Add("status", GameRomMediaGroupItem.GroupBuildStatus.WaitingForBuild); @@ -58,7 +57,7 @@ namespace gaseous_server.Classes public static GameRomMediaGroupItem GetMediaGroup(long Id) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM RomMediaGroup WHERE Id=@id;"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -78,7 +77,7 @@ namespace gaseous_server.Classes public static List GetMediaGroupsFromGameId(long GameId) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM RomMediaGroup WHERE GameId=@gameid;"; Dictionary dbDict = new Dictionary(); dbDict.Add("gameid", GameId); @@ -101,7 +100,7 @@ namespace gaseous_server.Classes { GameRomMediaGroupItem mg = GetMediaGroup(Id); - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; Dictionary dbDict = new Dictionary(); @@ -156,7 +155,7 @@ namespace gaseous_server.Classes public static void DeleteMediaGroup(long Id) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "DELETE FROM RomMediaGroup WHERE Id=@id;"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -179,7 +178,7 @@ namespace gaseous_server.Classes mediaGroupItem.RomIds = new List(); // get members - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM RomMediaGroup_Members WHERE GroupId=@id;"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", mediaGroupItem.Id); @@ -199,7 +198,7 @@ namespace gaseous_server.Classes if (mediaGroupItem.Status != GameRomMediaGroupItem.GroupBuildStatus.Building) { // set collection item to waitingforbuild - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "UPDATE RomMediaGroup SET Status=@bs WHERE Id=@id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", Id); @@ -216,7 +215,7 @@ namespace gaseous_server.Classes public static void CompileMediaGroup(long Id) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); GameRomMediaGroupItem mediaGroupItem = GetMediaGroup(Id); if (mediaGroupItem.Status == GameRomMediaGroupItem.GroupBuildStatus.WaitingForBuild) diff --git a/gaseous-server/Classes/Roms.cs b/gaseous-server/Classes/Roms.cs index a5a7a53..70fb73c 100644 --- a/gaseous-server/Classes/Roms.cs +++ b/gaseous-server/Classes/Roms.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using gaseous_tools; using gaseous_signature_parser.models.RomSignatureObject; using static gaseous_server.Classes.RomMediaGroup; using gaseous_server.Classes.Metadata; @@ -19,7 +18,7 @@ namespace gaseous_server.Classes { GameRomObject GameRoms = new GameRomObject(); - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; Dictionary dbDict = new Dictionary(); dbDict.Add("id", GameId); @@ -52,7 +51,7 @@ namespace gaseous_server.Classes public static GameRomItem GetRom(long RomId) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM Games_Roms WHERE Id = @id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", RomId); @@ -78,7 +77,7 @@ namespace gaseous_server.Classes // ensure metadata for gameid is present IGDB.Models.Game game = Classes.Metadata.Games.GetGame(GameId, false, false, false); - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "UPDATE Games_Roms SET PlatformId=@platformid, GameId=@gameid WHERE Id = @id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", RomId); @@ -101,7 +100,7 @@ namespace gaseous_server.Classes File.Delete(rom.Path); } - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "DELETE FROM Games_Roms WHERE Id = @id"; Dictionary dbDict = new Dictionary(); dbDict.Add("id", RomId); diff --git a/gaseous-server/Classes/SignatureIngestors/XML.cs b/gaseous-server/Classes/SignatureIngestors/XML.cs index b99af73..b1c2473 100644 --- a/gaseous-server/Classes/SignatureIngestors/XML.cs +++ b/gaseous-server/Classes/SignatureIngestors/XML.cs @@ -1,7 +1,7 @@ using System; using System.IO; +using gaseous_server.Classes; using gaseous_signature_parser.models.RomSignatureObject; -using gaseous_tools; using System.Data; namespace gaseous_server.SignatureIngestors.XML @@ -11,7 +11,7 @@ namespace gaseous_server.SignatureIngestors.XML 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); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); // process provided files Logging.Log(Logging.LogType.Information, "Signature Ingestor - XML", "Importing from " + SearchPath); diff --git a/gaseous-server/Controllers/BackgroundTasksController.cs b/gaseous-server/Controllers/BackgroundTasksController.cs index ce94d07..3eec9a5 100644 --- a/gaseous-server/Controllers/BackgroundTasksController.cs +++ b/gaseous-server/Controllers/BackgroundTasksController.cs @@ -6,10 +6,12 @@ using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { - [ApiController] - [Route("api/v1/[controller]")] + [ApiController] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class BackgroundTasksController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List GetQueue() @@ -17,23 +19,24 @@ namespace gaseous_server.Controllers return ProcessQueue.QueueItems; } + [MapToApiVersion("1.0")] [HttpGet] [Route("{TaskType}")] - [ProducesResponseType(StatusCodes.Status200OK)] + [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] public ActionResult ForceRun(ProcessQueue.QueueItemType TaskType, Boolean ForceRun) { foreach (ProcessQueue.QueueItem qi in ProcessQueue.QueueItems) { - if (qi.AllowManualStart == true) - { - if (TaskType == qi.ItemType) - { - if (ForceRun == true) - { - qi.ForceExecute(); - } - return qi; + if (qi.AllowManualStart == true) + { + if (TaskType == qi.ItemType) + { + if (ForceRun == true) + { + qi.ForceExecute(); + } + return qi; } } } diff --git a/gaseous-server/Controllers/BiosController.cs b/gaseous-server/Controllers/BiosController.cs index bb7bef3..caa0fbc 100644 --- a/gaseous-server/Controllers/BiosController.cs +++ b/gaseous-server/Controllers/BiosController.cs @@ -3,14 +3,17 @@ 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]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class BiosController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List GetBios() @@ -18,6 +21,7 @@ namespace gaseous_server.Controllers return Classes.Bios.GetBios(); } + [MapToApiVersion("1.0")] [HttpGet] [Route("{PlatformId}")] [ProducesResponseType(StatusCodes.Status200OK)] @@ -26,7 +30,9 @@ namespace gaseous_server.Controllers return Classes.Bios.GetBios(PlatformId, AvailableOnly); } + [MapToApiVersion("1.0")] [HttpGet] + [MapToApiVersion("1.0")] [HttpHead] [Route("zip/{PlatformId}")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -37,7 +43,7 @@ namespace gaseous_server.Controllers { IGDB.Models.Platform platform = Classes.Metadata.Platforms.GetPlatform(PlatformId); - string biosPath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryBIOSDirectory, platform.Slug); + string biosPath = Path.Combine(Config.LibraryConfiguration.LibraryBIOSDirectory, platform.Slug); string tempFile = Path.GetTempFileName(); @@ -59,7 +65,9 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] + [MapToApiVersion("1.0")] [HttpHead] [Route("{PlatformId}/{BiosName}")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/CollectionsController.cs b/gaseous-server/Controllers/CollectionsController.cs index ed8a24d..64c6ef3 100644 --- a/gaseous-server/Controllers/CollectionsController.cs +++ b/gaseous-server/Controllers/CollectionsController.cs @@ -9,13 +9,15 @@ using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class CollectionsController : Controller { /// /// Gets all ROM collections /// /// + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List GetCollections() @@ -29,6 +31,7 @@ namespace gaseous_server.Controllers /// /// Set to true to begin the collection build process /// + [MapToApiVersion("1.0")] [HttpGet] [Route("{CollectionId}")] [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)] @@ -55,6 +58,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpGet] [Route("{CollectionId}/Roms")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -77,6 +81,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpPost] [Route("Preview")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -98,6 +103,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpGet] [Route("{CollectionId}/Roms/Zip")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -108,7 +114,7 @@ namespace gaseous_server.Controllers { Classes.Collections.CollectionItem collectionItem = Classes.Collections.GetCollection(CollectionId); - string ZipFilePath = Path.Combine(gaseous_tools.Config.LibraryConfiguration.LibraryCollectionsDirectory, CollectionId + ".zip"); + string ZipFilePath = Path.Combine(Config.LibraryConfiguration.LibraryCollectionsDirectory, CollectionId + ".zip"); if (System.IO.File.Exists(ZipFilePath)) { @@ -131,6 +137,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpPost] [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] @@ -152,6 +159,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpPatch] [Route("{CollectionId}")] [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)] @@ -174,6 +182,7 @@ namespace gaseous_server.Controllers /// /// /// + [MapToApiVersion("1.0")] [HttpPatch] [Route("{CollectionId}/AlwaysInclude")] [ProducesResponseType(typeof(Classes.Collections.CollectionItem), StatusCodes.Status200OK)] @@ -208,6 +217,7 @@ namespace gaseous_server.Controllers /// Deletes the specified ROM collection /// /// + [MapToApiVersion("1.0")] [HttpDelete] [Route("{CollectionId}")] [ProducesResponseType(StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/FilterController.cs b/gaseous-server/Controllers/FilterController.cs index c20368f..cb90796 100644 --- a/gaseous-server/Controllers/FilterController.cs +++ b/gaseous-server/Controllers/FilterController.cs @@ -3,23 +3,25 @@ using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; -using gaseous_tools; +using gaseous_server.Classes; using IGDB.Models; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] [ApiController] public class FilterController : ControllerBase { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] //[ResponseCache(CacheProfileName = "5Minute")] public Dictionary Filter() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); Dictionary FilterSet = new Dictionary(); diff --git a/gaseous-server/Controllers/GamesController.cs b/gaseous-server/Controllers/GamesController.cs index 696626c..f7553cb 100644 --- a/gaseous-server/Controllers/GamesController.cs +++ b/gaseous-server/Controllers/GamesController.cs @@ -6,8 +6,8 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using gaseous_server.Classes; using gaseous_server.Classes.Metadata; -using gaseous_tools; using IGDB.Models; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -16,10 +16,12 @@ using static gaseous_server.Classes.Metadata.AgeRatings; namespace gaseous_server.Controllers { - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] [ApiController] public class GamesController : ControllerBase { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] public ActionResult Game( @@ -203,7 +205,7 @@ namespace gaseous_server.Controllers orderByClause = "ORDER BY `Name` DESC"; } - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT DISTINCT Games_Roms.GameId AS ROMGameId, Game.* FROM Games_Roms LEFT JOIN Game ON Game.Id = Games_Roms.GameId LEFT JOIN Relation_Game_Genres ON Game.Id = Relation_Game_Genres.GameId LEFT JOIN Relation_Game_GameModes ON Game.Id = Relation_Game_GameModes.GameId LEFT JOIN Relation_Game_PlayerPerspectives ON Game.Id = Relation_Game_PlayerPerspectives.GameId LEFT JOIN Relation_Game_Themes ON Game.Id = Relation_Game_Themes.GameId " + whereClause + " " + havingClause + " " + orderByClause; List RetVal = new List(); @@ -218,6 +220,7 @@ namespace gaseous_server.Controllers return RetVal; } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}")] [ProducesResponseType(typeof(Game), StatusCodes.Status200OK)] @@ -244,6 +247,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/alternativename")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -275,6 +279,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/agerating")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -306,6 +311,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/agerating/{RatingId}/image")] [ProducesResponseType(typeof(FileContentResult), StatusCodes.Status200OK)] @@ -385,6 +391,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/artwork")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -414,6 +421,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/artwork/{ArtworkId}")] [ProducesResponseType(typeof(Artwork), StatusCodes.Status200OK)] @@ -448,6 +456,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/artwork/{ArtworkId}/image")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -502,6 +511,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/cover")] [ProducesResponseType(typeof(Cover), StatusCodes.Status200OK)] @@ -535,6 +545,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/cover/image")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -574,6 +585,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/genre")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -610,6 +622,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/companies")] [ProducesResponseType(typeof(List>), StatusCodes.Status200OK)] @@ -653,6 +666,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/companies/{CompanyId}")] [ProducesResponseType(typeof(Dictionary), StatusCodes.Status200OK)] @@ -694,6 +708,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/companies/{CompanyId}/image")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -737,6 +752,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/roms")] [ProducesResponseType(typeof(Classes.Roms.GameRomObject), StatusCodes.Status200OK)] @@ -756,6 +772,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/roms/{RomId}")] [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)] @@ -783,6 +800,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpPatch] [Route("{GameId}/roms/{RomId}")] [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)] @@ -810,6 +828,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpDelete] [Route("{GameId}/roms/{RomId}")] [ProducesResponseType(typeof(Classes.Roms.GameRomItem), StatusCodes.Status200OK)] @@ -837,7 +856,9 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] + [MapToApiVersion("1.0")] [HttpHead] [Route("{GameId}/roms/{RomId}/file")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -872,7 +893,9 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] + [MapToApiVersion("1.0")] [HttpHead] [Route("{GameId}/roms/{RomId}/{FileName}")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -907,6 +930,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/romgroup/{RomGroupId}")] [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)] @@ -934,6 +958,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpPost] [Route("{GameId}/romgroup")] [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)] @@ -960,6 +985,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpPatch] [Route("{GameId}/romgroup/{RomId}")] [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)] @@ -987,6 +1013,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpDelete] [Route("{GameId}/romgroup/{RomGroupId}")] [ProducesResponseType(typeof(Classes.RomMediaGroup.GameRomMediaGroupItem), StatusCodes.Status200OK)] @@ -1014,7 +1041,9 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] + [MapToApiVersion("1.0")] [HttpHead] [Route("{GameId}/romgroup/{RomGroupId}/file")] [Route("{GameId}/romgroup/{RomGroupId}/{filename}")] @@ -1059,6 +1088,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("search")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -1096,6 +1126,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/screenshots")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -1125,6 +1156,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/screenshots/{ScreenshotId}")] [ProducesResponseType(typeof(Screenshot), StatusCodes.Status200OK)] @@ -1157,6 +1189,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/screenshots/{ScreenshotId}/image")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] @@ -1199,6 +1232,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{GameId}/videos")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/LibraryController.cs b/gaseous-server/Controllers/LibraryController.cs index a804113..37c44c2 100644 --- a/gaseous-server/Controllers/LibraryController.cs +++ b/gaseous-server/Controllers/LibraryController.cs @@ -8,9 +8,11 @@ using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class LibraryController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] public ActionResult GetLibraries() @@ -18,6 +20,7 @@ namespace gaseous_server.Controllers return Ok(GameLibrary.GetLibraries); } + [MapToApiVersion("1.0")] [HttpGet("{LibraryId}")] [ProducesResponseType(typeof(GameLibrary.LibraryItem), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] @@ -33,6 +36,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpPost] [ProducesResponseType(typeof(GameLibrary.LibraryItem), StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status404NotFound)] @@ -53,6 +57,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpDelete("{LibraryId}")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status400BadRequest)] diff --git a/gaseous-server/Controllers/LogsController.cs b/gaseous-server/Controllers/LogsController.cs index 04b2af0..8b536db 100644 --- a/gaseous-server/Controllers/LogsController.cs +++ b/gaseous-server/Controllers/LogsController.cs @@ -2,15 +2,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using gaseous_tools; +using gaseous_server.Classes; using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class LogsController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List Logs(long? StartIndex, int PageNumber = 1, int PageSize = 100) diff --git a/gaseous-server/Controllers/PlatformMapsController.cs b/gaseous-server/Controllers/PlatformMapsController.cs index cfaecc8..f124e65 100644 --- a/gaseous-server/Controllers/PlatformMapsController.cs +++ b/gaseous-server/Controllers/PlatformMapsController.cs @@ -7,7 +7,7 @@ using System.Reflection; using System.Threading.Tasks; using gaseous_server.Classes.Metadata; using gaseous_server.Models; -using gaseous_tools; +using gaseous_server.Classes; using IGDB.Models; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -15,10 +15,12 @@ using Microsoft.CodeAnalysis.Scripting; namespace gaseous_server.Controllers { - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] [ApiController] public class PlatformMapsController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] public ActionResult GetPlatformMap(bool ResetToDefault = false) @@ -31,6 +33,7 @@ namespace gaseous_server.Controllers return Ok(PlatformMapping.PlatformMap); } + [MapToApiVersion("1.0")] [HttpGet] [Route("{PlatformId}")] [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)] @@ -56,6 +59,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpPost] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] [RequestSizeLimit(long.MaxValue)] @@ -110,7 +114,8 @@ namespace gaseous_server.Controllers return Ok(new { count = files.Count, size }); } - // [HttpPost] + // [MapToApiVersion("1.0")] + [HttpPost] // [Route("{PlatformId}")] // [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)] // [ProducesResponseType(StatusCodes.Status404NotFound)] @@ -137,6 +142,7 @@ namespace gaseous_server.Controllers // } // } + [MapToApiVersion("1.0")] [HttpPatch] [Route("{PlatformId}")] [ProducesResponseType(typeof(PlatformMapping.PlatformMapItem), StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/PlatformsController.cs b/gaseous-server/Controllers/PlatformsController.cs index 0585856..9cbed4f 100644 --- a/gaseous-server/Controllers/PlatformsController.cs +++ b/gaseous-server/Controllers/PlatformsController.cs @@ -5,9 +5,9 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using gaseous_server.Classes; using gaseous_server.Classes.Metadata; using gaseous_server.Models; -using gaseous_tools; using IGDB.Models; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -15,10 +15,12 @@ using Microsoft.CodeAnalysis.Scripting; namespace gaseous_server.Controllers { - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] [ApiController] public class PlatformsController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] public ActionResult Platform() @@ -28,7 +30,7 @@ namespace gaseous_server.Controllers public static List GetPlatforms() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM Platform WHERE Id IN (SELECT DISTINCT PlatformId FROM Games_Roms) ORDER BY `Name` ASC;"; @@ -43,6 +45,7 @@ namespace gaseous_server.Controllers return RetVal; } + [MapToApiVersion("1.0")] [HttpGet] [Route("{PlatformId}")] [ProducesResponseType(typeof(Platform), StatusCodes.Status200OK)] @@ -68,6 +71,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{PlatformId}/platformlogo")] [ProducesResponseType(typeof(PlatformLogo), StatusCodes.Status200OK)] @@ -100,6 +104,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [Route("{PlatformId}/platformlogo/image")] [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/RomsController.cs b/gaseous-server/Controllers/RomsController.cs index dccdc63..a1d2574 100644 --- a/gaseous-server/Controllers/RomsController.cs +++ b/gaseous-server/Controllers/RomsController.cs @@ -6,8 +6,8 @@ using System.IO; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using gaseous_server.Classes; using gaseous_server.Classes.Metadata; -using gaseous_tools; using IGDB.Models; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -16,10 +16,12 @@ using static gaseous_server.Classes.Metadata.AgeRatings; namespace gaseous_server.Controllers { - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] [ApiController] public class RomsController : ControllerBase { + [MapToApiVersion("1.0")] [HttpPost] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] [RequestSizeLimit(long.MaxValue)] diff --git a/gaseous-server/Controllers/SearchController.cs b/gaseous-server/Controllers/SearchController.cs index 14c46a8..d221295 100644 --- a/gaseous-server/Controllers/SearchController.cs +++ b/gaseous-server/Controllers/SearchController.cs @@ -2,17 +2,18 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using gaseous_tools; +using gaseous_server.Classes; using IGDB; using IGDB.Models; using Microsoft.AspNetCore.Mvc; using static gaseous_server.Classes.Metadata.Games; -using static gaseous_tools.Config.ConfigFile; + namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class SearchController : Controller { private static IGDBClient igdb = new IGDBClient( @@ -21,6 +22,7 @@ namespace gaseous_server.Controllers Config.IGDB.Secret ); + [MapToApiVersion("1.0")] [HttpGet] [Route("Platform")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] @@ -42,6 +44,7 @@ namespace gaseous_server.Controllers return results.ToList(); } + [MapToApiVersion("1.0")] [HttpGet] [Route("Game")] [ProducesResponseType(typeof(List), StatusCodes.Status200OK)] diff --git a/gaseous-server/Controllers/SignaturesController.cs b/gaseous-server/Controllers/SignaturesController.cs index 557aa4b..d9d72f6 100644 --- a/gaseous-server/Controllers/SignaturesController.cs +++ b/gaseous-server/Controllers/SignaturesController.cs @@ -4,8 +4,8 @@ using System.Data; using System.Linq; using System.Security.Cryptography; using System.Threading.Tasks; +using gaseous_server.Classes; using gaseous_signature_parser.models.RomSignatureObject; -using gaseous_tools; using Microsoft.AspNetCore.Mvc; // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -13,13 +13,15 @@ using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]/[action]")] + [Route("api/v{version:apiVersion}/[controller]/[action]")] + [ApiVersion("1.0")] public class SignaturesController : ControllerBase { /// /// Get the current signature counts from the database /// /// Number of sources, publishers, games, and rom signatures in the database + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public Models.Signatures_Status Status() @@ -27,6 +29,7 @@ namespace gaseous_server.Controllers return new Models.Signatures_Status(); } + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List GetSignature(string md5 = "", string sha1 = "") @@ -40,6 +43,7 @@ namespace gaseous_server.Controllers } } + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public List GetByTosecName(string TosecName = "") @@ -55,7 +59,7 @@ namespace gaseous_server.Controllers private List _GetSignature(string sqlWhere, string searchString) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT view_Signatures_Games.*, Signatures_Roms.Id AS romid, Signatures_Roms.Name AS romname, Signatures_Roms.Size, Signatures_Roms.CRC, Signatures_Roms.MD5, Signatures_Roms.SHA1, Signatures_Roms.DevelopmentStatus, Signatures_Roms.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 dbDict = new Dictionary(); dbDict.Add("searchString", searchString); diff --git a/gaseous-server/Controllers/SystemController.cs b/gaseous-server/Controllers/SystemController.cs index ee5a53f..768827d 100644 --- a/gaseous-server/Controllers/SystemController.cs +++ b/gaseous-server/Controllers/SystemController.cs @@ -5,20 +5,22 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using gaseous_tools; +using gaseous_server.Classes; using Microsoft.AspNetCore.Mvc; namespace gaseous_server.Controllers { [ApiController] - [Route("api/v1/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] + [ApiVersion("1.0")] public class SystemController : Controller { + [MapToApiVersion("1.0")] [HttpGet] [ProducesResponseType(StatusCodes.Status200OK)] public SystemInfo GetSystemStatus() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); SystemInfo ReturnValue = new SystemInfo(); @@ -53,6 +55,7 @@ namespace gaseous_server.Controllers return ReturnValue; } + [MapToApiVersion("1.0")] [HttpGet] [Route("Version")] [ProducesResponseType(StatusCodes.Status200OK)] @@ -60,11 +63,12 @@ namespace gaseous_server.Controllers return Assembly.GetExecutingAssembly().GetName().Version; } + [MapToApiVersion("1.0")] [HttpGet] [Route("VersionFile")] [ProducesResponseType(StatusCodes.Status200OK)] public FileContentResult GetSystemVersionAsFile() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new 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); @@ -75,7 +79,7 @@ namespace gaseous_server.Controllers { SystemInfo.PathItem pathItem = new SystemInfo.PathItem { LibraryPath = Path, - SpaceUsed = gaseous_tools.Common.DirSize(new DirectoryInfo(Path)), + SpaceUsed = Common.DirSize(new DirectoryInfo(Path)), SpaceAvailable = new DriveInfo(Path).AvailableFreeSpace, TotalSpace = new DriveInfo(Path).TotalSize }; diff --git a/gaseous-server/Models/PlatformMapping.cs b/gaseous-server/Models/PlatformMapping.cs index 8f45b4f..f4ff3b4 100644 --- a/gaseous-server/Models/PlatformMapping.cs +++ b/gaseous-server/Models/PlatformMapping.cs @@ -8,7 +8,6 @@ using System.Web; using gaseous_server.Classes; using gaseous_server.Classes.Metadata; using gaseous_server.Controllers; -using gaseous_tools; using IGDB.Models; using Newtonsoft.Json; @@ -97,7 +96,7 @@ namespace gaseous_server.Models { get { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM PlatformMap"; DataTable data = db.ExecuteCMD(sql); @@ -129,7 +128,7 @@ namespace gaseous_server.Models } else { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "SELECT * FROM PlatformMap WHERE Id = @Id"; Dictionary dbDict = new Dictionary(); dbDict.Add("Id", Id); @@ -152,7 +151,7 @@ namespace gaseous_server.Models public static void WritePlatformMap(PlatformMapItem item, bool Update, bool AllowAvailableEmulatorOverwrite) { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = ""; Dictionary dbDict = new Dictionary(); if (Update == false) @@ -249,7 +248,7 @@ namespace gaseous_server.Models static PlatformMapItem BuildPlatformMapItem(DataRow row) { long IGDBId = (long)row["Id"]; - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); Dictionary dbDict = new Dictionary(); string sql = ""; diff --git a/gaseous-server/Models/Signatures_Status.cs b/gaseous-server/Models/Signatures_Status.cs index 44f9cac..1319dcd 100644 --- a/gaseous-server/Models/Signatures_Status.cs +++ b/gaseous-server/Models/Signatures_Status.cs @@ -1,6 +1,6 @@ using System; using System.Data; -using gaseous_tools; +using gaseous_server.Classes; namespace gaseous_server.Models { @@ -14,7 +14,7 @@ namespace gaseous_server.Models public Signatures_Status() { - Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); + Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); string sql = "select (select count(*) from Signatures_Sources) as SourceCount, (select count(*) from Signatures_Platforms) as PlatformCount, (select count(*) from Signatures_Games) as GameCount, (select count(*) from Signatures_Roms) as RomCount;"; DataTable sigDb = db.ExecuteCMD(sql); diff --git a/gaseous-server/ProcessQueue.cs b/gaseous-server/ProcessQueue.cs index 66cdee3..d209d2f 100644 --- a/gaseous-server/ProcessQueue.cs +++ b/gaseous-server/ProcessQueue.cs @@ -1,5 +1,5 @@ using System; -using gaseous_tools; +using gaseous_server.Classes; namespace gaseous_server { @@ -166,7 +166,7 @@ namespace gaseous_server case QueueItemType.BackgroundDatabaseUpgrade: Logging.Log(Logging.LogType.Debug, "Timered Event", "Starting Background Upgrade"); - gaseous_tools.DatabaseMigration.UpgradeScriptBackgroundTasks(); + DatabaseMigration.UpgradeScriptBackgroundTasks(); break; case QueueItemType.Maintainer: diff --git a/gaseous-server/Program.cs b/gaseous-server/Program.cs index e3652ac..e1b7aa1 100644 --- a/gaseous-server/Program.cs +++ b/gaseous-server/Program.cs @@ -1,18 +1,19 @@ using System.Reflection; using System.Text.Json.Serialization; using gaseous_server; +using gaseous_server.Classes; using gaseous_server.Models; using gaseous_server.SignatureIngestors.XML; -using gaseous_tools; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Versioning; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.OpenApi.Models; Logging.WriteToDiskOnly = true; Logging.Log(Logging.LogType.Information, "Startup", "Starting Gaseous Server " + Assembly.GetExecutingAssembly().GetName().Version); -Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionStringNoDatabase); +Database db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionStringNoDatabase); // check db availability bool dbOnline = false; @@ -29,7 +30,7 @@ do } } while (dbOnline == false); -db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); +db = new Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString); // set up db db.InitDB(); @@ -111,6 +112,21 @@ builder.Services.AddControllers(options => Location = ResponseCacheLocation.Any }); }); +builder.Services.AddApiVersioning(config => +{ + config.DefaultApiVersion = new ApiVersion(1, 0); + config.AssumeDefaultVersionWhenUnspecified = true; + config.ReportApiVersions = true; +}); +builder.Services.AddApiVersioning(setup => +{ + setup.ApiVersionReader = new UrlSegmentApiVersionReader(); +}); +builder.Services.AddVersionedApiExplorer(setup => +{ + setup.GroupNameFormat = "'v'VVV"; + setup.SubstituteApiVersionInUrl = true; +}); // set max upload size builder.Services.Configure(options => @@ -134,7 +150,7 @@ builder.Services.AddSwaggerGen(options => { options.SwaggerDoc("v1", new OpenApiInfo { - Version = "v1", + Version = "v1.0", Title = "Gaseous Server API", Description = "An API for managing the Gaseous Server", TermsOfService = new Uri("https://github.com/gaseous-project/gaseous-server"), diff --git a/gaseous-tools/Database/MySQL/gaseous-1000.sql b/gaseous-server/Support/Database/MySQL/gaseous-1000.sql similarity index 100% rename from gaseous-tools/Database/MySQL/gaseous-1000.sql rename to gaseous-server/Support/Database/MySQL/gaseous-1000.sql diff --git a/gaseous-tools/Database/MySQL/gaseous-1001.sql b/gaseous-server/Support/Database/MySQL/gaseous-1001.sql similarity index 100% rename from gaseous-tools/Database/MySQL/gaseous-1001.sql rename to gaseous-server/Support/Database/MySQL/gaseous-1001.sql diff --git a/gaseous-tools/Database/MySQL/gaseous-1002.sql b/gaseous-server/Support/Database/MySQL/gaseous-1002.sql similarity index 100% rename from gaseous-tools/Database/MySQL/gaseous-1002.sql rename to gaseous-server/Support/Database/MySQL/gaseous-1002.sql diff --git a/gaseous-tools/Database/MySQL/gaseous-1003.sql b/gaseous-server/Support/Database/MySQL/gaseous-1003.sql similarity index 100% rename from gaseous-tools/Database/MySQL/gaseous-1003.sql rename to gaseous-server/Support/Database/MySQL/gaseous-1003.sql diff --git a/gaseous-tools/Database/MySQL/gaseous-1004.sql b/gaseous-server/Support/Database/MySQL/gaseous-1004.sql similarity index 100% rename from gaseous-tools/Database/MySQL/gaseous-1004.sql rename to gaseous-server/Support/Database/MySQL/gaseous-1004.sql diff --git a/gaseous-server/Timer.cs b/gaseous-server/Timer.cs index 48a262c..d9cf2a6 100644 --- a/gaseous-server/Timer.cs +++ b/gaseous-server/Timer.cs @@ -1,5 +1,5 @@ using System; -using gaseous_tools; +using gaseous_server.Classes; namespace gaseous_server { diff --git a/gaseous-server/gaseous-server.csproj b/gaseous-server/gaseous-server.csproj index a18e528..4e197ed 100644 --- a/gaseous-server/gaseous-server.csproj +++ b/gaseous-server/gaseous-server.csproj @@ -20,9 +20,13 @@ + + + + @@ -32,6 +36,13 @@ + + + + + + + @@ -109,11 +120,6 @@ PreserveNewest - - - - - true @@ -158,5 +164,10 @@ + + + + + diff --git a/gaseous-server/wwwroot/index.html b/gaseous-server/wwwroot/index.html index 5ea9dd0..42f2b99 100644 --- a/gaseous-server/wwwroot/index.html +++ b/gaseous-server/wwwroot/index.html @@ -2,7 +2,7 @@ - + diff --git a/gaseous-server/wwwroot/pages/collections.html b/gaseous-server/wwwroot/pages/collections.html index 6ec71b1..e775116 100644 --- a/gaseous-server/wwwroot/pages/collections.html +++ b/gaseous-server/wwwroot/pages/collections.html @@ -20,7 +20,7 @@ GetCollections(); function GetCollections() { - ajaxCall('/api/v1/Collections', 'GET', function (result) { + ajaxCall('/api/v1.0/Collections', 'GET', function (result) { if (result) { var targetDiv = document.getElementById('collection_table_location'); targetDiv.innerHTML = ''; @@ -47,7 +47,7 @@ break; case "Completed": statusText = 'Available'; - downloadLink = ''; + downloadLink = ''; packageSize = formatBytes(result[i].collectionBuiltSizeBytes); break; case "Failed": diff --git a/gaseous-server/wwwroot/pages/dialogs/collectionaddgame.html b/gaseous-server/wwwroot/pages/dialogs/collectionaddgame.html index 6c28ffe..012ce0b 100644 --- a/gaseous-server/wwwroot/pages/dialogs/collectionaddgame.html +++ b/gaseous-server/wwwroot/pages/dialogs/collectionaddgame.html @@ -24,7 +24,7 @@ $('#collection_addgame').select2({ ajax: { - url: '/api/v1/Collections', + url: '/api/v1.0/Collections', placeholder: 'Select collection', processResults: function (data) { var arr = []; @@ -59,7 +59,7 @@ if (CollectionId != 0) { ajaxCall( - '/api/v1/Collections/' + CollectionId + '/AlwaysInclude' + RebuildCollection, + '/api/v1.0/Collections/' + CollectionId + '/AlwaysInclude' + RebuildCollection, 'PATCH', function (result) { closeSubDialog(); diff --git a/gaseous-server/wwwroot/pages/dialogs/collectiondelete.html b/gaseous-server/wwwroot/pages/dialogs/collectiondelete.html index 4131d0b..e9b515b 100644 --- a/gaseous-server/wwwroot/pages/dialogs/collectiondelete.html +++ b/gaseous-server/wwwroot/pages/dialogs/collectiondelete.html @@ -12,7 +12,7 @@ \ No newline at end of file diff --git a/gaseous-server/wwwroot/pages/emulator.html b/gaseous-server/wwwroot/pages/emulator.html index a3d8735..cd37b98 100644 --- a/gaseous-server/wwwroot/pages/emulator.html +++ b/gaseous-server/wwwroot/pages/emulator.html @@ -15,7 +15,7 @@ var emuBios = ''; var emuBackground = ''; - ajaxCall('/api/v1/Games/' + gameId, 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId, 'GET', function (result) { gameData = result; // load artwork @@ -27,22 +27,22 @@ } else { if (result.cover) { var bg = document.getElementById('bgImage'); - bg.setAttribute('style', 'background-image: url("/api/v1/Games/' + gameId + '/cover/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); + bg.setAttribute('style', 'background-image: url("/api/v1.0/Games/' + gameId + '/cover/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); } } if (result.cover) { - emuBackground = '/api/v1/Games/' + gameId + '/cover/image'; + emuBackground = '/api/v1.0/Games/' + gameId + '/cover/image'; } emuGameTitle = gameData.name; }); - ajaxCall('/api/v1/Bios/' + platformId, 'GET', function (result) { + ajaxCall('/api/v1.0/Bios/' + platformId, 'GET', function (result) { if (result.length == 0) { emuBios = ''; } else { - emuBios = '/api/v1/Bios/zip/' + platformId; + emuBios = '/api/v1.0/Bios/zip/' + platformId; } switch (getQueryString('engine', 'string')) { @@ -59,7 +59,7 @@ artworksPosition = 0; } var bg = document.getElementById('bgImage'); - bg.setAttribute('style', 'background-image: url("/api/v1/Games/' + gameId + '/artwork/' + artworks[artworksPosition] + '/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); + bg.setAttribute('style', 'background-image: url("/api/v1.0/Games/' + gameId + '/artwork/' + artworks[artworksPosition] + '/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); } } diff --git a/gaseous-server/wwwroot/pages/game.html b/gaseous-server/wwwroot/pages/game.html index cab951e..d8e26b5 100644 --- a/gaseous-server/wwwroot/pages/game.html +++ b/gaseous-server/wwwroot/pages/game.html @@ -94,7 +94,7 @@ var artworksTimer = null; var selectedScreenshot = 0; - ajaxCall('/api/v1/Games/' + gameId, 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId, 'GET', function (result) { // populate games page gameData = result; @@ -116,7 +116,7 @@ // get alt name var gameTitleAltLabel = document.getElementById('gametitle_alts'); if (result.alternativeNames) { - ajaxCall('/api/v1/Games/' + gameId + '/alternativename', 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/alternativename', 'GET', function (result) { var altNames = ''; for (var i = 0; i < result.length; i++) { if (altNames.length > 0) { @@ -161,7 +161,7 @@ } else { var bg = document.getElementById('bgImage'); if (result.cover) { - bg.setAttribute('style', 'background-image: url("/api/v1/Games/' + gameId + '/cover/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); + bg.setAttribute('style', 'background-image: url("/api/v1.0/Games/' + gameId + '/cover/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); } else { var randomInt = randomIntFromInterval(1, 3); bg.setAttribute('style', 'background-image: url("/images/gamebg' + randomInt + '.jpg"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); @@ -175,7 +175,7 @@ var gameDeveloperLoaded = false; var gamePublisherLoaded = false; if (result.involvedCompanies) { - ajaxCall('/api/v1/games/' + gameId + '/companies', 'GET', function (result) { + ajaxCall('/api/v1.0/games/' + gameId + '/companies', 'GET', function (result) { var lstDevelopers = []; var lstPublishers = []; @@ -227,7 +227,7 @@ var gameImage = document.createElement('img'); gameImage.className = 'game_cover_image'; if (result.cover) { - gameImage.src = '/api/v1/Games/' + result.id + '/cover/image'; + gameImage.src = '/api/v1.0/Games/' + result.id + '/cover/image'; } else { gameImage.src = '/images/unknowngame.png'; gameImage.className = 'game_cover_image unknown'; @@ -240,7 +240,7 @@ var gameRatings = document.createElement('div'); for (var i = 0; i < result.ageRatings.ids.length; i++) { var ratingImage = document.createElement('img'); - ratingImage.src = '/api/v1/Games/' + result.id + '/agerating/' + result.ageRatings.ids[i] + '/image'; + ratingImage.src = '/api/v1.0/Games/' + result.id + '/agerating/' + result.ageRatings.ids[i] + '/image'; ratingImage.className = 'rating_image'; gameRatings.appendChild(ratingImage); } @@ -252,7 +252,7 @@ // load genres var gameSummaryGenres = document.getElementById('gamesumarry_genres'); if (result.genres) { - ajaxCall('/api/v1/Games/' + gameId + '/genre', 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/genre', 'GET', function (result) { for (var i = 0; i < result.length; i++) { var genreLabel = document.createElement('span'); genreLabel.className = 'gamegenrelabel'; @@ -281,7 +281,7 @@ var screenshotItem = document.createElement('div'); screenshotItem.id = 'gamescreenshots_gallery_' + imageIndex; screenshotItem.setAttribute('name', 'gamescreenshots_gallery_item'); - screenshotItem.setAttribute('style', 'background-image: url("/api/v1/Games/' + gameId + '/screenshots/' + result.screenshots.ids[i] + '/image"); background-position: center; background-repeat: no-repeat; background-size: contain;)'); + screenshotItem.setAttribute('style', 'background-image: url("/api/v1.0/Games/' + gameId + '/screenshots/' + result.screenshots.ids[i] + '/image"); background-position: center; background-repeat: no-repeat; background-size: contain;)'); screenshotItem.setAttribute('imageid', imageIndex); screenshotItem.setAttribute('imagetype', 0); screenshotItem.className = 'gamescreenshots_gallery_item'; @@ -293,7 +293,7 @@ // load videos if (result.videos) { - ajaxCall('/api/v1/Games/' + gameId + '/videos', 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/videos', 'GET', function (result) { var gameScreenshots_vGallery = document.getElementById('gamescreenshots_gallery_panel'); for (var i = 0; i < result.length; i++) { var vScreenshotItem = document.createElement('div'); @@ -360,7 +360,7 @@ } var gameRoms = document.getElementById('gamesummaryroms'); - ajaxCall('/api/v1/Games/' + gameId + '/roms', 'GET', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/roms', 'GET', function (result) { if (result.gameRomItems) { var gameRomItems = result.gameRomItems; var mediaGroups = result.mediaGroups; @@ -391,14 +391,14 @@ if (result.gameRomItems[i].emulator) { if (gameRomItems[i].emulator.type) { if (gameRomItems[i].emulator.type.length > 0) { - launchButton = 'Launch'; + launchButton = 'Launch'; } } } var newRow = [ ['', 'rom_checkbox_box_hidden', 'rom_edit_checkbox'], - '' + gameRomItems[i].name + '', + '' + gameRomItems[i].name + '', formatBytes(gameRomItems[i].size, 2), gameRomItems[i].romTypeMedia, gameRomItems[i].mediaLabel, @@ -436,7 +436,7 @@ if (gameRomItem.platformId == mediaGroup.platformId) { if (gameRomItem.emulator) { if (gameRomItem.emulator.type.length > 0) { - launchButton = 'Launch'; + launchButton = 'Launch'; break; } } @@ -459,7 +459,7 @@ break; case "Completed": statusText = 'Available'; - downloadLink = ''; + downloadLink = ''; packageSize = formatBytes(mediaGroup.size); launchButtonContent = launchButton; break; @@ -525,7 +525,7 @@ artworksPosition = 0; } var bg = document.getElementById('bgImage'); - bg.setAttribute('style', 'background-image: url("/api/v1/Games/' + gameId + '/artwork/' + artworks[artworksPosition] + '/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); + bg.setAttribute('style', 'background-image: url("/api/v1.0/Games/' + gameId + '/artwork/' + artworks[artworksPosition] + '/image"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);'); artworksTimer = setTimeout(rotateBackground, 60000); } } @@ -677,7 +677,7 @@ minimumInputLength: 3, placeholder: "Platform", ajax: { - url: '/api/v1/Search/Platform', + url: '/api/v1.0/Search/Platform', data: function (params) { var query = { SearchString: params.term @@ -709,7 +709,7 @@ templateResult: DropDownRenderGameOption, placeholder: "Game", ajax: { - url: '/api/v1/Search/Game', + url: '/api/v1.0/Search/Game', data: function (params) { fixplatform = $('#rom_edit_fixplatform').select2('data'); @@ -762,7 +762,7 @@ if (rom_checks[i].checked == true) { var romId = rom_checks[i].getAttribute('data-romid'); remapCallCounter += 1; - ajaxCall('/api/v1/Games/' + gameId + '/roms/' + romId + '?NewPlatformId=' + fixplatform[0].id + '&NewGameId=' + fixgame[0].id, 'PATCH', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/roms/' + romId + '?NewPlatformId=' + fixplatform[0].id + '&NewGameId=' + fixgame[0].id, 'PATCH', function (result) { remapTitlesCallback(); }, function (result) { remapTitlesCallback(); @@ -804,7 +804,7 @@ if (rom_checks[i].checked == true) { var romId = rom_checks[i].getAttribute('data-romid'); remapCallCounter += 1; - ajaxCall('/api/v1/Games/' + gameId + '/roms/' + romId, 'DELETE', function (result) { + ajaxCall('/api/v1.0/Games/' + gameId + '/roms/' + romId, 'DELETE', function (result) { remapTitlesCallback(); }); } @@ -846,7 +846,7 @@ } ajaxCall( - '/api/v1/Games/' + gameId + '/romgroup?PlatformId=' + platformId, + '/api/v1.0/Games/' + gameId + '/romgroup?PlatformId=' + platformId, 'POST', function (result) { DisplayROMCheckboxes(false); diff --git a/gaseous-server/wwwroot/pages/home.html b/gaseous-server/wwwroot/pages/home.html index a9af398..0a241cf 100644 --- a/gaseous-server/wwwroot/pages/home.html +++ b/gaseous-server/wwwroot/pages/home.html @@ -8,7 +8,7 @@