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

Fix signature of import_apkg()

Browse source
This commit is contained in:
RumovZ 2022-04-08 18:57:01 +02:00
parent 468c0286f9
commit d6134748f2
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ use std::{
collections::{HashMap, HashSet},
fs::File,
io, mem,
path::Path,
sync::Arc,
};
@ -28,6 +29,7 @@ use crate::{
MediaManager,
},
prelude::*,
search::SearchNode,
text::replace_media_refs,
};
@ -87,16 +89,10 @@ impl SafeMediaEntry {
}
impl Collection {
pub fn import_apkg(
&mut self,
path: &str,
search: impl TryIntoSearch,
with_scheduling: bool,
) -> Result<()> {
pub fn import_apkg(&mut self, path: impl AsRef<Path>) -> Result<()> {
let file = File::open(path)?;
let archive = ZipArchive::new(file)?;
let mut ctx = Context::new(archive, self, search, with_scheduling)?;
let mut ctx = Context::new(archive, self)?;
ctx.import()?;
Ok(())
}
@ -126,13 +122,9 @@ impl ExchangeData {
}
impl<'a> Context<'a> {
fn new(
mut archive: ZipArchive<File>,
target_col: &'a mut Collection,
search: impl TryIntoSearch,
with_scheduling: bool,
) -> Result<Self> {
let data = ExchangeData::gather_from_archive(&mut archive, search, with_scheduling)?;
fn new(mut archive: ZipArchive<File>, target_col: &'a mut Collection) -> Result<Self> {
let data =
ExchangeData::gather_from_archive(&mut archive, SearchNode::WholeCollection, true)?;
let guid_map = target_col.storage.note_guid_map()?;
let usn = target_col.usn()?;
let normalize_notes = target_col.get_config_bool(BoolKey::NormalizeNoteText);