griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: asset catalogs, move file header definition to constant

Browse Source 
Define the standard catalog definition file header in a constant,
separating it from the function that writes the entire file.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2021-09-28 17:47:16 +02:00
parent 3acf3e9e2f
commit 10d926cd4a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_asset_catalog.hh
View File

@@ -231,6 +231,7 @@ class AssetCatalogDefinitionFile {
* Later versioning code may be added to handle older files. */
const static int SUPPORTED_VERSION;
const static std::string VERSION_MARKER;
const static std::string HEADER;
CatalogFilePath file_path;

15
source/blender/blenkernel/intern/asset_catalog.cc
View File

@@ -48,6 +48,13 @@ const int AssetCatalogDefinitionFile::SUPPORTED_VERSION = 1;
* that starts with "VERSION". */
const std::string AssetCatalogDefinitionFile::VERSION_MARKER = "VERSION ";
const std::string AssetCatalogDefinitionFile::HEADER =
"# This is an Asset Catalog Definition file for Blender.\n"
"#\n"
"# Empty lines and lines starting with `#` will be ignored.\n"
"# The first non-ignored line should be the version indicator.\n"
"# Other lines are of the format \"UUID:catalog/path/for/assets:simple catalog name\"\n";
AssetCatalogService::AssetCatalogService(const CatalogFilePath &asset_library_root)
: asset_library_root_(asset_library_root)
{
@@ -652,13 +659,7 @@ bool AssetCatalogDefinitionFile::write_to_disk_unsafe(const CatalogFilePath &des
// the file again.
// Write the header.
// TODO(@sybren): move the header definition to some other place.
output << "# This is an Asset Catalog Definition file for Blender." << std::endl;
output << "#" << std::endl;
output << "# Empty lines and lines starting with `#` will be ignored." << std::endl;
output << "# The first non-ignored line should be the version indicator." << std::endl;
output << "# Other lines are of the format \"UUID:catalog/path/for/assets:simple catalog name\""
<< std::endl;
output << HEADER;
output << "" << std::endl;
output << VERSION_MARKER << SUPPORTED_VERSION << std::endl;
output << "" << std::endl;