sendnrw/gaseous-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More refactoring and bug fixes (#243)

Browse Source
This commit is contained in:
Michael Green
2023-12-31 00:21:40 +11:00
committed by GitHub
parent 311c7733fa
commit 7be1ec7080
10 changed files with 230 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
gaseous-server/Classes/Database.cs
View File

@@ -329,38 +329,40 @@ namespace gaseous_server.Classes
DataTable RetTable = new DataTable(); DataTable RetTable = new DataTable();
Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true); Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
MySqlConnection conn = new MySqlConnection(DBConn); using (MySqlConnection conn = new MySqlConnection(DBConn))
conn.Open();
MySqlCommand cmd = new MySqlCommand
{ {
Connection = conn, conn.Open();
CommandText = SQL,
CommandTimeout = Timeout
};
foreach (string Parameter in Parameters.Keys) MySqlCommand cmd = new MySqlCommand
{
cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
}
try
{
Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
if (Parameters.Count > 0)
{ {
string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value))); Connection = conn,
Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true); CommandText = SQL,
} CommandTimeout = Timeout
RetTable.Load(cmd.ExecuteReader()); };
} catch (Exception ex) {
Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
Trace.WriteLine("Error executing " + SQL);
Trace.WriteLine("Full exception: " + ex.ToString());
}
Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true); foreach (string Parameter in Parameters.Keys)
conn.Close(); {
cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
}
try
{
Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
if (Parameters.Count > 0)
{
string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value)));
Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
}
RetTable.Load(cmd.ExecuteReader());
} catch (Exception ex) {
Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
Trace.WriteLine("Error executing " + SQL);
Trace.WriteLine("Full exception: " + ex.ToString());
}
Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true);
conn.Close();
}
return RetTable; return RetTable;
} }
@@ -370,60 +372,64 @@ namespace gaseous_server.Classes
int result = 0; int result = 0;
Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true); Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
MySqlConnection conn = new MySqlConnection(DBConn); using (MySqlConnection conn = new MySqlConnection(DBConn))
conn.Open();
MySqlCommand cmd = new MySqlCommand
{ {
Connection = conn, conn.Open();
CommandText = SQL,
CommandTimeout = Timeout
};
foreach (string Parameter in Parameters.Keys) MySqlCommand cmd = new MySqlCommand
{
cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
}
try
{
Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
if (Parameters.Count > 0)
{ {
string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value))); Connection = conn,
Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true); CommandText = SQL,
} CommandTimeout = Timeout
result = cmd.ExecuteNonQuery(); };
} catch (Exception ex) {
Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
Trace.WriteLine("Error executing " + SQL);
Trace.WriteLine("Full exception: " + ex.ToString());
}
Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true); foreach (string Parameter in Parameters.Keys)
conn.Close(); {
cmd.Parameters.AddWithValue(Parameter, Parameters[Parameter]);
}
try
{
Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
if (Parameters.Count > 0)
{
string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value)));
Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
}
result = cmd.ExecuteNonQuery();
} catch (Exception ex) {
Logging.Log(Logging.LogType.Critical, "Database", "Error while executing '" + SQL + "'", ex);
Trace.WriteLine("Error executing " + SQL);
Trace.WriteLine("Full exception: " + ex.ToString());
}
Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true);
conn.Close();
}
return result; return result;
} }
public void TransactionExecCMD(List<Dictionary<string, object>> Parameters, int Timeout) public void TransactionExecCMD(List<Dictionary<string, object>> Parameters, int Timeout)
{ {
var conn = new MySqlConnection(DBConn); using (MySqlConnection conn = new MySqlConnection(DBConn))
conn.Open();
var command = conn.CreateCommand();
MySqlTransaction transaction;
transaction = conn.BeginTransaction();
command.Connection = conn;
command.Transaction = transaction;
foreach (Dictionary<string, object> Parameter in Parameters)
{ {
var cmd = buildcommand(conn, Parameter["sql"].ToString(), (Dictionary<string, object>)Parameter["values"], Timeout); conn.Open();
cmd.Transaction = transaction; var command = conn.CreateCommand();
cmd.ExecuteNonQuery(); MySqlTransaction transaction;
} transaction = conn.BeginTransaction();
command.Connection = conn;
command.Transaction = transaction;
foreach (Dictionary<string, object> Parameter in Parameters)
{
var cmd = buildcommand(conn, Parameter["sql"].ToString(), (Dictionary<string, object>)Parameter["values"], Timeout);
cmd.Transaction = transaction;
cmd.ExecuteNonQuery();
}
transaction.Commit(); transaction.Commit();
conn.Close(); conn.Close();
}
} }
private MySqlCommand buildcommand(MySqlConnection Conn, string SQL, Dictionary<string, object> Parameters, int Timeout) private MySqlCommand buildcommand(MySqlConnection Conn, string SQL, Dictionary<string, object> Parameters, int Timeout)
@@ -449,16 +455,18 @@ namespace gaseous_server.Classes
public bool TestConnection() public bool TestConnection()
{ {
MySqlConnection conn = new MySqlConnection(DBConn); using (MySqlConnection conn = new MySqlConnection(DBConn))
try
{ {
conn.Open(); try
conn.Close(); {
return true; conn.Open();
} conn.Close();
catch return true;
{ }
return false; catch
{
return false;
}
} }
} }
} }

