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

Fix some apkg import issues (#1836)

Browse source 
* Allow gathering of orphaned decks

* Skip redundant media checking in apkg import
This commit is contained in:
RumovZ 2022-05-06 01:22:15 +02:00 committed by GitHub
parent 6a95141fd9
commit 99c4ec93d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rslib/src/import_export/gather.rs
View file

@ -187,12 +187,10 @@ impl Collection {
) -> Result<()> { ) -> Result<()> {
if let Some(parent_name) = immediate_parent_name(name) { if let Some(parent_name) = immediate_parent_name(name) {
if parent_names.insert(parent_name.to_owned()) { if parent_names.insert(parent_name.to_owned()) {
parents.push( if let Some(parent) = self.storage.get_deck_by_name(parent_name)? {
self.storage parents.push(parent);
.get_deck_by_name(parent_name)? self.add_parent_decks(parent_name, parent_names, parents)?;
.ok_or(AnkiError::DatabaseCheckRequired)?, }
);
self.add_parent_decks(parent_name, parent_names, parents)?;
} }
} }
Ok(()) Ok(())

17
rslib/src/import_export/package/apkg/import/media.rs
View file

@ -8,10 +8,7 @@ use zip::ZipArchive;
use super::Context; use super::Context;
use crate::{ use crate::{
import_export::{ import_export::{
package::{ package::media::{extract_media_entries, SafeMediaEntry},
media::{extract_media_entries, SafeMediaEntry},
Meta,
},
ImportProgress, IncrementableProgress, ImportProgress, IncrementableProgress,
}, },
media::{ media::{
@ -34,10 +31,16 @@ pub(super) struct MediaUseMap {
impl Context<'_> { impl Context<'_> {
pub(super) fn prepare_media(&mut self) -> Result<MediaUseMap> { pub(super) fn prepare_media(&mut self) -> Result<MediaUseMap> {
let media_entries = extract_media_entries(&self.meta, &mut self.archive)?;
if media_entries.is_empty() {
return Ok(MediaUseMap::default());
}
let db_progress_fn = self.progress.media_db_fn(ImportProgress::MediaCheck)?; let db_progress_fn = self.progress.media_db_fn(ImportProgress::MediaCheck)?;
let existing_sha1s = self.target_col.all_existing_sha1s(db_progress_fn)?; let existing_sha1s = self.target_col.all_existing_sha1s(db_progress_fn)?;
prepare_media( prepare_media(
&self.meta, media_entries,
&mut self.archive, &mut self.archive,
&existing_sha1s, &existing_sha1s,
&mut self.progress, &mut self.progress,
@ -65,7 +68,7 @@ impl Collection {
} }
fn prepare_media( fn prepare_media(
meta: &Meta, media_entries: Vec<SafeMediaEntry>,
archive: &mut ZipArchive<File>, archive: &mut ZipArchive<File>,
existing_sha1s: &HashMap<String, Sha1Hash>, existing_sha1s: &HashMap<String, Sha1Hash>,
progress: &mut IncrementableProgress<ImportProgress>, progress: &mut IncrementableProgress<ImportProgress>,
@ -73,7 +76,7 @@ fn prepare_media(
let mut media_map = MediaUseMap::default(); let mut media_map = MediaUseMap::default();
let mut incrementor = progress.incrementor(ImportProgress::MediaCheck); let mut incrementor = progress.incrementor(ImportProgress::MediaCheck);
for mut entry in extract_media_entries(meta, archive)? { for mut entry in media_entries {
incrementor.increment()?; incrementor.increment()?;
if entry.is_static() { if entry.is_static() {