langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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<()> {
if let Some(parent_name) = immediate_parent_name(name) {
if parent_names.insert(parent_name.to_owned()) {
parents.push(
self.storage
.get_deck_by_name(parent_name)?
.ok_or(AnkiError::DatabaseCheckRequired)?,
);
self.add_parent_decks(parent_name, parent_names, parents)?;
if let Some(parent) = self.storage.get_deck_by_name(parent_name)? {
parents.push(parent);
self.add_parent_decks(parent_name, parent_names, parents)?;
}
}
}
Ok(())

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

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