12
gaseous-server/Classes/Metadata/Artworks.cs
View File

@@ -95,7 +95,8 @@ namespace gaseous_server.Classes.Metadata
{ {
Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Artwork download forced."); Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Artwork download forced.");
GetImageFromServer(ImagePath, returnValue.ImageId); Communications comms = new Communications();
comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
} }
return returnValue; return returnValue;
@@ -116,15 +117,6 @@ namespace gaseous_server.Classes.Metadata
return result; return result;
} }
private static async void GetImageFromServer(string ImagePath, string ImageId)
{
Communications comms = new Communications();
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>();
imageSizes.AddRange(Enum.GetValues(typeof(Communications.IGDBAPI_ImageSize)).Cast<Communications.IGDBAPI_ImageSize>());
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
} }
} }

145
gaseous-server/Classes/Metadata/Communications.cs
View File

@@ -11,13 +11,23 @@ namespace gaseous_server.Classes.Metadata
/// </summary> /// </summary>
public class Communications public class Communications
{ {
static Communications()
{
var handler = new HttpClientHandler();
handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
client = new HttpClient(handler);
client.DefaultRequestHeaders.Add("Accept-Encoding", "gzip");
client.DefaultRequestHeaders.Add("Accept-Encoding", "deflate");
}
private static IGDBClient igdb = new IGDBClient( private static IGDBClient igdb = new IGDBClient(
// Found in Twitch Developer portal for your app // Found in Twitch Developer portal for your app
Config.IGDB.ClientId, Config.IGDB.ClientId,
Config.IGDB.Secret Config.IGDB.Secret
); );
private HttpClient client = new HttpClient(); private static HttpClient client = new HttpClient();
/// <summary> /// <summary>
/// Configure metadata API communications /// Configure metadata API communications
@@ -238,84 +248,101 @@ namespace gaseous_server.Classes.Metadata
private async Task<bool?> _DownloadFile(Uri uri, string DestinationFile) private async Task<bool?> _DownloadFile(Uri uri, string DestinationFile)
{ {
string DestinationDirectory = new FileInfo(DestinationFile).Directory.FullName; string DestinationDirectory = new FileInfo(DestinationFile).Directory.FullName;
if (!Directory.Exists(DestinationDirectory))
{
Directory.CreateDirectory(DestinationDirectory);
}
Logging.Log(Logging.LogType.Information, "Communications", "Downloading from " + uri.ToString() + " to " + DestinationFile); Logging.Log(Logging.LogType.Information, "Communications", "Downloading from " + uri.ToString() + " to " + DestinationFile);
try try
{ {
using (var s = client.GetStreamAsync(uri)) using (HttpResponseMessage response = client.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).Result)
{ {
s.ConfigureAwait(false); response.EnsureSuccessStatusCode();
if (!Directory.Exists(DestinationDirectory)) using (Stream contentStream = await response.Content.ReadAsStreamAsync(), fileStream = new FileStream(DestinationFile, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true))
{
Directory.CreateDirectory(DestinationDirectory);
}
using (var fs = new FileStream(DestinationFile, FileMode.OpenOrCreate))
{ {
s.Result.CopyTo(fs); var totalRead = 0L;
var totalReads = 0L;
var buffer = new byte[8192];
var isMoreToRead = true;
do
{
var read = await contentStream.ReadAsync(buffer, 0, buffer.Length);
if (read == 0)
{
isMoreToRead = false;
}
else
{
await fileStream.WriteAsync(buffer, 0, read);
totalRead += read;
totalReads += 1;
if (totalReads % 2000 == 0)
{
Console.WriteLine(string.Format("total bytes downloaded so far: {0:n0}", totalRead));
}
}
}
while (isMoreToRead);
} }
} }
if (File.Exists(DestinationFile)) return true;
{
FileInfo fi = new FileInfo(DestinationFile);
if (fi.Length > 0)
{
return true;
}
else
{
File.Delete(DestinationFile);
throw new Exception("Zero length file");
}
}
else
{
throw new Exception("Zero length file");
}
} }
catch (Exception ex) catch (HttpRequestException ex)
{ {
Logging.Log(Logging.LogType.Critical, "Communications", "Error while downloading from " + uri.ToString(), ex); if (ex.StatusCode == HttpStatusCode.NotFound)
{
if (File.Exists(DestinationFile))
{
FileInfo fi = new FileInfo(DestinationFile);
if (fi.Length == 0)
{
File.Delete(DestinationFile);
}
}
}
throw; Logging.Log(Logging.LogType.Warning, "Download Images", "Error downloading file: ", ex);
} }
return false; return false;
} }
public static async Task<string> GetSpecificImageFromServer(string ImagePath, string ImageId, IGDBAPI_ImageSize size, List<IGDBAPI_ImageSize>? FallbackSizes = null) public async Task<string> GetSpecificImageFromServer(string ImagePath, string ImageId, IGDBAPI_ImageSize size, List<IGDBAPI_ImageSize>? FallbackSizes = null)
{ {
string returnPath = "";
if (RateLimitResumeTime > DateTime.UtcNow)
{
Logging.Log(Logging.LogType.Information, "API Connection", "IGDB rate limit hit. Pausing API communications until " + RateLimitResumeTime.ToString() + ". Attempt " + RetryAttempts + " of " + RetryAttemptsMax + " retries.");
Thread.Sleep(RateLimitRecoveryWaitTime);
}
if (InRateLimitAvoidanceMode == true)
{
// sleep for a moment to help avoid hitting the rate limiter
Thread.Sleep(RateLimitAvoidanceWait);
}
Communications comms = new Communications(); Communications comms = new Communications();
List<IGDBAPI_ImageSize> imageSizes = new List<IGDBAPI_ImageSize> List<IGDBAPI_ImageSize> imageSizes = new List<IGDBAPI_ImageSize>
{ {
size size
}; };
string returnPath = "";
FileInfo? fi;
// get the image // get the image
try try
{ {
returnPath = Path.Combine(ImagePath, size.ToString(), ImageId + ".jpg"); returnPath = Path.Combine(ImagePath, size.ToString(), ImageId + ".jpg");
if (!File.Exists(returnPath)) if (File.Exists(returnPath)) { File.Delete(returnPath); }
{ await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
if (File.Exists(returnPath))
{
fi = new FileInfo(returnPath);
if (fi.Length == 0 || fi.LastWriteTimeUtc.AddDays(7) < DateTime.UtcNow)
{
File.Delete(returnPath);
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
}
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)
@@ -334,6 +361,9 @@ namespace gaseous_server.Classes.Metadata
} }
} }
// increment rate limiter avoidance call count
RateLimitAvoidanceCallCount += 1;
return returnPath; return returnPath;
} }
@@ -351,8 +381,25 @@ namespace gaseous_server.Classes.Metadata
string url = urlTemplate.Replace("{size}", Common.GetDescription(ImageSize)).Replace("{hash}", ImageId); string url = urlTemplate.Replace("{size}", Common.GetDescription(ImageSize)).Replace("{hash}", ImageId);
string newOutputPath = Path.Combine(OutputPath, Common.GetDescription(ImageSize)); string newOutputPath = Path.Combine(OutputPath, Common.GetDescription(ImageSize));
string OutputFile = ImageId + ".jpg"; string OutputFile = ImageId + ".jpg";
string fullPath = Path.Combine(newOutputPath, OutputFile);
await _DownloadFile(new Uri(url), Path.Combine(newOutputPath, OutputFile)); bool AllowDownload = true;
FileInfo fi;
if (File.Exists(fullPath))
{
fi = new FileInfo(fullPath);
if (fi.LastWriteTimeUtc.AddDays(14) < DateTime.UtcNow)
{
File.Delete(fullPath);
AllowDownload = true;
}
}
if (AllowDownload == true)
{
await _DownloadFile(new Uri(url), fullPath);
}
} }
} }

