Merge pull request #1 from wflixu/dev

v1.0.0

FinderSyncExt/FinderSync+UserDefaults.swift

@@ -0,0 +1,68 @@
+//
+// FinderSync+UserDefaults.swift
+// FinderSyncExt
+//
+// Created by 李旭 on 2024/4/7.
+//
+
+import Foundation
+
+import os.log
+
+private let logger = Logger(subsystem: subsystem, category: "user_defaults")
+
+extension UserDefaults {
+ var showContextualMenuForItem: Bool {
+ defaults(for: Key.showContextualMenuForItem) ?? true
+ }
+
+ var showContextualMenuForContainer: Bool {
+ defaults(for: Key.showContextualMenuForContainer) ?? true
+ }
+
+ var showContextualMenuForSidebar: Bool {
+ defaults(for: Key.showContextualMenuForSidebar) ?? true
+ }
+
+ var showToolbarItemMenu: Bool {
+ defaults(for: Key.showToolbarItemMenu) ?? true
+ }
+
+ var copySeparator: String {
+ let spparator = defaults(for: Key.copySeparator) ?? ""
+ return spparator.isEmpty ? " " : spparator
+ }
+
+ var copyOption: CopyOption {
+ let optionRaw = defaults(for: Key.copyOption) ?? 0
+ return CopyOption(rawValue: optionRaw) ?? .origin
+ }
+
+ var newFileName: String {
+ defaults(for: Key.newFileName) ?? "Untitled"
+ }
+
+ var newFileExtension: NewFileExtension {
+ let fileExtensionRaw = defaults(for: Key.newFileExtension) ?? ""
+ return NewFileExtension(rawValue: fileExtensionRaw) ?? .none
+ }
+
+ var showSubMenuForApplication: Bool {
+ defaults(for: Key.showSubMenuForApplication) ?? false
+ }
+
+ var showSubMenuForAction: Bool {
+ defaults(for: Key.showSubMenuForAction) ?? false
+ }
+
+ private func defaults<T>(for key: String) -> T? {
+ logger.warning("UserDefaults defaults: key\(key)")
+ if let value = object(forKey: key) as? T {
+ return value
+ } else {
+ logger.info("Missing key for \(key, privacy: .public), using default true value")
+ return nil
+ }
+ }
+}
+

FinderSyncExt/FinderSync.swift

@@ -2,38 +2,61 @@
 // FinderSync.swift
 // FinderSyncExt
 //
-// Created by 李旭 on 2024/3/13.
+// Created by 李旭 on 2024/4/4.
 //
 
+import AppKit
 import Cocoa
+import Darwin
 import FinderSync
+import os.log
 
