fix reload single extension; fix add double im entries

Author: eagleoflqj

ipc/ipc.swift

@@ -9,9 +9,27 @@ public func openURL(_ urlString: String) {
   }
 }
 
+private func listKeyboards() -> [String] {
+  let pluginsURL = Bundle.main.bundleURL.appendingPathComponent("PlugIns")
+  var result = [String]()
+  if let items = try? FileManager.default.contentsOfDirectory(
+    at: pluginsURL,
+    includingPropertiesForKeys: nil,
+    options: [.skipsHiddenFiles])
+  {
+    for item in items where item.pathExtension == "appex" {
+      result.append(item.deletingPathExtension().lastPathComponent)
+    }
+  }
+  return result
+}
+
 public func requestReload() {
   mkdirP(appGroupTmp.path)
-  try? "".write(
-    to: appGroupTmp.appendingPathComponent("reload"), atomically: true, encoding: .utf8)
+  for keyboard in listKeyboards() {
+    try? "".write(
+      to: appGroupTmp.appendingPathComponent("\(keyboard).reload"), atomically: true,
+      encoding: .utf8)
+  }
   logger.info("Reload requested")
 }

keyboard/KeyboardViewController.swift

@@ -64,7 +64,8 @@ class KeyboardViewController: UIInputViewController, FcitxProtocol {
     logger.info("viewWillAppear \(self.id)")
     virtualKeyboardView.setReturnKeyType(textDocumentProxy.returnKeyType)
     super.viewWillAppear(animated)
-    if removeFile(appGroupTmp.appendingPathComponent("reload")) {
+    let keyboard = Bundle.main.bundleURL.deletingPathExtension().lastPathComponent
+    if removeFile(appGroupTmp.appendingPathComponent("\(keyboard).reload")) {
       logger.info("Reload accepted")
       reload()
     }

src/InputMethodsView.swift

@@ -53,8 +53,7 @@ struct AddInputMethodsView: View {
               enabledInputMethods.append(inputMethod)
               setInputMethods(
                 String(
-                  data: try! JSONEncoder().encode(
-                    enabledInputMethods.map { $0.name } + [inputMethod.name]),
+                  data: try! JSONEncoder().encode(enabledInputMethods.map { $0.name }),
                   encoding: .utf8)!)
               requestReload()
               message = String(