12
gaseous-server/Classes/Metadata/CompanyLogos.cs
View File

@@ -97,7 +97,8 @@ namespace gaseous_server.Classes.Metadata
{ {
Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Company logo download forced."); Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Company logo download forced.");
GetImageFromServer(ImagePath, returnValue.ImageId); Communications comms = new Communications();
comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
} }
return returnValue; return returnValue;
@@ -118,15 +119,6 @@ namespace gaseous_server.Classes.Metadata
return result; return result;
} }
private static async void GetImageFromServer(string ImagePath, string ImageId)
{
Communications comms = new Communications();
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>();
imageSizes.AddRange(Enum.GetValues(typeof(Communications.IGDBAPI_ImageSize)).Cast<Communications.IGDBAPI_ImageSize>());
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
} }
} }

20
gaseous-server/Classes/Metadata/Covers.cs
View File

@@ -96,14 +96,19 @@ namespace gaseous_server.Classes.Metadata
Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Cover download forced."); Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Cover download forced.");
// check for presence of image file - download if absent or force download is true // check for presence of image file - download if absent or force download is true
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>(); List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>{
imageSizes.AddRange(Enum.GetValues(typeof(Communications.IGDBAPI_ImageSize)).Cast<Communications.IGDBAPI_ImageSize>()); Communications.IGDBAPI_ImageSize.cover_big,
Communications.IGDBAPI_ImageSize.cover_small,
Communications.IGDBAPI_ImageSize.original
};
Communications comms = new Communications();
foreach (Communications.IGDBAPI_ImageSize size in imageSizes) foreach (Communications.IGDBAPI_ImageSize size in imageSizes)
{ {
string localFile = Path.Combine(ImagePath, size.ToString(), returnValue.ImageId + ".jpg"); string localFile = Path.Combine(ImagePath, size.ToString(), returnValue.ImageId + ".jpg");
if ((!File.Exists(localFile)) || forceImageDownload == true) if ((!File.Exists(localFile)) || forceImageDownload == true)
{ {
Communications.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, size, null); comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, size, null);
} }
} }
} }
@@ -126,15 +131,6 @@ namespace gaseous_server.Classes.Metadata
return result; return result;
} }
public static async void GetImageFromServer(string ImagePath, string ImageId)
{
Communications comms = new Communications();
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>();
imageSizes.AddRange(Enum.GetValues(typeof(Communications.IGDBAPI_ImageSize)).Cast<Communications.IGDBAPI_ImageSize>());
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
} }
} }

