From 2342eb093af54a9f5280a3cb3975893d2ac14014 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Thu, 17 Sep 2020 01:59:08 +0200
Subject: [PATCH] Fixed some content readers not being tried for
 RawContentManager

---
 .../{RawJsonReader.cs => JsonReader.cs}       |  2 +-
 MLEM.Data/Content/RawContentManager.cs        | 38 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)
 rename MLEM.Data/Content/{RawJsonReader.cs => JsonReader.cs} (92%)

diff --git a/MLEM.Data/Content/RawJsonReader.cs b/MLEM.Data/Content/JsonReader.cs
similarity index 92%
rename from MLEM.Data/Content/RawJsonReader.cs
rename to MLEM.Data/Content/JsonReader.cs
index dfe9ced..83a0b11 100644
--- a/MLEM.Data/Content/RawJsonReader.cs
+++ b/MLEM.Data/Content/JsonReader.cs
@@ -4,7 +4,7 @@ using Newtonsoft.Json;
 
 namespace MLEM.Data.Content {
     /// <inheritdoc />
-    public class RawJsonReader : RawContentReader {
+    public class JsonReader : RawContentReader {
 
         /// <inheritdoc />
         public override bool CanRead(Type t) {
diff --git a/MLEM.Data/Content/RawContentManager.cs b/MLEM.Data/Content/RawContentManager.cs
index 5bfe04f..c1cbdeb 100644
--- a/MLEM.Data/Content/RawContentManager.cs
+++ b/MLEM.Data/Content/RawContentManager.cs
@@ -49,35 +49,31 @@ namespace MLEM.Data.Content {
             return this.Read<T>(assetName, default);
         }
 
-        private static RawContentReader GetReader<T>() {
-            var reader = Readers.FirstOrDefault(r => r.CanRead(typeof(T)));
-            if (reader == null)
-                throw new ContentLoadException($"{typeof(T)} has no RawContentReader");
-            return reader;
-        }
-
         /// <inheritdoc/>
         protected override void ReloadAsset<T>(string originalAssetName, T currentAsset) {
             this.Read(originalAssetName, currentAsset);
         }
 
         private T Read<T>(string assetName, T existing) {
-            var reader = GetReader<T>();
-            foreach (var ext in reader.GetFileExtensions()) {
-                var file = new FileInfo(Path.Combine(this.RootDirectory, $"{assetName}.{ext}"));
-                if (!file.Exists)
-                    continue;
-                using (var stream = file.OpenRead()) {
-                    var read = reader.Read(this, assetName, stream, typeof(T), existing);
-                    if (!(read is T t))
-                        throw new ContentLoadException($"{reader} returned non-{typeof(T)} for asset {assetName}");
-                    this.LoadedAssets[assetName] = t;
-                    if (t is IDisposable d && !this.disposableAssets.Contains(d))
-                        this.disposableAssets.Add(d);
-                    return t;
+            var triedFiles = new List<string>();
+            foreach (var reader in Readers.Where(r => r.CanRead(typeof(T)))) {
+                foreach (var ext in reader.GetFileExtensions()) {
+                    var file = Path.Combine(this.RootDirectory, $"{assetName}.{ext}");
+                    triedFiles.Add(file);
+                    if (!File.Exists(file))
+                        continue;
+                    using (var stream = File.OpenRead(file)) {
+                        var read = reader.Read(this, assetName, stream, typeof(T), existing);
+                        if (!(read is T t))
+                            throw new ContentLoadException($"{reader} returned non-{typeof(T)} for asset {assetName}");
+                        this.LoadedAssets[assetName] = t;
+                        if (t is IDisposable d && !this.disposableAssets.Contains(d))
+                            this.disposableAssets.Add(d);
+                        return t;
+                    }
                 }
             }
-            throw new ContentLoadException($"Asset {assetName} not found");
+            throw new ContentLoadException($"Asset {assetName} not found. Tried files {string.Join(", ", triedFiles)}");
         }
 
         /// <inheritdoc/>