Fix unused parent tags getting cleared

ankitects · Jul 12, 2024 · 10040b8 · 10040b8
1 parent 9d8782c
commit 10040b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rslib/src/tags/mod.rs b/rslib/src/tags/mod.rs
@@ -56,7 +56,7 @@ fn is_tag_separator(c: char) -> bool {
 }
 
 pub(crate) fn immediate_parent_name_unicase(tag_name: UniCase<&str>) -> Option<UniCase<&str>> {
-    tag_name.rsplit_once('\x1f').map(|t| t.0).map(UniCase::new)
+    tag_name.rsplit_once("::").map(|t| t.0).map(UniCase::new)
 }
 
 fn immediate_parent_name_str(tag_name: &str) -> Option<&str> {

diff --git a/rslib/src/tags/tree.rs b/rslib/src/tags/tree.rs
@@ -58,10 +58,11 @@ fn add_missing_parents(tags: &mut Vec<Tag>) {
 }
 
 fn tags_to_tree(mut tags: Vec<Tag>) -> TagTreeNode {
+
+    add_missing_parents(&mut tags);
     for tag in &mut tags {
         tag.name = tag.name.replace("::", "\x1f");
     }
-    add_missing_parents(&mut tags);
     tags.sort_unstable_by(|a, b| UniCase::new(&a.name).cmp(&UniCase::new(&b.name)));
     let mut top = TagTreeNode::default();
     let mut it = tags.into_iter().peekable();