22
gaseous-server/Classes/Metadata/PlatformLogos.cs
View File

@@ -94,13 +94,14 @@ namespace gaseous_server.Classes.Metadata
if (returnValue != null) if (returnValue != null)
{ {
// check for presence of "original" quality file - download if absent or force download is true // check for presence of "original" quality file - download if absent or force download is true
string localFile = Path.Combine(ImagePath, Communications.IGDBAPI_ImageSize.original.ToString(), returnValue.ImageId + ".jpg"); string localFile = Path.Combine(ImagePath, Communications.IGDBAPI_ImageSize.original.ToString(), returnValue.ImageId + ".jpg");
if ((!File.Exists(localFile)) || forceImageDownload == true) if ((!File.Exists(localFile)) || forceImageDownload == true)
{ {
Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Platform logo download forced."); Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Platform logo download forced.");
GetImageFromServer(ImagePath, returnValue.ImageId); Communications comms = new Communications();
} comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
}
} }
return returnValue; return returnValue;
@@ -121,15 +122,6 @@ namespace gaseous_server.Classes.Metadata
return result; return result;
} }
private static async void GetImageFromServer(string ImagePath, string ImageId)
{
Communications comms = new Communications();
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>();
imageSizes.AddRange(Enum.GetValues(typeof(Communications.IGDBAPI_ImageSize)).Cast<Communications.IGDBAPI_ImageSize>());
comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
} }
} }

