Changed the proto output to write one file per top level category

klingbolt · Sep 25, 2024 · ab61a52 · ab61a52
1 parent c6b8caf
commit ab61a52
Show file tree

Hide file tree

Showing 58 changed files with 50 additions and 40 deletions.
diff --git a/xml_converter/integration_tests/run_tests.py b/xml_converter/integration_tests/run_tests.py
@@ -265,7 +265,7 @@ def diff_dirs(actual_output_dir: str, expected_output_dir: str) -> bool:
         diff: List[str]
         if file_to_diff.endswith(".xml"):
             diff = compare_text_files(expected_file, actual_file)
-        elif file_to_diff.endswith(".data") or file_to_diff.endswith(".bin") or file_to_diff.endswith(".guildp"):
+        elif file_to_diff.endswith(".data") or file_to_diff.endswith(".bin") or file_to_diff.endswith(".guildpoint"):
             diff = compare_protos(actual_file, expected_file)
         elif file_to_diff.endswith(".trl"):
             diff = []

diff --git a/...allow_duplicates/output_proto/markers.bin → ...icates/output_proto/mycategory.guildpoint b/...allow_duplicates/output_proto/markers.bin → ...icates/output_proto/mycategory.guildpoint
diff --git a/...tant_size_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint b/...tant_size_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint
diff --git a/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/proto_hide_category/output_proto/markers.bin
diff --git a/...erter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory.guildpoint b/...erter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 2B\�)Cf�RC{�WC0B(��^�

diff --git a/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory2.guildpoint b/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory2.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 2 2B\�)Cf�RC{�WCB(�i�41b

diff --git a/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory3.guildpoint b/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory3.guildpoint
@@ -0,0 +1,3 @@
+
+0
+My Category 3 2B\�)Cf�RC{�WC0B(�i�51b

diff --git a/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory4.guildpoint b/...rter/integration_tests/test_cases/proto_hide_category/output_proto/mycategory4.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 4 2B\�)Cf�RC{�WCB(�i�61b

diff --git a/...is_hidden_ingame/output_proto/markers.bin → ...ingame/output_proto/mycategory.guildpoint b/...is_hidden_ingame/output_proto/markers.bin → ...ingame/output_proto/mycategory.guildpoint
diff --git a/...is_hidden_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint b/...is_hidden_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint
diff --git a/...idden_on_minimap/output_proto/markers.bin → ...inimap/output_proto/mycategory.guildpoint b/...idden_on_minimap/output_proto/markers.bin → ...inimap/output_proto/mycategory.guildpoint
diff --git a/...onverter/integration_tests/test_cases/proto_type_valid/output_proto/mycategory.guildpoint b/...onverter/integration_tests/test_cases/proto_type_valid/output_proto/mycategory.guildpoint
@@ -0,0 +1,3 @@
+
+,
+My Category 2B\�)Cf�RC{�WCB(��^�

diff --git a/...splay_name_valid/output_proto/markers.bin → ...id/output_proto/nestedlevelone.guildpoint b/...splay_name_valid/output_proto/markers.bin → ...id/output_proto/nestedlevelone.guildpoint
@@ -1,6 +1,4 @@
 
-,
-My Category 2B\�)Cf�RC{�WCB(��^�
 �
 Nested Level Onef
 Nested Level Two3

diff --git a/..._bit_index_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint b/..._bit_index_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint
diff --git a/...l_achievement_id/output_proto/markers.bin → ...ent_id/output_proto/mycategory.guildpoint b/...l_achievement_id/output_proto/markers.bin → ...ent_id/output_proto/mycategory.guildpoint
diff --git a/..._animation_speed/output_proto/markers.bin → ..._speed/output_proto/mycategory.guildpoint b/..._animation_speed/output_proto/markers.bin → ..._speed/output_proto/mycategory.guildpoint
diff --git a/..._canfade_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint b/..._canfade_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint
diff --git a/...ml_canfade_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint b/...ml_canfade_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint
diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin
diff --git a/.../integration_tests/test_cases/xml_category_inheritance/output_proto/mycategory.guildpoint b/.../integration_tests/test_cases/xml_category_inheritance/output_proto/mycategory.guildpoint
@@ -0,0 +1,2 @@
+
+I 2B\�)Cf�RC{�WC 2B\�*Cf�RC{�WC 2B\�)Cf�SC{�WCB(��^�

diff --git a/...ntegration_tests/test_cases/xml_category_inheritance/output_proto/nestedlevel1.guildpoint b/...ntegration_tests/test_cases/xml_category_inheritance/output_proto/nestedlevel1.guildpoint
diff --git a/...ation_tests/test_cases/xml_category_inheritance/output_proto/trailnestedlevel1.guildpoint b/...ation_tests/test_cases/xml_category_inheritance/output_proto/trailnestedlevel1.guildpoint
diff --git a/xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.bin
diff --git a/...nverter/integration_tests/test_cases/xml_category_name/output_proto/mycategory.guildpoint b/...nverter/integration_tests/test_cases/xml_category_name/output_proto/mycategory.guildpoint
@@ -0,0 +1,3 @@
+
+,
+My Category 2B\�)Cf�RC{�WCB(��^�

diff --git a/...ory_name_invalid/output_proto/markers.bin → ...utput_proto/UNKNOWN_CATEGORY_0.guildpoint b/...ory_name_invalid/output_proto/markers.bin → ...utput_proto/UNKNOWN_CATEGORY_0.guildpoint
diff --git a/...xml_type_invalid/output_proto/markers.bin → ...utput_proto/UNKNOWN_CATEGORY_1.guildpoint b/...xml_type_invalid/output_proto/markers.bin → ...utput_proto/UNKNOWN_CATEGORY_1.guildpoint
diff --git a/...l_cull_chirality/output_proto/markers.bin → ...rality/output_proto/mycategory.guildpoint b/...l_cull_chirality/output_proto/markers.bin → ...rality/output_proto/mycategory.guildpoint
diff --git a/xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_default_toggle/output_proto/markers.bin
diff --git a/...verter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory.guildpoint b/...verter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 2B\�)Cf�RC{�WC0B(��^�

diff --git a/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory2.guildpoint b/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory2.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 2 2B\�)Cf�RC{�WCB(�i�41b

diff --git a/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory3.guildpoint b/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory3.guildpoint
@@ -0,0 +1,3 @@
+
+0
+My Category 3 2B\�)Cf�RC{�WC0B(�i�51b

diff --git a/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory4.guildpoint b/...erter/integration_tests/test_cases/xml_default_toggle/output_proto/mycategory4.guildpoint
@@ -0,0 +1,3 @@
+
+.
+My Category 4 2B\�)Cf�RC{�WCB(�i�61b

diff --git a/...er/integration_tests/test_cases/xml_display_name_valid/output_proto/mycategory.guildpoint b/...er/integration_tests/test_cases/xml_display_name_valid/output_proto/mycategory.guildpoint
@@ -0,0 +1,3 @@
+
+,
+My Category 2B\�)Cf�RC{�WCB(��^�

diff --git a/...proto_type_valid/output_proto/markers.bin → ...alid/output_proto/nestedlevel1.guildpoint b/...proto_type_valid/output_proto/markers.bin → ...alid/output_proto/nestedlevel1.guildpoint
@@ -1,6 +1,4 @@
 
-,
-My Category 2B\�)Cf�RC{�WCB(��^�
 �
 Nested Level Onef
 Nested Level Two3

diff --git a/...ml_fade_distance/output_proto/markers.bin → ...stance/output_proto/mycategory.guildpoint b/...ml_fade_distance/output_proto/markers.bin → ...stance/output_proto/mycategory.guildpoint
diff --git a/..._festival_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint b/..._festival_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint
diff --git a/...ases/xml_is_wall/output_proto/markers.bin → ...s_wall/output_proto/mycategory.guildpoint b/...ases/xml_is_wall/output_proto/markers.bin → ...s_wall/output_proto/mycategory.guildpoint
diff --git a/...cases/xml_map_id/output_proto/markers.bin → ...map_id/output_proto/mycategory.guildpoint b/...cases/xml_map_id/output_proto/markers.bin → ...map_id/output_proto/mycategory.guildpoint
diff --git a/..._map_type_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint b/..._map_type_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint
diff --git a/...t_filter_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint b/...t_filter_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint
diff --git a/...ountfilter_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint b/...ountfilter_valid/output_proto/markers.bin → ..._valid/output_proto/mycategory.guildpoint
diff --git a/...rofession_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint b/...rofession_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint
diff --git a/...ml_render_ingame/output_proto/markers.bin → ...ingame/output_proto/mycategory.guildpoint b/...ml_render_ingame/output_proto/markers.bin → ...ingame/output_proto/mycategory.guildpoint
diff --git a/...ml_render_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint b/...ml_render_on_map/output_proto/markers.bin → ...on_map/output_proto/mycategory.guildpoint
diff --git a/...ender_on_minimap/output_proto/markers.bin → ...inimap/output_proto/mycategory.guildpoint b/...ender_on_minimap/output_proto/markers.bin → ...inimap/output_proto/mycategory.guildpoint
diff --git a/...on_map_with_zoom/output_proto/markers.bin → ...h_zoom/output_proto/mycategory.guildpoint b/...on_map_with_zoom/output_proto/markers.bin → ...h_zoom/output_proto/mycategory.guildpoint
diff --git a/...alization_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint b/...alization_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint
diff --git a/...l_species_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint b/...l_species_filter/output_proto/markers.bin → ...filter/output_proto/mycategory.guildpoint
diff --git a/...ases/xml_texture/output_proto/markers.bin → ...exture/output_proto/mycategory.guildpoint b/...ases/xml_texture/output_proto/markers.bin → ...exture/output_proto/mycategory.guildpoint
diff --git a/..._texture_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint b/..._texture_invalid/output_proto/markers.bin → ...nvalid/output_proto/mycategory.guildpoint
diff --git a/...s/xml_trail_data/output_proto/markers.bin → ...l_data/output_proto/mycategory.guildpoint b/...s/xml_trail_data/output_proto/markers.bin → ...l_data/output_proto/mycategory.guildpoint
diff --git a/...onverter/integration_tests/test_cases/xml_type_invalid/output_proto/mycategory.guildpoint b/...onverter/integration_tests/test_cases/xml_type_invalid/output_proto/mycategory.guildpoint
diff --git a/...verter/integration_tests/test_cases/xml_type_invalid/output_proto/nestedlevel1.guildpoint b/...verter/integration_tests/test_cases/xml_type_invalid/output_proto/nestedlevel1.guildpoint
diff --git a/xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/mycategory.guildpoint b/xml_converter/integration_tests/test_cases/xml_type_valid/output_proto/mycategory.guildpoint
@@ -0,0 +1,2 @@
+
+ 2B\�)Cf�RC{�WCB(��^�

diff --git a/...s/xml_type_valid/output_proto/markers.bin → ...alid/output_proto/nestedlevel1.guildpoint b/...s/xml_type_valid/output_proto/markers.bin → ...alid/output_proto/nestedlevel1.guildpoint
@@ -1,3 +1,2 @@
 
- 2B\�)Cf�RC{�WCB(��^�
 a@ 2B\�)Cf�RC{�WCBp,Tԅ߈� 2B\�)Cf�RC{�WCB��ܸ�xj� 2B\�)Cf�RC{�WCB,���j@:

diff --git a/xml_converter/src/packaging_protobin.cpp b/xml_converter/src/packaging_protobin.cpp
@@ -211,7 +211,6 @@ void _write_protobuf_file(
 
 void write_protobuf_file(
     const string& marker_pack_root_directory,
-    const StringHierarchy& category_filter,
     const map<string, Category>* marker_categories,
     const vector<Parseable*>* parsed_pois) {
     std::map<string, std::vector<Parseable*>> category_to_pois;
@@ -234,13 +233,16 @@ void write_protobuf_file(
             std::cout << "Unknown type" << std::endl;
         }
     }
-
-    _write_protobuf_file(
-        join_file_paths(state.marker_pack_root_directory, "markers.bin"),
-        category_filter,
-        marker_categories,
-        category_to_pois,
-        &state);
+    for (auto iterator = marker_categories->begin(); iterator != marker_categories->end(); iterator++){
+        StringHierarchy category_filter;
+        category_filter.add_path({iterator->first}, true);
+        _write_protobuf_file(
+            join_file_paths(state.marker_pack_root_directory, iterator->first + ".guildpoint"),
+            category_filter,
+            marker_categories,
+            category_to_pois,
+            &state);
+    }
 }
 
 // Write protobuf per map id
@@ -269,7 +271,7 @@ void write_protobuf_file_per_map_id(
     }
 
     for (auto iterator = mapid_to_category_to_pois.begin(); iterator != mapid_to_category_to_pois.end(); iterator++) {
-        string output_filepath = join_file_paths(state.marker_pack_root_directory, to_string(iterator->first) + ".bin");
+        string output_filepath = join_file_paths(state.marker_pack_root_directory, to_string(iterator->first) + ".guildpoint");
 
         _write_protobuf_file(
             output_filepath,

diff --git a/xml_converter/src/packaging_protobin.hpp b/xml_converter/src/packaging_protobin.hpp
@@ -19,7 +19,6 @@ std::set<std::string> read_protobuf_file(
 
 void write_protobuf_file(
     const std::string& marker_pack_root_directory,
-    const StringHierarchy& category_filter,
     const std::map<std::string, Category>* marker_categories,
     const std::vector<Parseable*>* parsed_pois);
 

diff --git a/xml_converter/src/xml_converter.cpp b/xml_converter/src/xml_converter.cpp
@@ -130,9 +130,7 @@ void write_burrito_directory(
             return;
         }
     }
-    StringHierarchy category_filter;
-    category_filter.add_path({}, true);
-    write_protobuf_file(output_path, category_filter, marker_categories, parsed_pois);
+    write_protobuf_file(output_path, marker_categories, parsed_pois);
 }
 
 ////////////////////////////////////////////////////////////////////////////////