Move the solution to the Rust layer

This commit is contained in:
Kris Cherven 2025-03-17 18:08:19 -04:00
parent 83d0f5dae9
commit 01e22a2794
2 changed files with 17 additions and 7 deletions

View file

@ -35,9 +35,8 @@ def reparent_decks(
return CollectionOp( return CollectionOp(
parent, lambda col: col.decks.reparent(deck_ids=deck_ids, new_parent=new_parent) parent, lambda col: col.decks.reparent(deck_ids=deck_ids, new_parent=new_parent)
).success( ).success(
lambda out: tooltip( lambda out: out.count > 0
tr.browsing_reparented_decks(count=out.count), parent=parent and tooltip(tr.browsing_reparented_decks(count=out.count), parent=parent)
)
) )

View file

@ -20,22 +20,33 @@ impl Collection {
new_parent: Option<DeckId>, new_parent: Option<DeckId>,
) -> Result<usize> { ) -> Result<usize> {
let usn = self.usn()?; let usn = self.usn()?;
let target_deck; let mut target_deck = None;
let mut target_name = None; let mut target_name = None;
if let Some(target) = new_parent { if let Some(target) = new_parent {
if let Some(target) = self.storage.get_deck(target)? { if let Some(target) = self.storage.get_deck(target)? {
if target.is_filtered() { if target.is_filtered() {
return Err(FilteredDeckError::MustBeLeafNode.into()); return Err(FilteredDeckError::MustBeLeafNode.into());
} }
target_deck = target; target_deck = Some(target);
target_name = Some(&target_deck.name); target_name = Some(target_deck.as_ref().unwrap().name.clone());
} }
} }
let mut count = 0; let mut count = 0;
for deck in deck_ids { for deck in deck_ids {
if let Some(mut deck) = self.storage.get_deck(*deck)? { if let Some(mut deck) = self.storage.get_deck(*deck)? {
if let Some(new_name) = deck.name.reparented_name(target_name) { if let Some(new_name) = deck.name.reparented_name(target_name.as_ref()) {
let parent_decks = self.storage.parent_decks(&deck).unwrap();
match target_deck {
Some(ref target) => if parent_decks.contains(&target) {
continue;
}
None => if parent_decks.is_empty() {
continue;
}
}
count += 1; count += 1;
let orig = deck.clone(); let orig = deck.clone();