13
gaseous-server/Classes/Metadata/Screenshots.cs
View File

@@ -95,7 +95,8 @@ namespace gaseous_server.Classes.Metadata
{ {
Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Screenshot download forced."); Logging.Log(Logging.LogType.Information, "Metadata: " + returnValue.GetType().Name, "Screenshot download forced.");
GetImageFromServer(ImagePath, returnValue.ImageId); Communications comms = new Communications();
comms.GetSpecificImageFromServer(ImagePath, returnValue.ImageId, Communications.IGDBAPI_ImageSize.original, null);
} }
return returnValue; return returnValue;
@@ -116,16 +117,6 @@ namespace gaseous_server.Classes.Metadata
return result; return result;
} }
private static async void GetImageFromServer(string ImagePath, string ImageId)
{
Communications comms = new Communications();
List<Communications.IGDBAPI_ImageSize> imageSizes = new List<Communications.IGDBAPI_ImageSize>();
imageSizes.Add(Communications.IGDBAPI_ImageSize.original);
imageSizes.Add(Communications.IGDBAPI_ImageSize.thumb);
await comms.IGDBAPI_GetImage(imageSizes, ImageId, ImagePath);
}
} }
} }

2
gaseous-server/Classes/MetadataManagement.cs
View File

@@ -13,7 +13,7 @@ namespace gaseous_server.Classes
DataTable dt = new DataTable(); DataTable dt = new DataTable();
// disabling forceRefresh // disabling forceRefresh
forceRefresh = true; forceRefresh = false;
// update platforms // update platforms
sql = "SELECT Id, `Name` FROM Platform;"; sql = "SELECT Id, `Name` FROM Platform;";

25
gaseous-server/Controllers/V1.0/GamesController.cs
View File

