Support manually install plugin

fcitx-contrib · Jan 2, 2025 · 0d53c41 · 0d53c41
1 parent 52fa22f
commit 0d53c41
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 15 deletions.
diff --git a/assets/zh-Hans.lproj/Localizable.strings b/assets/zh-Hans.lproj/Localizable.strings
diff --git a/src/config/installer.swift b/src/config/installer.swift
@@ -6,16 +6,16 @@ let mainDebugFileName = "Fcitx5-\(arch)-debug.tar.bz2"
 let pluginBaseAddress =
   "https://github.com/fcitx-contrib/fcitx5-plugins/releases/download/macos/"
 
-private func getFileName(_ plugin: String, native: Bool) -> String {
+func getPluginFileName(_ plugin: String, native: Bool) -> String {
   return native ? "\(plugin)-\(arch).tar.bz2" : "\(plugin)-any.tar.bz2"
 }
 
 private func getAddress(_ plugin: String, native: Bool) -> String {
-  return pluginBaseAddress + getFileName(plugin, native: native)
+  return pluginBaseAddress + getPluginFileName(plugin, native: native)
 }
 
-private func getCacheURL(_ plugin: String, native: Bool) -> URL {
-  let fileName = getFileName(plugin, native: native)
+func getCacheURL(_ plugin: String, native: Bool) -> URL {
+  let fileName = getPluginFileName(plugin, native: native)
   return cacheDir.appendingPathComponent(fileName)
 }
 
@@ -31,14 +31,13 @@ func getFilesFromDescriptor(_ descriptor: URL) -> [String] {
   return json["files"].arrayValue.map { $0.stringValue }
 }
 
-private func extractPlugin(_ plugin: String, native: Bool) -> Bool {
+func extractPlugin(_ plugin: String, native: Bool) -> Bool {
   let descriptor = getPluginDescriptor(plugin)
   let oldFiles = getFilesFromDescriptor(descriptor)
 
   mkdirP(libraryDir.localPath())
   let url = getCacheURL(plugin, native: native)
-  let path = url.localPath()
-  let ret = exec("/usr/bin/tar", ["-xjf", path, "-C", libraryDir.localPath()])
+  let ret = exec("/usr/bin/tar", ["-xjf", url.localPath(), "-C", libraryDir.localPath()])
   let _ = removeFile(url)
 
   if ret {
@@ -47,8 +46,7 @@ private func extractPlugin(_ plugin: String, native: Bool) -> Bool {
     if removedFiles.count > 0 {
       FCITX_INFO("Removing \(removedFiles) which are no longer needed")
       for file in removedFiles {
-        let path = libraryDir.appendingPathComponent(file)
-        let _ = removeFile(path)
+        let _ = removeFile(libraryDir.appendingPathComponent(file))
       }
     }
   }
@@ -83,7 +81,7 @@ class Updater {
         var nativeResults = nativePlugins.reduce(into: [String: Bool](), { $0[$1] = false })
         for plugin in nativePlugins {
           let result = results[getAddress(plugin, native: true)]!
-          let fileName = getFileName(plugin, native: true)
+          let fileName = getPluginFileName(plugin, native: true)
           if result {
             if extractPlugin(plugin, native: true) {
               nativeResults[plugin] = true
@@ -100,7 +98,7 @@ class Updater {
           into: [String: Bool](), { $0[$1] = false })
         for plugin in dataPlugins {
           let result = results[getAddress(plugin, native: false)]!
-          let fileName = getFileName(plugin, native: false)
+          let fileName = getPluginFileName(plugin, native: false)
           if result {
             if extractPlugin(plugin, native: false) {
               dataResults[plugin] = true

diff --git a/src/config/plugin.swift b/src/config/plugin.swift
@@ -3,6 +3,7 @@ import Fcitx
 import Logging
 import SwiftUI
 import SwiftyJSON
+import UniformTypeIdentifiers
 
 struct Plugin: Identifiable, Hashable {
   let id: String
@@ -121,9 +122,12 @@ struct PluginView: View {
   @State private var showCheckFailed = false
   @State private var showDownloadFailed = false
   @State private var showUpdateAvailable = false
+  @State private var showInvalidFileName = false
 
   @ObservedObject private var pluginVM = PluginVM()
 
+  private let openPanel = NSOpenPanel()
+
   func refreshPlugins() {
     pluginVM.refreshPlugins()
   }
@@ -255,10 +259,7 @@ struct PluginView: View {
         processing = false
         if needsRestart {
           if autoRestart {
-            FcitxInputController.pluginManager.window?.performClose(_: nil)
-            DispatchQueue.main.async {
-              restartProcess()
-            }
+            restart()
           } else {
             promptRestart = true
           }
@@ -269,6 +270,13 @@ struct PluginView: View {
       })
   }
 
+  private func restart() {
+    FcitxInputController.pluginManager.window?.performClose(_: nil)
+    DispatchQueue.main.async {
+      restartProcess()
+    }
+  }
+
   var body: some View {
     if processing {
       ProgressView(value: downloadProgress, total: 1)
@@ -347,6 +355,34 @@ struct PluginView: View {
                 comment: ""))
           }.disabled(selectedAvailable.isEmpty || processing)
             .buttonStyle(.borderedProminent)
+          Button {
+            openPanel.allowsMultipleSelection = false
+            openPanel.canChooseDirectories = false
+            openPanel.allowedContentTypes = [UTType.init(filenameExtension: "bz2")!]
+            openPanel.directoryURL = URL(
+              fileURLWithPath: homeDir.appendingPathComponent("Downloads").localPath())
+            openPanel.begin { response in
+              if response == .OK {
+                for url in openPanel.urls {
+                  let fileName = url.lastPathComponent
+                  for pluginName in pluginMap.keys {
+                    if fileName == getPluginFileName(pluginName, native: true) {
+                      mkdirP(cacheDir.localPath())
+                      let cacheFileURL = getCacheURL(pluginName, native: true)
+                      let _ = copyFile(url, cacheFileURL)
+                      let _ = exec(
+                        "/usr/bin/xattr", ["-dr", "com.apple.quarantine", cacheFileURL.localPath()])
+                      let _ = extractPlugin(pluginName, native: true)
+                      restart()
+                    }
+                  }
+                }
+                showInvalidFileName = true
+              }
+            }
+          } label: {
+            Text("Install manually")
+          }
         }
       }
     }.padding()
@@ -376,6 +412,11 @@ struct PluginView: View {
           displayMode: .hud, type: .error(Color.red),
           title: NSLocalizedString("Download failed", comment: ""))
       }
+      .toast(isPresenting: $showInvalidFileName) {
+        AlertToast(
+          displayMode: .hud, type: .error(Color.red),
+          title: NSLocalizedString("Invalid file name", comment: ""))
+      }
   }
 }