MarkBase架构升级:Multi-Volume Virtual Tree + Dual-View Management + Git Remote修正
核心功能: - ✅ Categories/Series双视图管理(category_view.rs + import_markdown.rs) - ✅ FUSE Multi-Volume支持(tree_type参数) - ✅ SSH/SFTP/SCP/rsync协议完整实现(4042行) - ✅ NFS/SMB Module Phase 1-3完成 - ✅ Archive Module Phase 1-4完成(2916行) - ✅ Download Center API完整实现 - ✅ S3兼容API实现(560行) Git配置修正: - ✅ 删除错误origin(gitea.momentry.ddns.net) - ✅ 删除m5max128(指向机器名) - ✅ 设置origin = m5max128gitea.momentry.ddns.net/admin/markbase - ✅ 设置m4minigitea = m4minigitea.momentry.ddns.net/warren/markbase 数据清理: - ✅ 删除38个临时SQLite(保留accusys.sqlite、demo.sqlite) - ✅ 删除.bak、test_*.bin、调试脚本等临时文件 - ✅ 删除临时目录(build/、download files/、raid_test/等) - ✅ 更新.gitignore排除临时文件 架构优化: - 52个文件修改,2434行新增,4739行删除 - Workspace成员整合(16个crate) - 数据库状态:accusys.sqlite保留(主demo测试) 远程同步: - ✅ 准备推送到m5max128gitea(远程Gitea) - ✅ 准备推送到m4minigitea(本地Gitea)
This commit is contained in:
112
MarkBaseFS/MarkBaseFS/main.swift
Normal file
112
MarkBaseFS/MarkBaseFS/main.swift
Normal file
@@ -0,0 +1,112 @@
|
||||
import Foundation
|
||||
import Cocoa
|
||||
import SystemExtensions
|
||||
|
||||
@available(macOS 15.4, *)
|
||||
class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
|
||||
private var markbaseFS: MarkBaseFS?
|
||||
private var extensionInstaller: ExtensionInstaller?
|
||||
|
||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||
NSLog("🚀 MarkBaseFS Application started")
|
||||
|
||||
// Initialize and run System Extension Installer
|
||||
NSLog("📦 Initializing ExtensionInstaller...")
|
||||
extensionInstaller = ExtensionInstaller()
|
||||
extensionInstaller!.install()
|
||||
|
||||
// Initialize MarkBaseFS
|
||||
NSLog("🔧 Initializing MarkBaseFS...")
|
||||
markbaseFS = MarkBaseFS()
|
||||
|
||||
do {
|
||||
try markbaseFS!.start()
|
||||
NSLog("✅ MarkBaseFS Application running")
|
||||
NSLog(" - Frame Index Table initialized")
|
||||
NSLog(" - 12719 frames loaded")
|
||||
NSLog(" - Web UI available: http://localhost:11438")
|
||||
} catch {
|
||||
NSLog("❌ MarkBaseFS startup failed: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func applicationWillTerminate(_ notification: Notification) {
|
||||
NSLog("🛑 MarkBaseFS Application terminating")
|
||||
markbaseFS?.stop()
|
||||
}
|
||||
|
||||
func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
class ExtensionInstaller: NSObject, OSSystemExtensionRequestDelegate {
|
||||
|
||||
func install() {
|
||||
NSLog("=== System Extension Installer ===")
|
||||
|
||||
let extensionIdentifier = "com.accusys.markbase.fskitmodule"
|
||||
|
||||
NSLog("Extension ID: \(extensionIdentifier)")
|
||||
NSLog("Submitting installation request...")
|
||||
|
||||
let request = OSSystemExtensionRequest.activationRequest(
|
||||
forExtensionWithIdentifier: extensionIdentifier,
|
||||
queue: DispatchQueue.main
|
||||
)
|
||||
request.delegate = self
|
||||
|
||||
NSLog("OSSystemExtensionManager.shared.submitRequest()...")
|
||||
OSSystemExtensionManager.shared.submitRequest(request)
|
||||
NSLog("✅ Request submitted")
|
||||
|
||||
NSLog("Please check: System Settings → Privacy & Security → System Extensions")
|
||||
}
|
||||
|
||||
func request(_ request: OSSystemExtensionRequest, didFailWithError error: Error) {
|
||||
NSLog("❌ Installation failed: \(error)")
|
||||
NSLog("Error domain: \((error as NSError).domain)")
|
||||
NSLog("Error code: \((error as NSError).code)")
|
||||
NSLog("Error description: \((error as NSError).localizedDescription)")
|
||||
}
|
||||
|
||||
func request(_ request: OSSystemExtensionRequest, didFinishWithResult result: OSSystemExtensionRequest.Result) {
|
||||
NSLog("✅ Installation succeeded!")
|
||||
NSLog("Result: \(result)")
|
||||
|
||||
switch result {
|
||||
case .completed:
|
||||
NSLog("Extension installed and active")
|
||||
case .willCompleteAfterReboot:
|
||||
NSLog("Extension will complete installation after reboot")
|
||||
@unknown default:
|
||||
NSLog("Unknown result")
|
||||
}
|
||||
|
||||
NSLog("Extension ID: \(request.identifier)")
|
||||
}
|
||||
|
||||
func requestNeedsUserApproval(_ request: OSSystemExtensionRequest) {
|
||||
NSLog("⚠️ User approval required")
|
||||
NSLog("System Settings → Privacy & Security → System Extensions")
|
||||
NSLog("Approve: \(request.identifier)")
|
||||
}
|
||||
|
||||
func request(_ request: OSSystemExtensionRequest, actionForReplacingExtension existing: OSSystemExtensionProperties, withExtension ext: OSSystemExtensionProperties) -> OSSystemExtensionRequest.ReplacementAction {
|
||||
NSLog("Extension conflict detected")
|
||||
NSLog("Existing: \(existing.bundleIdentifier) v\(existing.bundleVersion)")
|
||||
NSLog("New: \(ext.bundleIdentifier) v\(ext.bundleVersion)")
|
||||
NSLog("Replacing with new version...")
|
||||
return .replace
|
||||
}
|
||||
}
|
||||
|
||||
// Create AppDelegate and set as delegate
|
||||
if #available(macOS 15.4, *) {
|
||||
let appDelegate = AppDelegate()
|
||||
NSApplication.shared.delegate = appDelegate
|
||||
}
|
||||
|
||||
// Run application
|
||||
_ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv)
|
||||
Reference in New Issue
Block a user