@@ -537,8 +537,18 @@ namespace gaseous_server.Controllers
try try
{ {
IGDB.Models.Artwork artworkObject = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject)); IGDB.Models.Artwork artworkObject = Artworks.GetArtwork(ArtworkId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
if (artworkObject != null) { if (artworkObject != null) {
string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Artwork", size.ToString(), artworkObject.ImageId + ".jpg"); //string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Artwork", size.ToString(), artworkObject.ImageId + ".jpg");
string basePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Artwork");
Communications comms = new Communications();
Task<string> ImgFetch = comms.GetSpecificImageFromServer(basePath, artworkObject.ImageId, size, new List<Communications.IGDBAPI_ImageSize>{ Communications.IGDBAPI_ImageSize.original });
string coverFilePath = ImgFetch.Result;
if (System.IO.File.Exists(coverFilePath)) if (System.IO.File.Exists(coverFilePath))
{ {
string filename = artworkObject.ImageId + ".jpg"; string filename = artworkObject.ImageId + ".jpg";
@@ -633,7 +643,8 @@ namespace gaseous_server.Controllers
IGDB.Models.Cover cover = Classes.Metadata.Covers.GetCover(gameObject.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), false); IGDB.Models.Cover cover = Classes.Metadata.Covers.GetCover(gameObject.Cover.Id, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), false);
string basePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Covers"); string basePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Covers");
Task<string> ImgFetch = Communications.GetSpecificImageFromServer(basePath, cover.ImageId, size, new List<Communications.IGDBAPI_ImageSize>{ Communications.IGDBAPI_ImageSize.cover_big, Communications.IGDBAPI_ImageSize.original }); Communications comms = new Communications();
Task<string> ImgFetch = comms.GetSpecificImageFromServer(basePath, cover.ImageId, size, new List<Communications.IGDBAPI_ImageSize>{ Communications.IGDBAPI_ImageSize.cover_big, Communications.IGDBAPI_ImageSize.original });
string coverFilePath = ImgFetch.Result; string coverFilePath = ImgFetch.Result;
@@ -1346,7 +1357,15 @@ namespace gaseous_server.Controllers
IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject)); IGDB.Models.Screenshot screenshotObject = Screenshots.GetScreenshot(ScreenshotId, Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject));
string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Screenshots", Size.ToString(), screenshotObject.ImageId + ".jpg"); //string coverFilePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Screenshots", Size.ToString(), screenshotObject.ImageId + ".jpg");
string basePath = Path.Combine(Config.LibraryConfiguration.LibraryMetadataDirectory_Game(gameObject), "Screenshots");
Communications comms = new Communications();
Task<string> ImgFetch = comms.GetSpecificImageFromServer(basePath, screenshotObject.ImageId, Size, new List<Communications.IGDBAPI_ImageSize>{ Communications.IGDBAPI_ImageSize.original });
string coverFilePath = ImgFetch.Result;
if (System.IO.File.Exists(coverFilePath)) if (System.IO.File.Exists(coverFilePath))
{ {
string filename = screenshotObject.ImageId + ".jpg"; string filename = screenshotObject.ImageId + ".jpg";

6
gaseous-server/wwwroot/pages/emulator.html
View File

@@ -27,12 +27,12 @@
} else { } else {
if (result.cover) { if (result.cover) {
var bg = document.getElementById('bgImage'); var bg = document.getElementById('bgImage');
bg.setAttribute('style', 'background-image: url("/api/v1.1/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.1/Games/' + gameId + '/cover/image/original"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);');
} }
} }
if (result.cover) { if (result.cover) {
emuBackground = '/api/v1.1/Games/' + gameId + '/cover/image'; emuBackground = '/api/v1.1/Games/' + gameId + '/cover/image/original';
} }
emuGameTitle = gameData.name; emuGameTitle = gameData.name;
@@ -59,7 +59,7 @@
artworksPosition = 0; artworksPosition = 0;
} }
var bg = document.getElementById('bgImage'); var bg = document.getElementById('bgImage');
bg.setAttribute('style', 'background-image: url("/api/v1.1/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.1/Games/' + gameId + '/artwork/' + artworks[artworksPosition] + '/image/original"); background-position: center; background-repeat: no-repeat; background-size: cover; filter: blur(10px); -webkit-filter: blur(10px);');
} }
} }
</script> </script>