Merge pull request #35 from mad-p/feature/menu

IME Menu
- 学習/統計ファイルを更新
- 設定ファイルフォルダを開く
- サンプル設定ファイルを作成

Author: mad-p

MacTcode/Tcode/TcodeInputController.swift

@@ -10,6 +10,8 @@ import InputMethodKit
 
 @objc(TcodeInputController)
 class TcodeInputController: IMKInputController, Controller {
+    let menuObj: NSMenu
+
     var modeStack: [Mode] = []
     let candidateWindow: IMKCandidates
     var pendingKakutei: PendingKakuteiMode?
@@ -21,12 +23,37 @@ class TcodeInputController: IMKInputController, Controller {
     }
 
     override init!(server: IMKServer!, delegate: Any!, client inputClient: Any!) {
+        self.menuObj = NSMenu(title: "MacTcode")
+        self.menuObj.addItem(withTitle: "学習/統計ファイルを更新", action: #selector(writeStatsToFile), keyEquivalent: "")
+        self.menuObj.addItem(withTitle: "設定ファイルフォルダを開く", action: #selector(openConfigFolder), keyEquivalent: "")
+        self.menuObj.addItem(withTitle: "サンプル設定ファイルを作成", action: #selector(createSampleConfigFile), keyEquivalent: "")
+
         candidateWindow = IMKCandidates(server: server, panelType: kIMKSingleRowSteppingCandidatePanel)
         super.init(server: server, delegate: delegate, client: inputClient)
         setupCandidateWindow()
         Log.i("★★TcodeInputController: init self=\(ObjectIdentifier(self))")
     }
 
+    override func menu() -> NSMenu! {
+        return menuObj
+    }
+
+    @objc
+    func openConfigFolder() {
+        let url = UserConfigs.i.macTcodeURL
+        NSWorkspace.shared.open(url)
+    }
+
+    @objc
+    func writeStatsToFile() {
+        InputStats.i.writeStatsToFile()
+    }
+
+    @objc
+    func createSampleConfigFile() {
+        UserConfigs.i.createSampleConfigFile()
+    }
+
     override func inputControllerWillClose() {
         Log.i("★★TcodeInputController: inputControllerWillClose self=\(ObjectIdentifier(self))")
         super.inputControllerWillClose()

MacTcode/UserConfigs.swift

@@ -465,13 +465,7 @@ class UserConfigs {
 
     func saveConfig() {
         do {
-            // 保存前に妥当性を検証
-            try validateConfiguration(configData)
-
-            let encoder = JSONEncoder()
-            encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
-            let data = try encoder.encode(configData)
-            try data.write(to: configURL)
+            try saveConfigToFile(configURL)
             log("Configuration saved successfully.")
         } catch {
             log("Failed to save configuration: \(error)")
@@ -485,7 +479,6 @@ class UserConfigs {
         encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
         let data = try encoder.encode(configData)
         try data.write(to: fileURL)
-        log("Configuration exported to: \(fileURL.path)")
     }
 
     func resetToDefaults() {
@@ -515,9 +508,12 @@ class UserConfigs {
     }
 
     func createSampleConfigFile() {
-        if !configFileExists {
-            saveConfig()
-            log("Sample configuration file created at: \(configURL.path)")
+        let sampleConfigURL = macTcodeURL.appendingPathComponent("sample-config.json")
+        do {
+            try saveConfigToFile(sampleConfigURL)
+            log("Sample configuration file created at: \(sampleConfigURL.path)")
+        } catch {
+            log("Failed to create sample configuration file: \(error)")
         }
     }