Allow conversion of assets not in the database to images

LittleBigRefresh · Aug 7, 2024 · 50c103c · 50c103c
1 parent d8ece96
commit 50c103c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/Refresh.GameServer/Endpoints/ApiV3/ResourceApiEndpoints.cs b/Refresh.GameServer/Endpoints/ApiV3/ResourceApiEndpoints.cs
@@ -61,7 +61,8 @@ public Response DownloadGameAsset(RequestContext context, IDataStore dataStore,
     [DocError(typeof(ApiValidationError), ApiValidationError.HashMissingErrorWhen)]
     [RateLimitSettings(RequestTimeoutDuration, MaxRequestAmount, RequestBlockDuration, BucketName)]
     public Response DownloadPspGameAsset(RequestContext context, IDataStore dataStore,
-        [DocSummary("The SHA1 hash of the asset")] string hash) => DownloadGameAsset(context, dataStore, $"psp/{hash}");
+        [DocSummary("The SHA1 hash of the asset")] string hash)
+        => this.DownloadGameAsset(context, dataStore, $"psp/{hash}");
 
     [ApiV3Endpoint("assets/{hash}/image", ContentType.Png), Authentication(false)]
     [ClientCacheResponse(9204111)] // 1 week, data may or may not change
@@ -70,7 +71,7 @@ public Response DownloadPspGameAsset(RequestContext context, IDataStore dataStor
     [DocError(typeof(ApiInternalError), ApiInternalError.CouldNotGetAssetErrorWhen)]
     [DocError(typeof(ApiValidationError), ApiValidationError.HashMissingErrorWhen)]
     public Response DownloadGameAssetAsImage(RequestContext context, IDataStore dataStore, GameDatabaseContext database,
-        [DocSummary("The SHA1 hash of the asset")] string hash, ImageImporter importer)
+        [DocSummary("The SHA1 hash of the asset")] string hash, ImageImporter imageImport, AssetImporter assetImport)
     {
         bool isPspAsset = hash.StartsWith("psp/");
 
@@ -87,16 +88,14 @@ public Response DownloadGameAssetAsImage(RequestContext context, IDataStore data
             if (convertedType != null)
             {
                 //Import the converted hash from the data store
-                importer.ImportAsset(realHash, isPspAsset, convertedType.Value, dataStore);
+                imageImport.ImportAsset(realHash, isPspAsset, convertedType.Value, dataStore);
             }
             //If not,
             else
             {
                 //Import the asset as normal
                 GameAsset? asset = database.GetAssetFromHash(realHash);
-                if (asset == null) return ApiInternalError.CouldNotGetAssetDatabaseError;
-
-                importer.ImportAsset(asset.AssetHash, asset.IsPSP, asset.AssetType, dataStore);
+                imageImport.ImportAsset(realHash, isPspAsset, asset?.AssetType, dataStore);
             }
         }
 
@@ -113,7 +112,8 @@ public Response DownloadGameAssetAsImage(RequestContext context, IDataStore data
     [DocError(typeof(ApiInternalError), ApiInternalError.CouldNotGetAssetErrorWhen)]
     [DocError(typeof(ApiValidationError), ApiValidationError.HashMissingErrorWhen)]
     public Response DownloadPspGameAssetAsImage(RequestContext context, IDataStore dataStore, GameDatabaseContext database,
-        [DocSummary("The SHA1 hash of the asset")] string hash, ImageImporter importer) => this.DownloadGameAssetAsImage(context, dataStore, database, $"psp/{hash}", importer);
+        [DocSummary("The SHA1 hash of the asset")] string hash, ImageImporter imageImport, AssetImporter assetImport) 
+        => this.DownloadGameAssetAsImage(context, dataStore, database, $"psp/{hash}", imageImport, assetImport);
 
     [ApiV3Endpoint("assets/{hash}"), Authentication(false)]
     [DocSummary("Gets information from the database about a particular hash. Includes user who uploaded, dependencies, timestamps, etc.")]

diff --git a/Refresh.GameServer/Importing/ImageImporter.cs b/Refresh.GameServer/Importing/ImageImporter.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using Bunkum.Core.Storage;
 using NotEnoughLogs;
+using Refresh.GameServer.Authentication;
 using Refresh.GameServer.Database;
 using Refresh.GameServer.Extensions;
 using Refresh.GameServer.Resources;
@@ -68,9 +69,19 @@ private void ThreadTask(ConcurrentQueue<GameAsset> assetQueue, IDataStore dataSt
         this._runningCount--;
     }
 
-    public void ImportAsset(string hash, bool isPsp, GameAssetType type, IDataStore dataStore)
+    public void ImportAsset(string hash, bool isPsp, GameAssetType? type, IDataStore dataStore)
     {
         string dataStorePath = isPsp ? $"psp/{hash}" : hash;
+
+        if (type == null)
+        {
+            using Stream typeStream = dataStore.GetStreamFromStore(dataStorePath);
+            Span<byte> span = stackalloc byte[16];
+            _ = typeStream.Read(span);
+
+            (GameAssetType type, GameAssetFormat) assetType = this.DetermineAssetType(span, isPsp ? TokenPlatform.PSP : TokenPlatform.Website);
+            type = assetType.type;
+        }
 
         using Stream stream = dataStore.GetStreamFromStore(dataStorePath);
         using Stream writeStream = dataStore.OpenWriteStream($"png/{hash}");

diff --git a/Refresh.GameServer/Importing/Importer.cs b/Refresh.GameServer/Importing/Importer.cs
@@ -4,6 +4,7 @@
 using System.Security.Cryptography;
 using System.Text;
 using Bunkum.Core;
+using JetBrains.Annotations;
 using NotEnoughLogs;
 using Refresh.GameServer.Authentication;
 using Refresh.GameServer.Resources;
@@ -181,6 +182,7 @@ private bool IsMip(Span<byte> rawData)
         return true;
     }
 
+    [Pure]
     protected (GameAssetType, GameAssetFormat) DetermineAssetType(Span<byte> data, TokenPlatform? tokenPlatform)
     {
         GameAssetType? lbpAssetType = GameAssetTypeExtensions.LbpMagicToGameAssetType(data.Slice(0, 3));