GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 09:16:38 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Simplify reparenting solution

Browse source
This commit is contained in:
Kris Cherven 2025-03-21 21:04:08 -04:00
parent 3fa01c50df
commit 858250f26f
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt/aqt/operations/deck.py
View file

@ -32,13 +32,13 @@ def remove_decks(
def reparent_decks( def reparent_decks(
*, parent: QWidget, deck_ids: Sequence[DeckId], new_parent: DeckId *, parent: QWidget, deck_ids: Sequence[DeckId], new_parent: DeckId
) -> CollectionOp[OpChangesWithCount]: ) -> CollectionOp[OpChangesWithCount]:
def on_success(out):
if out.count > 0:
tooltip(tr.browsing_reparented_decks(count=out.count), parent=parent)
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(on_success) ).success(
lambda out: tooltip(
tr.browsing_reparented_decks(count=out.count), parent=parent
)
)
def rename_deck( def rename_deck(

23
rslib/src/decks/reparent.rs
View file

@ -20,36 +20,25 @@ impl Collection {
new_parent: Option<DeckId>, new_parent: Option<DeckId>,
) -> Result<usize> { ) -> Result<usize> {
let usn = self.usn()?; let usn = self.usn()?;
let mut target_deck = None; let target_deck;
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 = Some(target); target_deck = target;
target_name = Some(target_deck.as_ref().unwrap().name.clone()); target_name = Some(&target_deck.name);
} }
} }
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.as_ref()) { if let Some(new_name) = deck.name.reparented_name(target_name) {
let parent_decks = self.storage.parent_decks(&deck).unwrap(); if new_name == deck.name {
match target_deck { continue;
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();