-class FinderSync: FIFinderSync {
+private let logger = Logger(subsystem: subsystem, category: "menu")
 
- var myFolderURL = URL(fileURLWithPath: "/")
+class FinderSync: FIFinderSync {
+ var myFolderURL = URL(fileURLWithPath: "/Users/")
+ var isHostAppOpen = true
+ let menuStore = MenuItemStore()
+ let folderStore = FolderItemStore()
+ let finderChannel = FinderCommChannel()
+ let messager = Messager.shared
 
  override init() {
  super.init()
- initLogSetting()
+
+ finderChannel.setup(folderStore, menuStore)
+
  NSLog("FinderSync() launched from %@", Bundle.main.bundlePath as NSString)
 
+
+
  // Set up the directory we are syncing.
- FIFinderSyncController.default().directoryURLs = [self.myFolderURL]
+// FIFinderSyncController.default().directoryURLs = [myFolderURL]
+
+ messager.on(name: "quit") { msg in
+ self.isHostAppOpen = false
+ }
+ messager.on(name: "running") { msg in
+ self.isHostAppOpen = true
+ }
 
- // Set up images for our badge identifiers. For demonstration purposes, this uses off-the-shelf images.
- FIFinderSyncController.default().setBadgeImage(NSImage(named: NSImage.colorPanelName)!, label: "Status One" , forBadgeIdentifier: "One")
- FIFinderSyncController.default().setBadgeImage(NSImage(named: NSImage.cautionName)!, label: "Status Two", forBadgeIdentifier: "Two")
  }
 
+
+
  // MARK: - Primary Finder Sync protocol methods
 
  override func beginObservingDirectory(at url: URL) {
  // The user is now seeing the container's contents.
  // If they see it in more than one view at a time, we're only told once.
  NSLog("beginObservingDirectoryAtURL: %@", url.path as NSString)
+// let dirs = FIFinderSyncController.default().directoryURLs.map()
+
+// for dir in dirs {
+// logger.notice("Sync directory set to \(dir.path)")
+// }
  }
 
-
  override func endObservingDirectory(at url: URL) {
  // The user is no longer seeing the container's contents.
  NSLog("endObservingDirectoryAtURL: %@", url.path as NSString)
@@ -55,63 +78,133 @@ class FinderSync: FIFinderSync {
  }
 
  override var toolbarItemToolTip: String {
- return "FinderSy: Click the toolbar item for a menu."
+ return "RClick: Click the toolbar item for a menu."
  }
 
  override var toolbarItemImage: NSImage {
- return NSImage(named: NSImage.cautionName)!
+ return NSImage(systemSymbolName: "computermouse", accessibilityDescription: "RClick Menu")!
  }
 
- override func menu(for menuKind: FIMenuKind) -> NSMenu {
+ @MainActor override func menu(for menuKind: FIMenuKind) -> NSMenu {
  // Produce a menu for the extension.
- let menu = NSMenu(title: "RClick")
-
- if (menuKind == FIMenuKind.contextualMenuForContainer) {
- menu.addItem(withTitle: "MenuForContainer", action: #selector(sampleAction(_:)), keyEquivalent: "")
+ logger.warning("start build menu ---------")
+ let applicationMenu = NSMenu(title: "RClick")
+ guard isHostAppOpen else {
+ return applicationMenu
+ }
+ switch menuKind {
+ case .contextualMenuForContainer:
+ for nsmenu in createAppItems() {
+ applicationMenu.addItem(nsmenu)
+ }
+
+ case .contextualMenuForItems:
+ NSLog("contextualMenuForItems")
 
- // 创建一级菜单项
- let fileMenuItem = NSMenuItem(title: "File", action: nil, keyEquivalent: "")
-
- // 创建二级菜单
- let subMenu = NSMenu()
-
- // 添加二级菜单项
- subMenu.addItem(NSMenuItem(title: "New", action: nil, keyEquivalent: ""))
- subMenu.addItem(NSMenuItem(title: "Open", action: nil, keyEquivalent: ""))
- subMenu.addItem(NSMenuItem.separator())
- subMenu.addItem(NSMenuItem(title: "Quit", action: nil, keyEquivalent: "q"))
-
- // 将二级菜单附加到一级菜单项
- fileMenuItem.submenu = subMenu
- // 添加一级菜单项到主菜单
- menu.addItem(fileMenuItem)
+ for nsmenu in createAppItems() {
+ applicationMenu.addItem(nsmenu)
+ }
+
+ for item in createActionMenuItems() {
+ applicationMenu.addItem(item)
+ }
+
+ default:
+ print("Some other character")
  }
-
- if (menuKind == FIMenuKind.contextualMenuForItems) {
- menu.addItem(withTitle: "MenuForItems", action: #selector(sampleAction(_:)), keyEquivalent: "")
+
+ return applicationMenu
+ }
+
+ @objc func createAppItems() -> [NSMenuItem] {
+ var appMenuItems: [NSMenuItem] = []
+ for item in menuStore.appItems {
+ let menuItem = NSMenuItem()
+ menuItem.target = self
+ menuItem.title = "用\(item.name)打开"
+ menuItem.action = #selector(itemAction(_:))
+ menuItem.toolTip = "\(item.name)"
+ menuItem.tag = 0
+ menuItem.image = NSWorkspace.shared.icon(forFile: item.url.path)
+ appMenuItems.append(menuItem)
  }
+ return appMenuItems
+ }
+
+ @objc func createActionMenuItems() -> [NSMenuItem] {
+ var actionMenuitems: [NSMenuItem] = []
 
- return menu
+ for item in menuStore.actionItems.filter(\.enabled) {
+ let menuItem = NSMenuItem()
+ menuItem.target = self
+ menuItem.title = item.name
+ menuItem.action = #selector(itemAction(_:))
+ menuItem.toolTip = "\(item.name)"
+ menuItem.tag = 1
+ menuItem.image = NSImage(systemSymbolName: item.iconName, accessibilityDescription: item.iconName)!
+
+ actionMenuitems.append(menuItem)
+ }
+ return actionMenuitems
  }
 
- @IBAction func sampleAction(_ sender: AnyObject?) {
- let target = FIFinderSyncController.default().targetedURL()
- let items = FIFinderSyncController.default().selectedItemURLs()
-
- let item = sender as! NSMenuItem
- NSLog("sampleAction: menu item: %@, target = %@, items = ", item.title as NSString, target!.path as NSString)
- for obj in items! {
- NSLog(" %@", obj.path as NSString)
+
+
+ @MainActor @objc func ContainerAction(_ menuItem: NSMenuItem) {
+ switch menuItem.tag {
+ case 0:
+ appOpen(menuItem, isContainer: true)
+
+ default:
+ break
  }
  }
 
- func initLogSetting(){
- let tmpPath = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0] as NSURL
- let fileName = "/out.log"// 注意不是NSData!
- let logFilePath = tmpPath.path!.appending(fileName)
- freopen(logFilePath.cString(using: .utf8), "a+", stdout)
- freopen(logFilePath.cString(using: .utf8), "a+", stderr);
- //writeLog(str: logFilePath)
+ @MainActor @objc func itemAction(_ menuItem: NSMenuItem) {
+ switch menuItem.tag {
+ case 0:
+ appOpen(menuItem, isContainer: false)
+ case 1:
+ actioning(menuItem, isContainer: false)
+ default:
+ break
+ }
+ }
+
+ @MainActor @objc func actioning(_ menuItem: NSMenuItem, isContainer: Bool) {
+ let item = menuStore.getActionItem(name: menuItem.title)
+ let urls = FIFinderSyncController.default().selectedItemURLs()
+ if let test = UserDefaults.group.string(forKey: "test") {
+ logger.warning("test: \(test)")
+ }
+
+ guard let targetURL = urls?.first
+ else {
+ logger.warning("no url")
+ return
+ }
+ if let actionName = item?.key {
+ messager.sendMessage(name: Key.messageFromFinder, data: MessagePayload(action: actionName, target: targetURL.path))
+ } else {}
  }
 
+ @objc func appOpen(_ menuItem: NSMenuItem, isContainer: Bool) {
+ var target: String
+ if isContainer {
+ guard let targetURL = FIFinderSyncController.default().targetedURL()
+ else { return }
+ target = targetURL.path
+
+ } else {
+ let urls = FIFinderSyncController.default().selectedItemURLs()
+ guard let targetURL = urls?.first
+ else { return }
+ target = targetURL.path
+ }
+
+ let item = menuStore.getAppItem(name: menuItem.title)
+ if let appUrl = item?.url {
+ messager.sendMessage(name: Key.messageFromFinder, data: MessagePayload(action: "open", target: target, app: appUrl.path))
+ }
+ }
 }

FinderSyncExt/FinderSyncExt.entitlements

@@ -2,9 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
- <key>com.apple.security.app-sandbox</key>
- <true/>
- <key>com.apple.security.files.user-selected.read-only</key>
- <true/>
+ <key>com.apple.security.app-sandbox</key>
+ <true/>
+ <key>com.apple.security.application-groups</key>
+ <array>
+ <string>group.cn.wflixu.RClickDebug</string>
+ </array>
+ <key>com.apple.security.files.bookmarks.app-scope</key>
+ <true/>
+ <key>com.apple.security.files.user-selected.read-write</key>
+ <true/>
 </dict>
 </plist>

FinderSyncExt/FinderSyncExtRelease.entitlements

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.app-sandbox</key>
+ <true/>
+ <key>com.apple.security.application-groups</key>
+ <array>
+ <string>group.cn.wflixu.RClick</string>
+ </array>
+ <key>com.apple.security.files.bookmarks.app-scope</key>
+ <true/>
+ <key>com.apple.security.files.user-selected.read-write</key>
+ <true/>
+</dict>
+</plist>

FinderSyncExt/Info.plist

@@ -2,12 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
- <key>LSUIElement</key>
- <true/>
  <key>NSExtension</key>
  <dict>
  <key>NSExtensionAttributes</key>
  <dict/>
+ <key>ITSAppUsesNonExemptEncryption</key>
+ <false/>
  <key>NSExtensionPointIdentifier</key>
  <string>com.apple.FinderSync</string>
  <key>NSExtensionPrincipalClass</key>