Add image occlusion to stock notetypes

proto/anki/notetypes.proto

@@ -147,6 +147,7 @@ message StockNotetype {
     KIND_BASIC_OPTIONAL_REVERSED = 2;
     KIND_BASIC_TYPING = 3;
     KIND_CLOZE = 4;
+    KIND_IMAGE_OCCLUSION = 5;
   }
   // This is decoupled from Kind to allow us to evolve notetypes over time
   // (eg an older notetype might require different JS), and allow us to store

pylib/anki/stdmodels.py

@@ -38,6 +38,7 @@ def get_stock_notetypes(
         StockNotetypeKind.KIND_BASIC_OPTIONAL_REVERSED,
         StockNotetypeKind.KIND_BASIC_TYPING,
         StockNotetypeKind.KIND_CLOZE,
+        StockNotetypeKind.KIND_IMAGE_OCCLUSION,
     ]:
         note_type = from_json_bytes(col._backend.get_stock_notetype_legacy(kind))
 

rslib/src/import_export/package/apkg/import/notes.rs

@@ -979,7 +979,7 @@ mod test {
 
         // importing again with merge disabled will fail for the exisitng note,
         // but the new one will be added with an extra notetype
-        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 6);
+        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 7);
         src.export_apkg(&path, "", false, false, false, None)?;
         assert_eq!(
             dst.import_apkg(&path, ImportAnkiPackageOptions::default())?
@@ -988,7 +988,7 @@ mod test {
                 .len(),
             1
         );
-        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 7);
+        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 8);
 
         // if enabling merge, it should succeed and remove the empty notetype, remapping
         // its note
@@ -1006,7 +1006,7 @@ mod test {
             .len(),
             0
         );
-        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 6);
+        assert_eq!(dst.storage.get_all_notetype_names().unwrap().len(), 7);
 
         Ok(())
     }

rslib/src/notetype/restore.rs

@@ -28,6 +28,7 @@ impl Collection {
                 Kind::BasicOptionalReversed => OriginalStockKind::BasicOptionalReversed,
                 Kind::BasicTyping => OriginalStockKind::BasicTyping,
                 Kind::Cloze => OriginalStockKind::Cloze,
+                Kind::ImageOcclusion => OriginalStockKind::ImageOcclusion,
             },
             (stock, _) => stock,
         };

rslib/src/notetype/stock.rs

@@ -45,6 +45,7 @@ pub fn all_stock_notetypes(tr: &I18n) -> Vec<Notetype> {
         basic_optional_reverse(tr),
         basic_typing(tr),
         cloze(tr),
+        image_occlusion_notetype(tr),
     ]
 }
 
@@ -81,6 +82,7 @@ pub(crate) fn get_stock_notetype(kind: StockKind, tr: &I18n) -> Notetype {
         Kind::BasicOptionalReversed => basic_optional_reverse(tr),
         Kind::BasicTyping => basic_typing(tr),
         Kind::Cloze => cloze(tr),
+        Kind::ImageOcclusion => image_occlusion_notetype(tr),
     }
 }