refactor

move config

Author: tatsumoto-ren

anki/ankiconnect.lua

@@ -1,5 +1,5 @@
 --[[
-Copyright: Ren Tatsumoto and contributors
+Copyright: Ajatt-Tools and contributors; https://github.com/Ajatt-Tools
 License: GNU GPL, version 3 or later; http://www.gnu.org/licenses/gpl.html
 
 AnkiConnect requests
@@ -8,6 +8,7 @@ AnkiConnect requests
 local utils = require('mp.utils')
 local msg = require('mp.msg')
 local h = require('helpers')
+local platform = require('platform.init')
 local self = {}
 
 self.execute = function(request, completion_fn)
@@ -22,7 +23,7 @@ self.execute = function(request, completion_fn)
     if error ~= nil or request_json == "null" then
         return completion_fn and completion_fn()
     else
-        return self.platform.curl_request(self.config.ankiconnect_url, request_json, completion_fn)
+        return platform.curl_request(self.config.ankiconnect_url, request_json, completion_fn)
     end
 end
 
@@ -255,12 +256,9 @@ self.append_media = function(note_id, fields, tag, on_finish_fn)
     self.execute(args, on_finish_wrap)
 end
 
-self.init = function(config, platform)
-    self.config = config
-    self.platform = platform
-    if not self.config.init_done then
-        error("config not loaded")
-    end
+self.init = function(cfg_mgr)
+    cfg_mgr.fail_if_not_ready()
+    self.config = cfg_mgr.config()
 end
 
 return self

anki/new_note_checker.lua

@@ -47,6 +47,12 @@ local function make_anki_new_note_checker()
         end
     end
 
+    local function has_no_media(note_fields)
+        -- Mpvacious will try to update every new note, including the ones added by Mpvacious itself.
+        -- To avoid updating notes added by mpvacious, check if the note already has media.
+        return h.is_empty(note_fields[self.config.audio_field]) and h.is_empty(note_fields[self.config.image_field])
+    end
+
     local function check_for_new_notes()
         local note_ids = find_notes_added_today()
         if h.is_empty(note_ids) then
@@ -59,7 +65,7 @@ local function make_anki_new_note_checker()
                 -- Get note info to check if it matches the user's config
                 local note_fields = self.ankiconnect.get_note_fields(note_id)
                 -- Check if the note has the configured sentence field.
-                if not h.is_empty(note_fields) and note_fields[self.config.sentence_field] ~= nil and is_note_recent(note_id) then
+                if not h.is_empty(note_fields) and note_fields[self.config.sentence_field] ~= nil and is_note_recent(note_id) and has_no_media(note_fields) then
                     -- Note matches our criteria, update it (just like pressing Ctrl+M does).
                     table.insert(to_update, note_id)
                 end
@@ -98,13 +104,11 @@ local function make_anki_new_note_checker()
         msg.info("new note checker stopped.")
     end
 
-    local function init(ankiconnect, update_notes_fn, config)
+    local function init(ankiconnect, update_notes_fn, cfg_mgr)
+        cfg_mgr.fail_if_not_ready()
         self.ankiconnect = ankiconnect
         self.update_notes_fn = update_notes_fn
-        self.config = config
-        if not self.config.init_done then
-            error("config not loaded")
-        end
+        self.config = cfg_mgr.config()
     end
 
     return {

anki/note_exporter.lua

@@ -192,7 +192,14 @@ local function make_exporter()
         return string.format("%s%s%s", old_text, separator, new_text)
     end
 
+    local function fail_if_not_ready()
+        if h.is_empty(self.config) then
+            error("config not assigned")
+        end
+    end
+
     local function join_fields(new_data, stored_data)
+        fail_if_not_ready()
         for _, field in pairs { self.config.audio_field, self.config.image_field, self.config.miscinfo_field, self.config.sentence_field, self.config.secondary_field } do
             if not h.is_empty(field) then
                 new_data[field] = join_field_content(h.table_get(new_data, field, ""), h.table_get(stored_data, field, ""))
@@ -348,16 +355,14 @@ local function make_exporter()
     end
 
     local function init(ankiconnect, quick_creation_opts, subs_observer, encoder, forvo, cfg_mgr)
-        self.config = cfg_mgr.get_config()
+        cfg_mgr.fail_if_not_ready()
+        self.config = cfg_mgr.config()
         self.cfg_mgr = cfg_mgr
         self.ankiconnect = ankiconnect
         self.quick_creation_opts = quick_creation_opts
         self.subs_observer = subs_observer
         self.encoder = encoder
         self.forvo = forvo
-        if not self.config.init_done then
-            error("config not loaded")
-        end
     end
 
     return {