evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add version logging for named asset sources

Browse Source
This commit is contained in:
Kae 2025-01-05 15:22:20 +11:00
parent 57a5afa13a
commit 06ce4f042d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/game/StarRoot.cpp
View File

@ -585,6 +585,7 @@ StringList Root::scanForAssetSources(StringList const& directories, StringList c
struct AssetSource { struct AssetSource {
String path; String path;
Maybe<String> name; Maybe<String> name;
Maybe<String> version;
float priority; float priority;
StringList requires_; StringList requires_;
StringList includes; StringList includes;
@ -612,6 +613,7 @@ StringList Root::scanForAssetSources(StringList const& directories, StringList c
auto assetSource = make_shared<AssetSource>(); auto assetSource = make_shared<AssetSource>();
assetSource->path = sourcePath; assetSource->path = sourcePath;
assetSource->name = metadata.maybe("name").apply(mem_fn(&Json::toString)); assetSource->name = metadata.maybe("name").apply(mem_fn(&Json::toString));
assetSource->version = metadata.maybe("version").apply(mem_fn(&Json::toString));
assetSource->priority = metadata.value("priority", 0.0f).toFloat(); assetSource->priority = metadata.value("priority", 0.0f).toFloat();
assetSource->requires_ = jsonToStringList(metadata.value("requires", JsonArray{})); assetSource->requires_ = jsonToStringList(metadata.value("requires", JsonArray{}));
assetSource->includes = jsonToStringList(metadata.value("includes", JsonArray{})); assetSource->includes = jsonToStringList(metadata.value("includes", JsonArray{}));
@ -705,7 +707,7 @@ StringList Root::scanForAssetSources(StringList const& directories, StringList c
for (auto const& source : dependencySortedSources) { for (auto const& source : dependencySortedSources) {
auto path = File::convertDirSeparators(source->path); auto path = File::convertDirSeparators(source->path);
if (source->name) if (source->name)
Logger::info("Root: Detected asset source named '{}' at '{}'", *source->name, path); Logger::info("Root: Detected asset source named '{}'{} at '{}'", *source->name, source->version ? strf(" version '{}'", *source->version) : "", path);
else else
Logger::info("Root: Detected unnamed asset source at '{}'", path); Logger::info("Root: Detected unnamed asset source at '{}'", path);
sourcePaths.append(path); sourcePaths.append(path);