jussi/DotTiled
1
0
Fork 0
mirror of https://github.com/dcronqvist/DotTiled.git synced 2025-05-08 22:36:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified loader a bit and added more docs

Browse source
This commit is contained in:
Daniel Cronqvist 2024-09-03 22:52:26 +02:00
parent 738a9fc5a8
commit 247f9294af
3 changed files with 48 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/DotTiled.Tests/Serialization/LoaderTests.cs
View file

@ -1,5 +1,6 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using DotTiled.Serialization;
using NSubstitute;
namespace DotTiled.Tests;

52
src/DotTiled/Serialization/Loader.cs
View file

@ -79,39 +79,41 @@ public class Loader
return tilesetReader.ReadTileset();
}
private Func<string, Tileset> GetTilesetResolver(string basePath)
private Func<string, T> GetResolverFunc<T>(
string basePath,
Func<string, Optional<T>> cacheResolver,
Action<string, T> cacheInsert,
Func<string, T> resolveFromContent)
{
return source =>
{
var tilesetPath = Path.Combine(basePath, source);
var cachedTileset = _resourceCache.GetTileset(source);
if (cachedTileset.HasValue)
return cachedTileset.Value;
var resourcePath = Path.Combine(basePath, source);
var cachedResource = cacheResolver(resourcePath);
if (cachedResource.HasValue)
return cachedResource.Value;
string tilesetContent = _resourceReader.Read(tilesetPath);
using var tilesetReader = new TilesetReader(tilesetContent, GetTilesetResolver(basePath), GetTemplateResolver(basePath), CustomTypeResolver);
var tileset = tilesetReader.ReadTileset();
_resourceCache.InsertTileset(source, tileset);
return tileset;
string tilesetContent = _resourceReader.Read(resourcePath);
var resource = resolveFromContent(tilesetContent);
cacheInsert(resourcePath, resource);
return resource;
};
}
private Func<string, Template> GetTemplateResolver(string basePath)
{
return source =>
{
var templatePath = Path.Combine(basePath, source);
var cachedTemplate = _resourceCache.GetTemplate(source);
if (cachedTemplate.HasValue)
return cachedTemplate.Value;
private Func<string, Tileset> GetTilesetResolver(string basePath) =>
GetResolverFunc<Tileset>(basePath, _resourceCache.GetTileset, _resourceCache.InsertTileset,
tilesetContent =>
{
using var tilesetReader = new TilesetReader(tilesetContent, GetTilesetResolver(basePath), GetTemplateResolver(basePath), CustomTypeResolver);
return tilesetReader.ReadTileset();
});
string templateContent = _resourceReader.Read(templatePath);
using var templateReader = new TemplateReader(templateContent, GetTilesetResolver(basePath), GetTemplateResolver(basePath), CustomTypeResolver);
var template = templateReader.ReadTemplate();
_resourceCache.InsertTemplate(source, template);
return template;
};
}
private Func<string, Template> GetTemplateResolver(string basePath) =>
GetResolverFunc<Template>(basePath, _resourceCache.GetTemplate, _resourceCache.InsertTemplate,
templateContent =>
{
using var templateReader = new TemplateReader(templateContent, GetTilesetResolver(basePath), GetTemplateResolver(basePath), CustomTypeResolver);
return templateReader.ReadTemplate();
});
private ICustomTypeDefinition CustomTypeResolver(string name) => _customTypeDefinitions[name];
}