");
assert_note_logged!(log, new, &[" bar.jpg ", ""]);
}
+
+ #[test]
+ fn should_import_new_notetype() {
+ let mut col = Collection::new();
+ let mut new_basic = crate::notetype::stock::basic(&col.tr);
+ new_basic.id.0 = 123;
+ import_notetype!(&mut col, new_basic);
+ assert!(col.storage.get_notetype(NotetypeId(123)).unwrap().is_some());
+ }
+
+ #[test]
+ fn should_update_existing_notetype_with_older_mtime_and_matching_schema() {
+ let mut col = Collection::new();
+ let mut basic = col.basic_notetype();
+ basic.mtime_secs.0 += 1;
+ basic.name = String::from("new");
+ import_notetype!(&mut col, basic);
+ assert!(col.get_notetype_by_name("new").unwrap().is_some());
+ }
+
+ #[test]
+ fn should_not_update_existing_notetype_with_newer_mtime_and_matching_schema() {
+ let mut col = Collection::new();
+ let mut basic = col.basic_notetype();
+ basic.mtime_secs.0 -= 1;
+ basic.name = String::from("new");
+ import_notetype!(&mut col, basic);
+ assert!(col.get_notetype_by_name("new").unwrap().is_none());
+ }
+
+ #[test]
+ fn should_rename_field_with_matching_id_without_schema_change() {
+ let mut col = Collection::new();
+ let mut to_import = col.basic_notetype();
+ to_import.fields[0].name = String::from("renamed");
+ to_import.mtime_secs.0 += 1;
+ import_notetype!(&mut col, to_import);
+ assert_eq!(col.basic_notetype().fields[0].name, "renamed");
+ }
+
+ #[test]
+ fn should_add_remapped_notetype_if_schema_has_changed_and_reuse_it_subsequently() {
+ let mut col = Collection::new();
+ let mut to_import = col.basic_notetype();
+ to_import.fields[0].name = String::from("new field");
+ // clear id or schemas would still match
+ to_import.fields[0].config.id.take();
+
+ // schema mismatch => notetype should be imported with new id
+ let out = import_notetype!(&mut col, to_import.clone());
+ let remapped_id = *out.remapped_notetypes.values().next().unwrap();
+ assert_eq!(col.basic_notetype().fields[0].name, "Front");
+ let remapped = col.storage.get_notetype(remapped_id).unwrap().unwrap();
+ assert_eq!(remapped.fields[0].name, "new field");
+
+ // notetype with matching schema and original id exists => should be reused
+ to_import.name = String::from("new name");
+ to_import.mtime_secs.0 = remapped.mtime_secs.0 + 1;
+ let out_2 = import_notetype!(&mut col, to_import);
+ let remapped_id_2 = *out_2.remapped_notetypes.values().next().unwrap();
+ assert_eq!(remapped_id, remapped_id_2);
+ let updated = col.storage.get_notetype(remapped_id).unwrap().unwrap();
+ assert_eq!(updated.name, "new name");
+ }
+
+ #[test]
+ fn should_merge_notetype_fields() {
+ let mut col = Collection::new();
+ let mut to_import = col.basic_notetype();
+ to_import.mtime_secs.0 += 1;
+ to_import.fields.remove(0);
+ to_import.fields[0].name = String::from("renamed");
+ to_import.fields[0].ord.replace(0);
+ to_import.fields.push(NoteField::new("new"));
+ to_import.fields[1].ord.replace(1);
+
+ let fields = import_notetype!(&mut col, to_import.clone(), merge = true).remapped_fields;
+ // Front field is preserved and new field added
+ assert!(col
+ .basic_notetype()
+ .field_names()
+ .eq(["Front", "renamed", "new"]));
+ // extra field must be inserted into incoming notes
+ assert_eq!(
+ fields.get(&to_import.id).unwrap(),
+ &[None, Some(0), Some(1)]
+ );
+ }
+
+ #[test]
+ fn should_merge_notetype_templates() {
+ let mut col = Collection::new();
+ let mut to_import = col.basic_rev_notetype();
+ to_import.mtime_secs.0 += 1;
+ to_import.templates.remove(0);
+ to_import.templates[0].name = String::from("renamed");
+ to_import.templates[0].ord.replace(0);
+ to_import.templates.push(CardTemplate::new("new", "", ""));
+ to_import.templates[1].ord.replace(1);
+
+ let templates =
+ import_notetype!(&mut col, to_import.clone(), merge = true).remapped_templates;
+ // Card 1 is preserved and new template added
+ assert!(col
+ .basic_rev_notetype()
+ .template_names()
+ .eq(["Card 1", "renamed", "new"]));
+ // templates must be shifted accordingly
+ let map = templates.get(&to_import.id).unwrap();
+ assert_eq!(map.get(&0), Some(&1));
+ assert_eq!(map.get(&1), Some(&2));
+ }
+
+ #[test]
+ fn should_merge_notetype_duplicates_from_previous_imports() {
+ let mut col = Collection::new();
+ let mut incoming = col.basic_notetype();
+ incoming.fields.push(NoteField::new("new incoming"));
+ // simulate a notetype duplicated during previous import
+ let mut remapped = col.basic_notetype();
+ remapped.config.original_id.replace(incoming.id.0);
+ // ... which was modified and has notes
+ remapped.fields.push(NoteField::new("new remapped"));
+ remapped.id.0 = 0;
+ col.add_notetype_inner(&mut remapped, Usn(0), true).unwrap();
+ let mut note = Note::new(&remapped);
+ *note.fields_mut() = vec![
+ String::from("front"),
+ String::from("back"),
+ String::from("new"),
+ ];
+ col.add_note(&mut note, DeckId(1)).unwrap();
+
+ let ntid = incoming.id;
+ import_notetype!(&mut col, incoming, merge = true);
+
+ // both notetypes should have been merged into it
+ assert!(col.get_notetype(ntid).unwrap().unwrap().field_names().eq([
+ "Front",
+ "Back",
+ "new remapped",
+ "new incoming",
+ ]));
+ assert!(col.get_all_notes()[0]
+ .fields()
+ .iter()
+ .eq(["front", "back", "new", ""]))
+ }
+
+ #[test]
+ fn reimport_with_merge_enabled_should_handle_duplicates() -> Result<()> {
+ // import from src to dst
+ let mut src = Collection::new();
+ NoteAdder::basic(&mut src)
+ .fields(&["foo", "bar"])
+ .add(&mut src);
+ let temp_dir = TempDir::new()?;
+ let path = temp_dir.path().join("foo.apkg");
+ src.export_apkg(&path, "", false, false, false, None)?;
+
+ let mut dst = CollectionBuilder::new(temp_dir.path().join("dst.anki2"))
+ .with_desktop_media_paths()
+ .build()?;
+ dst.import_apkg(&path, ImportAnkiPackageOptions::default())?;
+
+ // add a field to src
+ let mut nt = src.basic_notetype();
+ nt.fields.push(NoteField::new("new incoming"));
+ src.update_notetype(&mut nt, false)?;
+
+ // importing again with merge enabled will fail, and add an empty notetype
+ assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 6);
+ src.export_apkg(&path, "", false, false, false, None)?;
+ assert_eq!(
+ dst.import_apkg(&path, ImportAnkiPackageOptions::default())?
+ .output
+ .conflicting
+ .len(),
+ 1
+ );
+ assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 7);
+
+ // if enabling merge, it should succeed and remove the empty notetype
+ src.export_apkg(&path, "", false, false, false, None)?;
+ assert_eq!(
+ dst.import_apkg(
+ &path,
+ ImportAnkiPackageOptions {
+ merge_notetypes: true,
+ ..Default::default()
+ }
+ )?
+ .output
+ .conflicting
+ .len(),
+ 0
+ );
+ assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 6);
+
+ Ok(())
+ }
}
diff --git a/rslib/src/import_export/package/apkg/tests.rs b/rslib/src/import_export/package/apkg/tests.rs
index 2553334a1..47b322722 100644
--- a/rslib/src/import_export/package/apkg/tests.rs
+++ b/rslib/src/import_export/package/apkg/tests.rs
@@ -8,6 +8,7 @@ use std::fs::File;
use std::io::Write;
use anki_io::read_file;
+use anki_proto::import_export::ImportAnkiPackageOptions;
use crate::media::files::sha1_of_data;
use crate::media::MediaManager;
@@ -50,7 +51,9 @@ fn roundtrip_inner(legacy: bool) {
None,
)
.unwrap();
- target_col.import_apkg(&apkg_path).unwrap();
+ target_col
+ .import_apkg(&apkg_path, ImportAnkiPackageOptions::default())
+ .unwrap();
target_col.assert_decks();
target_col.assert_notetype(¬etype);
diff --git a/rslib/src/import_export/package/mod.rs b/rslib/src/import_export/package/mod.rs
index 823cf0633..b99a38ddf 100644
--- a/rslib/src/import_export/package/mod.rs
+++ b/rslib/src/import_export/package/mod.rs
@@ -7,6 +7,8 @@ mod media;
mod meta;
use anki_proto::import_export::media_entries::MediaEntry;
+pub use anki_proto::import_export::ImportAnkiPackageOptions;
+pub use anki_proto::import_export::ImportAnkiPackageUpdateCondition as UpdateCondition;
use anki_proto::import_export::MediaEntries;
pub(crate) use apkg::NoteMeta;
pub(crate) use colpkg::export::export_colpkg_from_data;
diff --git a/rslib/src/import_export/service.rs b/rslib/src/import_export/service.rs
index 2fe89de4f..c51c59906 100644
--- a/rslib/src/import_export/service.rs
+++ b/rslib/src/import_export/service.rs
@@ -4,23 +4,33 @@ use anki_proto::generic;
use anki_proto::import_export::import_response::Log as NoteLog;
use anki_proto::import_export::ExportLimit;
-use crate::collection::Collection;
-use crate::error;
-use crate::ops::OpOutput;
+use crate::prelude::*;
use crate::search::SearchNode;
impl crate::services::ImportExportService for Collection {
fn import_anki_package(
&mut self,
input: anki_proto::import_export::ImportAnkiPackageRequest,
- ) -> error::Result{}
- ",
diff --git a/rslib/src/notetype/fields.rs b/rslib/src/notetype/fields.rs
index ec1a4c875..6aaebb784 100644
--- a/rslib/src/notetype/fields.rs
+++ b/rslib/src/notetype/fields.rs
@@ -38,6 +38,7 @@ impl NoteField {
ord: None,
name: name.into(),
config: NoteFieldConfig {
+ id: Some(rand::random()),
sticky: false,
rtl: false,
plain_text: false,
diff --git a/rslib/src/notetype/merge.rs b/rslib/src/notetype/merge.rs
new file mode 100644
index 000000000..f88be64ab
--- /dev/null
+++ b/rslib/src/notetype/merge.rs
@@ -0,0 +1,170 @@
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+use super::CardTemplate;
+use crate::notetype::NoteField;
+use crate::prelude::*;
+
+impl Notetype {
+ /// Inserts not yet existing fields ands templates from `other`.
+ pub(crate) fn merge(&mut self, other: &Self) {
+ self.merge_fields(other);
+ self.merge_templates(other);
+ }
+
+ pub(crate) fn merge_all<'a>(&mut self, others: impl IntoIterator
- ) {
+ for other in others {
+ self.merge(other);
+ }
+ }
+
+ /// Inserts not yet existing fields from `other`.
+ fn merge_fields(&mut self, other: &Self) {
+ for (index, field) in other.fields.iter().enumerate() {
+ match self.find_field(field) {
+ Some(i) if i == index => (),
+ Some(i) => self.fields.swap(i, index),
+ None => {
+ let mut missing = field.clone();
+ missing.ord.take();
+ self.fields.insert(index, missing);
+ }
+ }
+ }
+ }
+
+ fn find_field(&self, like: &NoteField) -> Option
{ + self.fields + .iter() + .enumerate() + .find_map(|(i, f)| f.is_match(like).then_some(i)) + } + + /// Inserts not yet existing templates from `other`. + fn merge_templates(&mut self, other: &Self) { + for (index, template) in other.templates.iter().enumerate() { + match self.find_template(template) { + Some(i) if i == index => (), + Some(i) => self.templates.swap(i, index), + None => { + let mut missing = template.clone(); + missing.ord.take(); + self.templates.insert(index, missing); + } + } + } + } + + fn find_template(&self, like: &CardTemplate) -> Option { + self.templates + .iter() + .enumerate() + .find_map(|(i, t)| t.is_match(like).then_some(i)) + } +} + +impl NoteField { + /// True if both ids are identical, but not [None], or at least one id is + /// [None] and the names are identical. + pub(crate) fn is_match(&self, other: &Self) -> bool { + if let (Some(id), Some(other_id)) = (self.config.id, other.config.id) { + id == other_id + } else { + self.name == other.name + } + } +} + +impl CardTemplate { + /// True if both ids are identical, but not [None], or at least one id is + /// [None] and the names are identical. + pub(crate) fn is_match(&self, other: &Self) -> bool { + if let (Some(id), Some(other_id)) = (self.config.id, other.config.id) { + id == other_id + } else { + self.name == other.name + } + } +} + +#[cfg(test)] +mod test { + use itertools::assert_equal; + + use super::*; + use crate::notetype::stock; + + impl Notetype { + fn field_ids(&self) -> impl Iterator - > + '_ { + self.fields.iter().map(|field| field.config.id) + } + + fn template_ids(&self) -> impl Iterator
- > + '_ { + self.templates.iter().map(|template| template.config.id) + } + } + + #[test] + fn merge_new_fields() { + let mut basic = stock::basic(&I18n::template_only()); + let mut other = basic.clone(); + other.add_field("with id"); + other.add_field("without id"); + other.fields[3].config.id.take(); + basic.merge(&other); + assert_equal(basic.field_ids(), other.field_ids()); + assert_equal(basic.field_names(), other.field_names()); + } + + #[test] + fn skip_merging_field_with_existing_id() { + let mut basic = stock::basic(&I18n::template_only()); + let mut other = basic.clone(); + other.fields[1].name = String::from("renamed"); + basic.merge(&other); + assert_equal(basic.field_ids(), other.field_ids()); + assert_equal(basic.field_names(), ["Front", "Back"].iter()); + } + + #[test] + fn align_field_order() { + let mut basic = stock::basic(&I18n::template_only()); + let mut other = basic.clone(); + other.fields.swap(0, 1); + basic.merge(&other); + assert_equal(basic.field_ids(), other.field_ids()); + assert_equal(basic.field_names(), other.field_names()); + } + + #[test] + fn merge_new_templates() { + let mut basic = stock::basic(&I18n::template_only()); + let mut other = basic.clone(); + other.add_template("with id", "", ""); + other.add_template("without id", "", ""); + other.templates[2].config.id.take(); + basic.merge(&other); + assert_equal(basic.template_ids(), other.template_ids()); + assert_equal(basic.template_names(), other.template_names()); + } + + #[test] + fn skip_merging_template_with_existing_id() { + let mut basic = stock::basic(&I18n::template_only()); + let mut other = basic.clone(); + other.templates[0].name = String::from("renamed"); + basic.merge(&other); + assert_equal(basic.template_ids(), other.template_ids()); + assert_equal(basic.template_names(), std::iter::once("Card 1")); + } + + #[test] + fn align_template_order() { + let mut basic_rev = stock::basic_forward_reverse(&I18n::template_only()); + let mut other = basic_rev.clone(); + other.templates.swap(0, 1); + basic_rev.merge(&other); + assert_equal(basic_rev.template_ids(), other.template_ids()); + assert_equal(basic_rev.template_names(), other.template_names()); + } +} diff --git a/rslib/src/notetype/mod.rs b/rslib/src/notetype/mod.rs index d2f3f2af6..547999972 100644 --- a/rslib/src/notetype/mod.rs +++ b/rslib/src/notetype/mod.rs @@ -5,6 +5,7 @@ mod cardgen; mod checks; mod emptycards; mod fields; +mod merge; mod notetypechange; mod render; mod restore; @@ -213,16 +214,11 @@ impl Collection { } } - pub fn get_all_notetypes(&mut self) -> Result
, #[serde(flatten)] pub(crate) other: HashMap for Notetype { latex_svg: nt.latexsvg, reqs: nt.req.0.into_iter().map(Into::into).collect(), original_stock_kind: nt.original_stock_kind, + original_id: nt.original_id, other: other_to_bytes(&nt.other), }, fields: nt.flds.into_iter().map(Into::into).collect(), @@ -172,6 +175,7 @@ impl From for NotetypeSchema11 { latexsvg: c.latex_svg, req: CardRequirementsSchema11(c.reqs.into_iter().map(Into::into).collect()), original_stock_kind: c.original_stock_kind, + original_id: c.original_id, other: parse_other_fields(&c.other, &RESERVED_NOTETYPE_KEYS), } } @@ -249,6 +253,9 @@ pub struct NoteFieldSchema11 { #[serde(default, deserialize_with = "default_on_invalid")] pub(crate) exclude_from_search: bool, + #[serde(default, deserialize_with = "default_on_invalid")] + pub(crate) id: Option , + #[serde(flatten)] pub(crate) other: HashMap for NoteField { description: f.description, collapsed: f.collapsed, exclude_from_search: f.exclude_from_search, + id: f.id, other: other_to_bytes(&f.other), }, } @@ -305,6 +314,7 @@ impl From for NoteFieldSchema11 { description: conf.description, collapsed: conf.collapsed, exclude_from_search: conf.exclude_from_search, + id: conf.id, other: parse_other_fields(&conf.other, &RESERVED_FIELD_KEYS), } } @@ -321,6 +331,7 @@ static RESERVED_FIELD_KEYS: Set<&'static str> = phf_set! { "collapsed", "description", "excludeFromSearch", + "id", }; #[derive(Serialize, Deserialize, Debug, Default, Clone)] @@ -340,6 +351,8 @@ pub struct CardTemplateSchema11 { pub(crate) bfont: String, #[serde(default, deserialize_with = "default_on_invalid")] pub(crate) bsize: u8, + #[serde(default, deserialize_with = "default_on_invalid")] + pub(crate) id: Option , #[serde(flatten)] pub(crate) other: HashMap for CardTemplate { target_deck_id: t.did.unwrap_or(DeckId(0)).0, browser_font_name: t.bfont, browser_font_size: t.bsize as u32, + id: t.id, other: other_to_bytes(&t.other), }, } @@ -382,6 +396,7 @@ impl From for CardTemplateSchema11 { }, bfont: conf.browser_font_name, bsize: conf.browser_font_size as u8, + id: conf.id, other: parse_other_fields(&conf.other, &RESERVED_TEMPLATE_KEYS), } } @@ -397,6 +412,7 @@ static RESERVED_TEMPLATE_KEYS: Set<&'static str> = phf_set! { "bqfmt", "bfont", "bsize", + "id", }; #[cfg(test)] diff --git a/rslib/src/notetype/schemachange.rs b/rslib/src/notetype/schemachange.rs index 3013e48e2..c253afd62 100644 --- a/rslib/src/notetype/schemachange.rs +++ b/rslib/src/notetype/schemachange.rs @@ -4,6 +4,7 @@ //! Updates to notes/cards when the structure of a notetype is changed. use std::collections::HashMap; +use std::mem; use super::CardGenContext; use super::CardTemplate; @@ -102,20 +103,7 @@ impl Collection { for nid in nids { let mut note = self.storage.get_note(nid)?.unwrap(); let original = note.clone(); - *note.fields_mut() = ords - .iter() - .map(|f| { - if let Some(idx) = f { - note.fields() - .get(*idx as usize) - .map(AsRef::as_ref) - .unwrap_or("") - } else { - "" - } - }) - .map(Into::into) - .collect(); + note.reorder_fields(&ords); self.update_note_inner_without_cards( &mut note, &original, @@ -192,6 +180,19 @@ impl Notetype { } } +impl Note { + pub(crate) fn reorder_fields(&mut self, new_ords: &[Option ]) { + *self.fields_mut() = new_ords + .iter() + .map(|ord| { + ord.and_then(|idx| self.fields_mut().get_mut(idx as usize)) + .map(mem::take) + .unwrap_or_default() + }) + .collect(); + } +} + #[cfg(test)] mod test { use super::*; diff --git a/rslib/src/notetype/templates.rs b/rslib/src/notetype/templates.rs index b75fbb8e0..aba9afb7a 100644 --- a/rslib/src/notetype/templates.rs +++ b/rslib/src/notetype/templates.rs @@ -86,6 +86,7 @@ impl CardTemplate { mtime_secs: TimestampSecs(0), usn: Usn(0), config: CardTemplateConfig { + id: Some(rand::random()), q_format: qfmt.into(), a_format: afmt.into(), q_format_browser: "".into(), diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs index d13374fa7..9808b5d64 100644 --- a/rslib/src/search/sqlwriter.rs +++ b/rslib/src/search/sqlwriter.rs @@ -608,11 +608,10 @@ impl SqlWriter<'_> { &mut self, field_name: &str, ) -> Result = nt .fields .iter() @@ -663,10 +661,9 @@ impl SqlWriter<'_> { } fn included_fields_by_notetype(&mut self) -> Result = nt .fields .iter() diff --git a/rslib/src/storage/notetype/mod.rs b/rslib/src/storage/notetype/mod.rs index 30625eaff..7e3821b30 100644 --- a/rslib/src/storage/notetype/mod.rs +++ b/rslib/src/storage/notetype/mod.rs @@ -136,6 +136,13 @@ impl SqliteStorage { .collect() } + pub fn get_all_notetype_ids(&self) -> Result - {#each helpSections as section, i} + {#each helpSections as item, i}diff --git a/ts/deck-options/HelpSection.svelte b/ts/components/HelpSection.svelte similarity index 64% rename from ts/deck-options/HelpSection.svelte rename to ts/components/HelpSection.svelte index d5768a969..02d3578e3 100644 --- a/ts/deck-options/HelpSection.svelte +++ b/ts/components/HelpSection.svelte @@ -6,22 +6,22 @@ import * as tr from "@tslib/ftl"; import { renderMarkdown } from "@tslib/helpers"; - import Row from "../components/Row.svelte"; - import type { DeckOption } from "./types"; + import Row from "./Row.svelte"; + import type { HelpItem } from "./types"; - export let section: DeckOption; + export let item: HelpItem;-{/each}+ |
-{#if section.url} +{#if item.url}- {#if section.url} - {@html section.title} + {#if item.url} + {@html item.title} {:else} - {@html section.title} + {@html item.title} {/if}
- {#if section.help} - {@html renderMarkdown(section.help)} + {#if item.help} + {@html renderMarkdown(item.help)} {:else} {@html renderMarkdown( tr.helpNoExplanation({ @@ -30,14 +30,14 @@ )} {/if}
{@html renderMarkdown( tr.helpForMoreInfo({ - link: `${section.title}`, + link: `${item.title}`, }), )}diff --git a/ts/deck-options/Label.svelte b/ts/components/Label.svelte similarity index 100% rename from ts/deck-options/Label.svelte rename to ts/components/Label.svelte diff --git a/ts/deck-options/RevertButton.svelte b/ts/components/RevertButton.svelte similarity index 88% rename from ts/deck-options/RevertButton.svelte rename to ts/components/RevertButton.svelte index b15131821..fdd470f1c 100644 --- a/ts/deck-options/RevertButton.svelte +++ b/ts/components/RevertButton.svelte @@ -7,12 +7,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import { cloneDeep, isEqual as isEqualLodash } from "lodash-es"; import { getContext } from "svelte"; - import Badge from "../components/Badge.svelte"; - import { touchDeviceKey } from "../components/context-keys"; - import DropdownItem from "../components/DropdownItem.svelte"; - import Popover from "../components/Popover.svelte"; - import WithFloating from "../components/WithFloating.svelte"; + import Badge from "./Badge.svelte"; + import { touchDeviceKey } from "./context-keys"; + import DropdownItem from "./DropdownItem.svelte"; import { revertIcon } from "./icons"; + import Popover from "./Popover.svelte"; + import WithFloating from "./WithFloating.svelte"; type T = unknown; diff --git a/ts/deck-options/SettingTitle.svelte b/ts/components/SettingTitle.svelte similarity index 100% rename from ts/deck-options/SettingTitle.svelte rename to ts/components/SettingTitle.svelte diff --git a/ts/import-csv/StickyHeader.svelte b/ts/components/StickyHeader.svelte similarity index 91% rename from ts/import-csv/StickyHeader.svelte rename to ts/components/StickyHeader.svelte index a043ae35f..57dbde768 100644 --- a/ts/import-csv/StickyHeader.svelte +++ b/ts/components/StickyHeader.svelte @@ -6,8 +6,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import * as tr from "@tslib/ftl"; import { getPlatformString } from "@tslib/shortcuts"; - import LabelButton from "../components/LabelButton.svelte"; - import Shortcut from "../components/Shortcut.svelte"; + import LabelButton from "./LabelButton.svelte"; + import Shortcut from "./Shortcut.svelte"; export let path: string; export let onImport: () => void; diff --git a/ts/deck-options/SwitchRow.svelte b/ts/components/SwitchRow.svelte similarity index 83% rename from ts/deck-options/SwitchRow.svelte rename to ts/components/SwitchRow.svelte index 56a6f7181..dbfbd0895 100644 --- a/ts/deck-options/SwitchRow.svelte +++ b/ts/components/SwitchRow.svelte @@ -3,12 +3,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html --> + ++ {heading} +
+ + diff --git a/ts/import-anki-package/ImportAnkiPackagePage.svelte b/ts/import-anki-package/ImportAnkiPackagePage.svelte new file mode 100644 index 000000000..c08d26009 --- /dev/null +++ b/ts/import-anki-package/ImportAnkiPackagePage.svelte @@ -0,0 +1,169 @@ + + + +{#if importing} ++{:else if importResponse} + +{:else} + (importing = true)} /> + + + +{/if} + + diff --git a/ts/import-anki-package/import-anki-package-base.scss b/ts/import-anki-package/import-anki-package-base.scss new file mode 100644 index 000000000..7c6cf484b --- /dev/null +++ b/ts/import-anki-package/import-anki-package-base.scss @@ -0,0 +1,28 @@ +@use "sass/bootstrap-dark"; + +@import "sass/base"; + +@import "bootstrap/scss/alert"; +@import "bootstrap/scss/buttons"; +@import "bootstrap/scss/button-group"; +@import "bootstrap/scss/close"; +@import "bootstrap/scss/grid"; +@import "bootstrap/scss/transitions"; +@import "bootstrap/scss/modal"; +@import "bootstrap/scss/carousel"; +@import "sass/bootstrap-forms"; + +.night-mode { + @include bootstrap-dark.night-mode; +} + +body { + min-height: 100vh; + width: min(100vw, 70em); + margin: 0 auto; + padding: 0 1em 1em 1em; +} + +html { + height: initial; +} diff --git a/ts/import-anki-package/index.ts b/ts/import-anki-package/index.ts new file mode 100644 index 000000000..9696ec053 --- /dev/null +++ b/ts/import-anki-package/index.ts @@ -0,0 +1,51 @@ +// Copyright: Ankitects Pty Ltd and contributors +// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html + +import "./import-anki-package-base.scss"; + +import { getImportAnkiPackagePresets } from "@tslib/backend"; +import { ModuleName, setupI18n } from "@tslib/i18n"; +import { checkNightMode } from "@tslib/nightmode"; + +import { modalsKey } from "../components/context-keys"; +import ImportAnkiPackagePage from "./ImportAnkiPackagePage.svelte"; + +const i18n = setupI18n({ + modules: [ + ModuleName.IMPORTING, + ModuleName.ACTIONS, + ModuleName.HELP, + ModuleName.DECK_CONFIG, + ModuleName.ADDING, + ModuleName.EDITING, + ModuleName.KEYBOARD, + ], +}); + +export async function setupImportAnkiPackagePage( + path: string, +): Promise+
++ +{ + modal = e.detail.modal; + carousel = e.detail.carousel; + }} + /> + + + + ++ openHelpModal( + Object.keys(settings).indexOf("mergeNotetypes"), + )} + > + {settings.mergeNotetypes.title} + ++ + ++ openHelpModal(Object.keys(settings).indexOf("updateNotes"))} + > + {settings.updateNotes.title} + ++ + ++ openHelpModal( + Object.keys(settings).indexOf("updateNotetypes"), + )} + > + {settings.updateNotetypes.title} + ++ ++ openHelpModal( + Object.keys(settings).indexOf("withScheduling"), + )} + > + {settings.withScheduling.title} + +{ + const [_, options] = await Promise.all([ + i18n, + getImportAnkiPackagePresets({}), + ]); + + const context = new Map(); + context.set(modalsKey, new Map()); + checkNightMode(); + + return new ImportAnkiPackagePage({ + target: document.body, + props: { + path, + options, + }, + context, + }); +} + +// eg http://localhost:40000/_anki/pages/import-anki-package.html#test-/home/dae/foo.apkg +if (window.location.hash.startsWith("#test-")) { + const apkgPath = window.location.hash.replace("#test-", ""); + setupImportAnkiPackagePage(apkgPath); +} diff --git a/ts/import-anki-package/tsconfig.json b/ts/import-anki-package/tsconfig.json new file mode 100644 index 000000000..276e90989 --- /dev/null +++ b/ts/import-anki-package/tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.json", + "include": ["*"], + "references": [ + { "path": "../lib" }, + { "path": "../sveltelib" }, + { "path": "../components" } + ], + "compilerOptions": { + "types": ["jest"] + } +} diff --git a/ts/import-csv/ImportCsvPage.svelte b/ts/import-csv/ImportCsvPage.svelte index 172566a86..76e035681 100644 --- a/ts/import-csv/ImportCsvPage.svelte +++ b/ts/import-csv/ImportCsvPage.svelte @@ -21,6 +21,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import Container from "../components/Container.svelte"; import Row from "../components/Row.svelte"; import Spacer from "../components/Spacer.svelte"; + import StickyHeader from "../components/StickyHeader.svelte"; import ImportLogPage from "../import-log/ImportLogPage.svelte"; import DeckDupeCheckSwitch from "./DeckDupeCheckSwitch.svelte"; import DeckSelector from "./DeckSelector.svelte"; @@ -38,7 +39,6 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html } from "./lib"; import NotetypeSelector from "./NotetypeSelector.svelte"; import Preview from "./Preview.svelte"; - import StickyHeader from "./StickyHeader.svelte"; import Tags from "./Tags.svelte"; export let path: string; diff --git a/ts/import-csv/index.ts b/ts/import-csv/index.ts index 00b01b0f7..b16a55178 100644 --- a/ts/import-csv/index.ts +++ b/ts/import-csv/index.ts @@ -7,6 +7,7 @@ import { getCsvMetadata, getDeckNames, getNotetypeNames } from "@tslib/backend"; import { ModuleName, setupI18n } from "@tslib/i18n"; import { checkNightMode } from "@tslib/nightmode"; +import ErrorPage from "../components/ErrorPage.svelte"; import ImportCsvPage from "./ImportCsvPage.svelte"; import { tryGetDeckColumn, tryGetDeckId, tryGetGlobalNotetype, tryGetNotetypeColumn } from "./lib"; @@ -24,44 +25,45 @@ const i18n = setupI18n({ ], }); -export async function setupImportCsvPage(path: string): Promise { - const [notetypes, decks, metadata, _i18n] = await Promise.all([ +export async function setupImportCsvPage(path: string): Promise { + checkNightMode(); + return Promise.all([ getNotetypeNames({}), getDeckNames({ skipEmptyDefault: false, includeFiltered: false, }), - getCsvMetadata({ path }), + getCsvMetadata({ path }, { alertOnError: false }), i18n, - ]); - - checkNightMode(); - - return new ImportCsvPage({ - target: document.body, - props: { - path: path, - deckNameIds: decks.entries, - notetypeNameIds: notetypes.entries, - dupeResolution: metadata.dupeResolution, - matchScope: metadata.matchScope, - delimiter: metadata.delimiter, - forceDelimiter: metadata.forceDelimiter, - isHtml: metadata.isHtml, - forceIsHtml: metadata.forceIsHtml, - globalTags: metadata.globalTags, - updatedTags: metadata.updatedTags, - columnLabels: metadata.columnLabels, - tagsColumn: metadata.tagsColumn, - guidColumn: metadata.guidColumn, - preview: metadata.preview, - globalNotetype: tryGetGlobalNotetype(metadata), - // Unset oneof numbers default to 0, which also means n/a here, - // but it's vital to differentiate between unset and 0 when reserializing. - notetypeColumn: tryGetNotetypeColumn(metadata), - deckId: tryGetDeckId(metadata), - deckColumn: tryGetDeckColumn(metadata), - }, + ]).then(([notetypes, decks, metadata, _i18n]) => { + return new ImportCsvPage({ + target: document.body, + props: { + path: path, + deckNameIds: decks.entries, + notetypeNameIds: notetypes.entries, + dupeResolution: metadata.dupeResolution, + matchScope: metadata.matchScope, + delimiter: metadata.delimiter, + forceDelimiter: metadata.forceDelimiter, + isHtml: metadata.isHtml, + forceIsHtml: metadata.forceIsHtml, + globalTags: metadata.globalTags, + updatedTags: metadata.updatedTags, + columnLabels: metadata.columnLabels, + tagsColumn: metadata.tagsColumn, + guidColumn: metadata.guidColumn, + preview: metadata.preview, + globalNotetype: tryGetGlobalNotetype(metadata), + // Unset oneof numbers default to 0, which also means n/a here, + // but it's vital to differentiate between unset and 0 when reserializing. + notetypeColumn: tryGetNotetypeColumn(metadata), + deckId: tryGetDeckId(metadata), + deckColumn: tryGetDeckColumn(metadata), + }, + }); + }).catch((error) => { + return new ErrorPage({ target: document.body, props: { error } }); }); } diff --git a/ts/import-log/ImportLogPage.svelte b/ts/import-log/ImportLogPage.svelte index 78162726b..92e1a1d1c 100644 --- a/ts/import-log/ImportLogPage.svelte +++ b/ts/import-log/ImportLogPage.svelte @@ -4,12 +4,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html --> - > + '_ { + self.fields.iter().map(|field| field.config.id) + } + + fn template_ids(&self) -> impl Iterator