Merge branch 'dev' into fix-apple-dictionary

tisfeng · Oct 23, 2024 · 20d36e0 · 20d36e0
2 parents 65d85d0 + f79813c
commit 20d36e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Easydict/Swift/Utility/GlobalContext.swift b/Easydict/Swift/Utility/GlobalContext.swift
@@ -13,21 +13,26 @@ import Sparkle
 class GlobalContext: NSObject {
     // MARK: Lifecycle
 
-    override init() {
+    private override init() {
         self.updaterHelper = SPUUpdaterHelper()
         self.userDriverHelper = SPUUserDriverHelper()
         self.updaterController = SPUStandardUpdaterController(
             startingUpdater: true,
             updaterDelegate: updaterHelper,
             userDriverDelegate: userDriverHelper
         )
+
+        super.init()
+
+        reloadLLMServicesSubscribers()
     }
 
     // MARK: Internal
 
     class SPUUpdaterHelper: NSObject, SPUUpdaterDelegate {
         func feedURLString(for _: SPUUpdater) -> String? {
-            var feedURLString = "https://raw.githubusercontent.com/tisfeng/Easydict/main/appcast.xml"
+            var feedURLString =
+                "https://raw.githubusercontent.com/tisfeng/Easydict/main/appcast.xml"
             #if DEBUG
             feedURLString = "http://localhost:8000/appcast.xml"
             #endif
@@ -47,6 +52,8 @@ class GlobalContext: NSObject {
 
     // refresh subscribed services after duplicate service
     func reloadLLMServicesSubscribers() {
+        logInfo("reloadLLMServicesSubscribers")
+
         for service in services {
             if let llmService = service as? LLMStreamService {
                 llmService.cancelSubscribers()

diff --git a/Easydict/Swift/View/SettingView/Tabs/TabView/ServiceTab.swift b/Easydict/Swift/View/SettingView/Tabs/TabView/ServiceTab.swift
@@ -58,9 +58,6 @@ struct ServiceTab: View {
             }
             .layoutPriority(1)
         }
-        .onAppear {
-            GlobalContext.shared.reloadLLMServicesSubscribers()
-        }
         .environmentObject(viewModel)
     }