Merge pull request #13 from samzong:chore/clean-unused

refactor(ConfigForgeApp): streamline command group and improve menu item labels

Author: samzong

ConfigForge/AppDelegate.swift

@@ -13,17 +13,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     @MainActor
     func applicationDidFinishLaunching(_ notification: Notification) {
-        // 读取保存的语言设置
         let savedLanguage = UserDefaults.standard.string(forKey: "appLanguage")
         let currentLanguage = Locale.preferredLanguages.first?.prefix(2) ?? "en"
-        
-        // 检查语言设置是否已保存或与当前系统语言不同
+
         if savedLanguage == nil || savedLanguage != String(currentLanguage) {
-            // 如果未设置或不匹配，使用当前系统语言作为默认值
             UserDefaults.standard.set(String(currentLanguage), forKey: "appLanguage")
         }
-        
-        // 设置应用的语言
         if let language = UserDefaults.standard.string(forKey: "appLanguage") {
             UserDefaults.standard.set([language], forKey: "AppleLanguages")
             UserDefaults.standard.synchronize()

ConfigForge/ConfigForgeApp.swift

@@ -9,17 +9,15 @@ import SwiftUI
 
 @main
 struct ConfigForgeApp: App {
-    // 添加 AppDelegate
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
 
     var body: some Scene {
         WindowGroup(content: {
             ContentView()
                 .frame(minWidth: 800, minHeight: 600)
         })
-        .windowStyle(.hiddenTitleBar) // 可选：使用更现代的窗口样式
+        .windowStyle(.hiddenTitleBar) 
         .commands {
-            // 添加菜单命令
             CommandGroup(replacing: .newItem) {
                 Button(L10n.Sidebar.Add.host) {
                     NotificationCenter.default.post(name: NSNotification.Name("NewEntry"), object: nil)

ConfigForge/Generated/L10nExtensions.swift

@@ -1,25 +1,13 @@
-// L10n 扩展 - 为项目中使用的但 SwiftGen 未直接生成的键提供标准访问
 
 import Foundation
 
-// MARK: - 扩展 L10n 以包含缺失的键
-
 extension L10n {
-    /// 错误相关的本地化字符串
     public enum CustomError {
-        /// 配置读取错误
         public static let configReadError = NSLocalizedString("error.configReadError", comment: "Configuration read error")
-        
-        /// 配置写入错误
         public static let configWriteError = NSLocalizedString("error.configWriteError", comment: "Configuration write error")
-        
-        /// 解析错误
         public static let parsingError = NSLocalizedString("error.parsingError", comment: "Parsing error")
     }
-    
-    /// Kubernetes 相关的本地化字符串
     public enum Kube {
-        /// Kubernetes 配置加载成功
         public static let configLoaded = NSLocalizedString("success.kubeConfigLoaded", comment: "Kubernetes configuration loaded successfully")
     }
 } 

ConfigForge/ImportGenerated.swift

@@ -1,4 +1,3 @@
-// SwiftGen L10n 导入
-// 此文件确保 SwiftGen 生成的代码可在整个项目中使用
+// Import of SwiftGen L10n
 
 @_exported import struct SwiftUI.LocalizedStringKey 

ConfigForge/Models/ConfigDocument.swift

@@ -1,23 +1,21 @@
 import SwiftUI
 import UniformTypeIdentifiers
-
-// Enum to represent the type of configuration content
 enum ConfigContentType: Sendable {
     case ssh
     case kubernetes
-    case unknown // Fallback
+    case unknown 
 
     var utType: UTType {
         switch self {
-        case .ssh: return .text // Or a custom UTType if defined
-        case .kubernetes: return .yaml // Kubeconfig is typically YAML
+        case .ssh: return .text 
+        case .kubernetes: return .yaml 
         case .unknown: return .data
         }
     }
 
     var defaultFilenameExtension: String {
         switch self {
-        case .ssh: return "txt" // SSH config usually has no extension or is txt
+        case .ssh: return "txt" 
         case .kubernetes: return "yaml"
         case .unknown: return "dat"
         }
@@ -32,47 +30,34 @@ enum ConfigContentType: Sendable {
 }
 
 struct ConfigDocument: FileDocument, Sendable {
-    static let readableContentTypes: [UTType] = [.text, .yaml] // Accept both text and YAML
+    static let readableContentTypes: [UTType] = [.text, .yaml] 
 
     var content: String
     var contentType: ConfigContentType
-
-    // Initialize from file content during import
     init(configuration: ReadConfiguration) throws {
         guard let data = configuration.file.regularFileContents,
               let stringContent = String(data: data, encoding: .utf8) else {
             throw CocoaError(.fileReadCorruptFile)
         }
         self.content = stringContent
-
-        // Attempt to determine type based on content or UTType
         if configuration.contentType == .yaml || stringContent.contains("apiVersion:") {
             self.contentType = .kubernetes
         } else if configuration.contentType == .text {
-            // Could potentially be SSH config, but might need better heuristic
-            // For now, assume text means SSH if not clearly Kube
-            // A robust solution might require user confirmation or smarter parsing
             self.contentType = .ssh
         }
         else {
              self.contentType = .unknown
-             // Optionally throw an error if type cannot be determined
-             // throw CocoaError(.fileReadUnknown)
              print("Warning: Could not determine config type during read.")
         }
 
     }
-
-    // Initialize explicitly for export
     init(content: String, type: ConfigContentType) {
         self.content = content
         self.contentType = type
     }
-
-    // Create file wrapper for saving/exporting
     func fileWrapper(configuration: WriteConfiguration) throws -> FileWrapper {
         guard let data = content.data(using: .utf8) else {
-            throw CocoaError(.fileWriteUnknown) // Or a more specific error
+            throw CocoaError(.fileWriteUnknown) 
         }
         return FileWrapper(regularFileWithContents: data)
     }

ConfigForge/Models/ErrorMessage.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 
-// 添加一个可识别的错误消息结构体
 struct ErrorMessage: Identifiable {
     let id = UUID()
     let message: String

ConfigForge/Models/KubeConfigFile.swift

@@ -1,67 +1,30 @@
 import Foundation
 
-/// 表示单个 Kubernetes 配置文件的状态
 enum KubeConfigFileStatus: Equatable {
-    /// 配置文件有效
     case valid
-    /// 配置文件格式无效
     case invalid(String)
-    /// 配置文件未加载或状态未知
     case unknown
 }
 
-/// 表示单个配置文件的类型
 enum KubeConfigFileType: Equatable {
-    /// 主配置文件 (~/.kube/config)
     case active
-    /// 备份配置文件 (~/.kube/config.bak)
     case backup
-    /// 存储在 ~/.kube/configs/ 目录中的配置文件
     case stored
 }
 
-/// 表示文件系统中的单个 Kubernetes 配置文件
 struct KubeConfigFile: Identifiable, Equatable {
-    /// 唯一标识符，基于文件路径
     var id: String { filePath.path }
-    
-    /// 文件名
     let fileName: String
-    
-    /// 显示名称 (不带扩展名)
     var displayName: String {
         fileName.components(separatedBy: ".").first ?? fileName
     }
-    
-    /// 完整的文件路径
     let filePath: URL
-    
-    /// The raw YAML content of the config file
     private(set) var yamlContent: String?
-    
-    /// 文件类型 (活动、备份、存储的)
     let fileType: KubeConfigFileType
-    
-    /// 文件状态 (有效、无效等)
     var status: KubeConfigFileStatus = .unknown
-    
-    /// 文件创建日期
     let creationDate: Date?
-    
-    /// 文件最后修改日期
     var modificationDate: Date?
-    
-    /// 是否为当前活动配置文件
     var isActive: Bool = false
-    
-    /// 创建配置文件对象
-    /// - Parameters:
-    ///   - fileName: 文件名
-    ///   - filePath: 文件路径
-    ///   - fileType: 文件类型
-    ///   - yamlContent: Raw YAML content (if loaded)
-    ///   - creationDate: 创建日期
-    ///   - modificationDate: 修改日期
     init(fileName: String, filePath: URL, fileType: KubeConfigFileType, yamlContent: String? = nil, 
          creationDate: Date? = nil, modificationDate: Date? = nil, isActive: Bool = false) {
         self.fileName = fileName
@@ -72,13 +35,7 @@ struct KubeConfigFile: Identifiable, Equatable {
         self.modificationDate = modificationDate
         self.isActive = isActive
     }
-    
-    /// Creates an instance from a file URL, attempting to read its content and attributes.
-    /// - Parameters:
-    ///   - url: The file URL.
-    ///   - fileType: The type of the file.
-    ///   - fileManager: FileManager instance.
-    /// - Returns: A new KubeConfigFile instance, potentially with nil content if read fails.
+
     static func from(url: URL, fileType: KubeConfigFileType, fileManager: FileManager = .default, isActive: Bool = false) -> KubeConfigFile? {
         var creationDate: Date? = nil
         var modificationDate: Date? = nil
@@ -96,7 +53,6 @@ struct KubeConfigFile: Identifiable, Equatable {
              yamlContent = try String(contentsOf: url, encoding: .utf8)
         } catch {
             print("Warning: Could not read file content for \(url.path): \(error.localizedDescription)")
-            // Content remains nil, status remains .unknown
         }
 
         return KubeConfigFile(
@@ -109,23 +65,17 @@ struct KubeConfigFile: Identifiable, Equatable {
             isActive: isActive
         )
     }
-    
-    /// Updates the raw YAML content and resets the status to unknown.
-    /// - Parameter newContent: The new YAML content.
+
     mutating func updateYamlContent(_ newContent: String) {
         self.yamlContent = newContent
-        self.status = .unknown // Status needs re-validation after content change
-        self.modificationDate = Date() // Update modification date
+        self.status = .unknown 
+        self.modificationDate = Date() 
     }
-    
-    /// 标记为无效，并提供原因
-    /// - Parameter reason: 无效的原因
+
     mutating func markAsInvalid(_ reason: String) {
         self.status = .invalid(reason)
     }
 
-    // MARK: - Equatable
-    
     static func == (lhs: KubeConfigFile, rhs: KubeConfigFile) -> Bool {
         return lhs.filePath == rhs.filePath &&
                lhs.fileType == rhs.fileType

ConfigForge/Models/SSHConfigEntry.swift

@@ -11,8 +11,6 @@ struct SSHConfigEntry: Identifiable, Hashable, Sendable {
     let id = UUID()
     var host: String
     var properties: [String: String]
-    
-    // 计算属性用于直接访问常用配置
     var hostname: String { 
         properties["HostName"] ?? ""
     }
@@ -28,32 +26,24 @@ struct SSHConfigEntry: Identifiable, Hashable, Sendable {
     var identityFile: String { 
         properties["IdentityFile"] ?? ""
     }
-    
-    // 验证端口号是否有效
     var isPortValid: Bool {
         guard let portStr = properties["Port"], !portStr.isEmpty else {
-            return true // 如果没有设置端口，使用默认值22是有效的
+            return true 
         }
 
         guard let port = Int(portStr) else {
-            return false // 端口必须是数字
+            return false 
         }
 
-        return port >= 1 && port <= 65535 // 有效端口范围
+        return port >= 1 && port <= 65535 
     }
-    
-    // 验证主机名是否有效
     var isHostNameValid: Bool {
         guard let hostName = properties["HostName"], !hostName.isEmpty else {
-            return true // 空主机名在技术上是有效的，尽管不太有用
+            return true 
         }
-        
-        // 简单的主机名验证 - 不能仅包含空格
         let trimmed = hostName.trimmingCharacters(in: .whitespacesAndNewlines)
         return !trimmed.isEmpty
     }
-    
-    // 实现Hashable协议
     func hash(into hasher: inout Hasher) {
         hasher.combine(id)
     }