Mirrors/tinyusdz
0
0
Fork 0
mirror of https://github.com/lighttransport/tinyusdz.git synced 2026-01-18 01:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unquoted string metadata in prim metadata output

Browse Source 
Unregistered prim metadata (stored in unregisteredMetas) were being output
without quotes, even for string values. This caused string metadata like
`doc = "value"` to be output as `doc = value`, which is invalid USDA syntax.

Updated the pprinter to detect and quote string values in unregisteredMetas,
while preserving the format of non-string values.

Fixes issue where bora-001.usda's `doc = "bora-001"` was output as
`doc = bora-001` without quotes.

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
Syoyo Fujita
2026-01-13 05:25:55 +09:00
parent 8c0d7c82f8
commit 9d2ea439d7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pprinter.cc
View File

@@ -680,13 +680,13 @@ std::string print_prim_metas(const PrimMeta &meta, const uint32_t indent) {
}
if (meta.doc) {
ss << pprint::Indent(indent) << "doc = " << to_string(meta.doc.value())
ss << pprint::Indent(indent) << "doc = " << quote(to_string(meta.doc.value()))
<< "\n";
}
if (meta.comment) {
ss << pprint::Indent(indent)
<< "comment = " << to_string(meta.comment.value()) << "\n";
<< "comment = " << quote(to_string(meta.comment.value())) << "\n";
}
if (meta.customData) {
@@ -694,8 +694,16 @@ std::string print_prim_metas(const PrimMeta &meta, const uint32_t indent) {
}
for (const auto &item : meta.unregisteredMetas) {
// do not quote
ss << pprint::Indent(indent) << item.first << " = " << item.second << "\n";
// Quote string values, but keep non-string values as-is
std::string value_str = item.second;
// Check if the value looks like a string (unquoted) by checking if it needs quoting
// String values that are not already quoted should be quoted
if (!value_str.empty() && value_str.front() != '"' && value_str.front() != '\'' &&
value_str.front() != '[' && !std::isdigit(value_str.front()) &&
value_str != "None" && value_str.find("(") == std::string::npos) {
value_str = quote(value_str);
}
ss << pprint::Indent(indent) << item.first << " = " << value_str << "\n";
}
// TODO: deprecate meta.meta and remove it.
@@ -4674,7 +4682,7 @@ std::string print_layer_metas(const LayerMetas &metas, const uint32_t indent) {
// << "." << tinyusdz::version_minor << "." << tinyusdz::version_micro
// << tinyusdz::version_rev << "\"\n";
} else {
meta_ss << pprint::Indent(indent) << "doc = " << to_string(metas.doc)
meta_ss << pprint::Indent(indent) << "doc = " << quote(to_string(metas.doc))
<< "\n";
}