fix eslint errors

Author: krmanik

proto/anki/image_occlusion.proto

@@ -13,8 +13,10 @@ import "anki/notes.proto";
 import "anki/generic.proto";
 
 service ImageOcclusionService {
-  rpc GetImageClozeMetadata(ImageClozeMetadataRequest) returns (ImageClozeMetadata);
-  rpc AddImageOcclusionNotes(AddImageOcclusionNotesRequest) returns (collection.OpChanges);
+  rpc GetImageClozeMetadata(ImageClozeMetadataRequest)
+      returns (ImageClozeMetadata);
+  rpc AddImageOcclusionNotes(AddImageOcclusionNotesRequest)
+      returns (collection.OpChanges);
 }
 
 message ImageClozeMetadataRequest {

pylib/anki/collection.py

@@ -10,8 +10,8 @@
     collection_pb2,
     config_pb2,
     generic_pb2,
-    import_export_pb2,
     image_occlusion_pb2,
+    import_export_pb2,
     links_pb2,
     search_pb2,
     stats_pb2,
@@ -464,23 +464,21 @@ def get_image_cloze_metadata(self, path: str | None) -> ImageClozeMetadata:
         return self._backend.get_image_cloze_metadata(request)
 
     def add_image_occlusion_notes(
-        self, 
-        image_path: str | None, 
-        deck_id: int | None, 
-        notes_data: bytes | None,
+        self,
+        image_path: str | None,
+        deck_id: int | None,
         occlusions: str | None,
         header: str | None,
         notes: str | None,
-        tags: list[str] | None
+        tags: list[str] | None,
     ) -> bool:
         request = image_occlusion_pb2.AddImageOcclusionNotesRequest(
-            image_path=image_path, 
-            deck_id=deck_id, 
-            notes_data=notes_data,
+            image_path=image_path,
+            deck_id=deck_id,
             occlusions=occlusions,
             header=header,
             notes=notes,
-            tags=tags
+            tags=tags,
         )
         return self._backend.add_image_occlusion_notes(request)
 

pylib/tools/genbackend.py

@@ -19,8 +19,8 @@
 import anki.deckconfig_pb2
 import anki.decks_pb2
 import anki.i18n_pb2
-import anki.import_export_pb2
 import anki.image_occlusion_pb2
+import anki.import_export_pb2
 import anki.links_pb2
 import anki.media_pb2
 import anki.notes_pb2

qt/aqt/editor.py

@@ -34,6 +34,7 @@
 from anki.notes import Note, NoteFieldsCheckResult
 from anki.utils import checksum, is_lin, is_win, namedtmp
 from aqt import AnkiQt, colors, gui_hooks
+from aqt.imageocclusion import ImageOcclusionDialog
 from aqt.operations import QueryOp
 from aqt.operations.note import update_note
 from aqt.operations.notetype import update_notetype_legacy
@@ -56,7 +57,6 @@
     tr,
 )
 from aqt.webview import AnkiWebView
-from aqt.imageocclusion import ImageOcclusionDialog
 
 pics = ("jpg", "jpeg", "png", "tif", "tiff", "gif", "svg", "webp", "ico")
 audio = (
@@ -1182,7 +1182,6 @@ def onImageOcclusion(self) -> None:
         def accept(file: str) -> None:
             diag = ImageOcclusionDialog(self.mw, file)
 
-
         file = getFile(
             parent=self.widget,
             title=tr.editing_add_media(),

qt/aqt/imageocclusion.py

@@ -8,7 +8,7 @@
 import aqt.main
 import aqt.operations
 from aqt.qt import *
-from aqt.utils import addCloseShortcut, disable_help_button, restoreGeom, saveGeom, tr
+from aqt.utils import addCloseShortcut, disable_help_button, restoreGeom, saveGeom
 from aqt.webview import AnkiWebView
 
 

qt/aqt/mediasrv.py

@@ -448,16 +448,9 @@ def handle_on_main() -> None:
 
 
 def image_occlusion() -> bytes:
-    data = request.data
-
-    def handle_on_main() -> None:
-        window = aqt.mw.app.activeWindow()
-        if isinstance(window, ImageOcclusionDialog):
-            window.do_image_occlusion(data)
-
-    aqt.mw.taskman.run_on_main(handle_on_main)
     return b""
 
+
 post_handler_list = [
     congrats_info,
     get_deck_configs_for_update,
@@ -492,7 +485,7 @@ def handle_on_main() -> None:
     "complete_tag",
     # ImageOcclusionService
     "get_image_cloze_metadata",
-    "add_image_occlusion_notes"
+    "add_image_occlusion_notes",
 ]
 
 

rslib/src/backend/image_occlusion.rs

@@ -3,10 +3,8 @@
 
 use super::Backend;
 pub(super) use crate::pb::image_occlusion::imageocclusion_service::Service as ImageOcclusionService;
-use crate::{
-    pb::{self as pb},
-    prelude::*,
-};
+use crate::pb::{self as pb,};
+use crate::prelude::*;
 
 impl ImageOcclusionService for Backend {
     fn get_image_cloze_metadata(

rslib/src/backend/mod.rs

@@ -144,7 +144,9 @@ impl Backend {
                 ServiceIndex::Collection => CollectionService::run_method(self, method, input),
                 ServiceIndex::Cards => CardsService::run_method(self, method, input),
                 ServiceIndex::ImportExport => ImportExportService::run_method(self, method, input),
-                ServiceIndex::ImageOcclusion => ImageOcclusionService::run_method(self, method, input),
+                ServiceIndex::ImageOcclusion => {
+                    ImageOcclusionService::run_method(self, method, input)
+                }
             })
             .map_err(|err| {
                 let backend_err = err.into_protobuf(&self.tr);

rslib/src/image_occlusion/imagedata.rs

@@ -1,11 +1,16 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-use std::{fs::read, path::Path, sync::Arc};
-
-use crate::notetype::{CardGenContext, Notetype, NotetypeConfig};
+use std::fs::read;
+use std::path::Path;
+use std::sync::Arc;
+
+use crate::media::MediaManager;
+use crate::notetype::CardGenContext;
+use crate::notetype::Notetype;
+use crate::notetype::NotetypeConfig;
 pub use crate::pb::image_occlusion::ImageClozeMetadata;
-use crate::{media::MediaManager, prelude::*};
+use crate::prelude::*;
 
 impl Collection {
     pub fn get_image_cloze_metadata(&mut self, path: &str) -> Result<ImageClozeMetadata> {

rslib/src/image_occlusion/mod.rs

@@ -1 +1,4 @@
-mod imagedata;
+// Copyright: Ankitects Pty Ltd and contributors
+// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
+
+mod imagedata;