GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-01 00:47:12 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Wrap apkg import in transaction

Browse source
This commit is contained in:
RumovZ 2022-04-09 15:35:16 +02:00
parent 1ba5444d7d
commit 7798b78c7d
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rslib/src/import_export/package/apkg/import.rs
View file

@ -90,12 +90,14 @@ impl SafeMediaEntry {
} }
impl Collection { impl Collection {
pub fn import_apkg(&mut self, path: impl AsRef<Path>) -> Result<()> { pub fn import_apkg(&mut self, path: impl AsRef<Path>) -> Result<OpOutput<()>> {
let file = File::open(path)?; let file = File::open(path)?;
let archive = ZipArchive::new(file)?; let archive = ZipArchive::new(file)?;
let mut ctx = Context::new(archive, self)?;
ctx.import()?; self.transact(Op::Import, |col| {
Ok(()) let mut ctx = Context::new(archive, col)?;
ctx.import()
})
} }
fn all_existing_sha1s(&mut self) -> Result<HashMap<String, [u8; 20]>> { fn all_existing_sha1s(&mut self) -> Result<HashMap<String, [u8; 20]>> {

2
rslib/src/ops.rs
View file

@ -17,6 +17,7 @@ pub enum Op {
CreateCustomStudy, CreateCustomStudy,
EmptyFilteredDeck, EmptyFilteredDeck,
FindAndReplace, FindAndReplace,
Import,
RebuildFilteredDeck, RebuildFilteredDeck,
RemoveDeck, RemoveDeck,
RemoveNote, RemoveNote,
@ -55,6 +56,7 @@ impl Op {
Op::AnswerCard => tr.actions_answer_card(), Op::AnswerCard => tr.actions_answer_card(),
Op::Bury => tr.studying_bury(), Op::Bury => tr.studying_bury(),
Op::CreateCustomStudy => tr.actions_custom_study(), Op::CreateCustomStudy => tr.actions_custom_study(),
Op::Import => tr.actions_import(),
Op::RemoveDeck => tr.decks_delete_deck(), Op::RemoveDeck => tr.decks_delete_deck(),
Op::RemoveNote => tr.studying_delete_note(), Op::RemoveNote => tr.studying_delete_note(),
Op::RenameDeck => tr.actions_rename_deck(), Op::RenameDeck => tr.actions_rename_deck(),