refactor: quickslot을 개선합니다

Box42.xcodeproj/project.pbxproj

@@ -58,7 +58,7 @@
 		DE4408052A923EC00091937A /* QuitButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE4408042A923EC00091937A /* QuitButtonView.swift */; };
 		DE4408082A9240300091937A /* BoxFunctionButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE4408072A9240300091937A /* BoxFunctionButtonView.swift */; };
 		DE44080C2A924B520091937A /* BoxFunctionViewGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE44080B2A924B520091937A /* BoxFunctionViewGroup.swift */; };
-		DE4408152A92750D0091937A /* keyDown+BoxBaseContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE4408142A92750D0091937A /* keyDown+BoxBaseContainerViewController.swift */; };
+		DE4408152A92750D0091937A /* keyDown+Appdelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE4408142A92750D0091937A /* keyDown+Appdelegate.swift */; };
 		DE44081D2A928F760091937A /* Divider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE44081C2A928F760091937A /* Divider.swift */; };
 		DE62BE5A2A9BA31700D97E06 /* QuickSlotButtonCollectionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DE62BE582A9BA31700D97E06 /* QuickSlotButtonCollectionViewController.xib */; };
 		DE62BE672A9BA92E00D97E06 /* QuickSlotButtonViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE7F9D432A9B7A4700F8ACAE /* QuickSlotButtonViewItem.swift */; };
@@ -120,6 +120,10 @@
 		DEB862EB2A853F7F00278FCD /* BoxWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEB862E92A853F7F00278FCD /* BoxWindowController.swift */; };
 		DEE0FA962A9A554F00085A65 /* FunctionButtonUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEE0FA952A9A554F00085A65 /* FunctionButtonUI.swift */; };
 		DEF0761B2AA33671005700E5 /* DeleteUserMeScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0761A2AA33671005700E5 /* DeleteUserMeScript.swift */; };
+		DEF076262AA3B0C1005700E5 /* QuickSlotItemButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076252AA3B0C1005700E5 /* QuickSlotItemButton.swift */; };
+		DEF0762A2AA3B955005700E5 /* PutUserMeQuickSlot.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF076292AA3B955005700E5 /* PutUserMeQuickSlot.swift */; };
+		DEF0762D2AA3C34C005700E5 /* GetUserMeQuickSlot.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0762C2AA3C34C005700E5 /* GetUserMeQuickSlot.swift */; };
+		DEF076302AA3CF8A005700E5 /* QuickSlotItemLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF0762F2AA3CF8A005700E5 /* QuickSlotItemLabel.swift */; };
 		DEF749322A85657600D987C8 /* NSScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEF749312A85657600D987C8 /* NSScreen.swift */; };
 /* End PBXBuildFile section */
 
@@ -178,7 +182,7 @@
 		DE4408042A923EC00091937A /* QuitButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuitButtonView.swift; sourceTree = "<group>"; };
 		DE4408072A9240300091937A /* BoxFunctionButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoxFunctionButtonView.swift; sourceTree = "<group>"; };
 		DE44080B2A924B520091937A /* BoxFunctionViewGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoxFunctionViewGroup.swift; sourceTree = "<group>"; };
-		DE4408142A92750D0091937A /* keyDown+BoxBaseContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "keyDown+BoxBaseContainerViewController.swift"; path = "Main/keyDown+BoxBaseContainerViewController.swift"; sourceTree = "<group>"; };
+		DE4408142A92750D0091937A /* keyDown+Appdelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "keyDown+Appdelegate.swift"; sourceTree = "<group>"; };
 		DE44081C2A928F760091937A /* Divider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Divider.swift; sourceTree = "<group>"; };
 		DE62BE312A9B869900D97E06 /* QuickSlotButtonCollectionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotButtonCollectionViewController.swift; sourceTree = "<group>"; };
 		DE62BE582A9BA31700D97E06 /* QuickSlotButtonCollectionViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QuickSlotButtonCollectionViewController.xib; sourceTree = "<group>"; };
@@ -239,6 +243,10 @@
 		DEB862E92A853F7F00278FCD /* BoxWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BoxWindowController.swift; sourceTree = "<group>"; };
 		DEE0FA952A9A554F00085A65 /* FunctionButtonUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FunctionButtonUI.swift; sourceTree = "<group>"; };
 		DEF0761A2AA33671005700E5 /* DeleteUserMeScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteUserMeScript.swift; sourceTree = "<group>"; };
+		DEF076252AA3B0C1005700E5 /* QuickSlotItemButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotItemButton.swift; sourceTree = "<group>"; };
+		DEF076292AA3B955005700E5 /* PutUserMeQuickSlot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PutUserMeQuickSlot.swift; sourceTree = "<group>"; };
+		DEF0762C2AA3C34C005700E5 /* GetUserMeQuickSlot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUserMeQuickSlot.swift; sourceTree = "<group>"; };
+		DEF0762F2AA3CF8A005700E5 /* QuickSlotItemLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickSlotItemLabel.swift; sourceTree = "<group>"; };
 		DEF7492E2A85603700D987C8 /* nodeInstall.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = nodeInstall.sh; sourceTree = "<group>"; };
 		DEF749312A85657600D987C8 /* NSScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSScreen.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -386,7 +394,6 @@
 				DE0A916B2A8E7DC700D1D6F1 /* UI */,
 				DE4408202A9297EE0091937A /* View */,
 				DE1F1A192A8B50C500A88DD8 /* BoxBaseContainerViewController.swift */,
-				DE4408142A92750D0091937A /* keyDown+BoxBaseContainerViewController.swift */,
 				DEB862E92A853F7F00278FCD /* BoxWindowController.swift */,
 			);
 			name = Main;
@@ -464,6 +471,8 @@
 				DE9457272A9F6E4400B0B768 /* GetUserMeScripts.swift */,
 				DE94572B2A9F75D500B0B768 /* API.swift */,
 				DEF0761A2AA33671005700E5 /* DeleteUserMeScript.swift */,
+				DEF076292AA3B955005700E5 /* PutUserMeQuickSlot.swift */,
+				DEF0762C2AA3C34C005700E5 /* GetUserMeQuickSlot.swift */,
 			);
 			path = API;
 			sourceTree = "<group>";
@@ -552,6 +561,8 @@
 			children = (
 				DE7F9D432A9B7A4700F8ACAE /* QuickSlotButtonViewItem.swift */,
 				DE7F9D442A9B7A4700F8ACAE /* QuickSlotButtonViewItem.xib */,
+				DEF076252AA3B0C1005700E5 /* QuickSlotItemButton.swift */,
+				DEF0762F2AA3CF8A005700E5 /* QuickSlotItemLabel.swift */,
 			);
 			path = "Vertical Item";
 			sourceTree = "<group>";
@@ -750,6 +761,7 @@
 				DE98E83A2A98DB6000F8744A /* RotateImage+NSImage.swift */,
 				DE97CA682A9A6364001073DE /* PixelConversion+CGFloat.swift */,
 				DE94571B2A9EFB7800B0B768 /* Associated+NSButton.swift */,
+				DE4408142A92750D0091937A /* keyDown+Appdelegate.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -842,6 +854,7 @@
 				DE018BB82A5099F900FF0AA3 /* Box42.xcdatamodeld in Sources */,
 				DEF0761B2AA33671005700E5 /* DeleteUserMeScript.swift in Sources */,
 				DE62BE672A9BA92E00D97E06 /* QuickSlotButtonViewItem.swift in Sources */,
+				DEF076302AA3CF8A005700E5 /* QuickSlotItemLabel.swift in Sources */,
 				DE874F542A591F1400FC3B77 /* PreferencesView.swift in Sources */,
 				DE98E83B2A98DB6000F8744A /* RotateImage+NSImage.swift in Sources */,
 				DE0A91982A8F977F00D1D6F1 /* ToolbarViewController.swift in Sources */,
@@ -872,6 +885,7 @@
 				DE77BA512A82580400713683 /* MenubarViewModel.swift in Sources */,
 				DE44080C2A924B520091937A /* BoxFunctionViewGroup.swift in Sources */,
 				DE97CA7C2A9A7199001073DE /* QuickSlotGroupView.swift in Sources */,
+				DEF0762A2AA3B955005700E5 /* PutUserMeQuickSlot.swift in Sources */,
 				DE018BE42A509B1700FF0AA3 /* CPU.swift in Sources */,
 				DE77BBA22A9DDC40006CC98B /* ScriptsFileManager.swift in Sources */,
 				DE874F5F2A5935CC00FC3B77 /* String.swift in Sources */,
@@ -914,7 +928,7 @@
 				DE94570C2A9E69EB00B0B768 /* ScriptExcuteButton.swift in Sources */,
 				DE9457162A9E6D3000B0B768 /* ScriptQuickSlotButton.swift in Sources */,
 				DE97CA7F2A9A73A9001073DE /* QuickSlotUI.swift in Sources */,
-				DE4408152A92750D0091937A /* keyDown+BoxBaseContainerViewController.swift in Sources */,
+				DE4408152A92750D0091937A /* keyDown+Appdelegate.swift in Sources */,
 				DE018BED2A509B2600FF0AA3 /* URLModel.swift in Sources */,
 				DE97CA692A9A6364001073DE /* PixelConversion+CGFloat.swift in Sources */,
 				DE7886282A9D186700FE21DD /* ScriptsViewController.swift in Sources */,
@@ -934,10 +948,12 @@
 				DE24E6382A8FE10400E29F5D /* BoxBaseSplitView.swift in Sources */,
 				DE44081D2A928F760091937A /* Divider.swift in Sources */,
 				DE98E8432A98DDFD00F8744A /* QuickSlotViewController.swift in Sources */,
+				DEF0762D2AA3C34C005700E5 /* GetUserMeQuickSlot.swift in Sources */,
 				DE94574B2AA0A70500B0B768 /* NetworkView.swift in Sources */,
 				DE1F1A2E2A8BCC9800A88DD8 /* Storage.swift in Sources */,
 				DE3FF36B2A978A57009C88EF /* WindowButtonViewController.swift in Sources */,
 				DE1F1A312A8BD68F00A88DD8 /* Double.swift in Sources */,
+				DEF076262AA3B0C1005700E5 /* QuickSlotItemButton.swift in Sources */,
 				DE0A917F2A8F865400D1D6F1 /* BoxToolbarViewGroup.swift in Sources */,
 				DE018BEA2A509B2100FF0AA3 /* WebViewModel.swift in Sources */,
 			);

Box42/Extensions/keyDown+Appdelegate.swift

@@ -0,0 +1,105 @@
+//
+//  keyDown+AppDelegate.swift
+//  Box42
+//
+//  Created by Chanhee Kim on 8/21/23.
+//
+
+import AppKit
+
+extension AppDelegate {
+    func eventMonitoring() {
+        NSEvent.addLocalMonitorForEvents(matching: .keyUp) { (event) -> NSEvent? in
+            print("Key Up: \(event.keyCode)")
+
+            if event.modifierFlags.contains(.control) {
+                switch event.keyCode {
+                case 12: // 'Q' 키의 keyCode
+                    print("Control + Q pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(0)
+                case 13: // 'W' 키의 keyCode
+                    print("Control + W pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(2)
+                case 14: // 'E' 키의 keyCode
+                    print("Control + E pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(4)
+                case 15: // 'R' 키의 keyCode
+                    print("Control + R pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(6)
+                case 0:  // 'A' 키의 keyCode
+                    print("Control + A pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(1)
+                case 1:  // 'S' 키의 keyCode
+                    print("Control + S pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(3)
+                case 2:  // 'D' 키의 keyCode
+                    print("Control + D pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(5)
+                case 3:  // 'F' 키의 keyCode
+                    print("Control + F pressed")
+                    QuickSlotScriptsLogicController.shared.shortCutKeyUP(7)
+                case 6:  // 'Z' 키의 keyCode
+                    print("Control + Z pressed")
+                    StateManager.shared.togglePin() // pin 처리
+                case 7:  // 'X' 키의 keyCode
+                    print("Control + X pressed")
+                default:
+                    break
+                }
+            } else if event.modifierFlags.contains(.command) {
+                switch event.keyCode {
+                case 12: // 'Q' 키의 keyCode
+                    print("command + Q pressed")
+                case 13: // 'W' 키의 keyCode
+                    print("command + W pressed")
+                case 14: // 'E' 키의 keyCode
+                    print("command + E pressed")
+                case 15: // 'R' 키의 keyCode
+                    print("command + R pressed")
+                    WebViewManager.shared.hostingWebView?.reload()
+                case 0:  // 'A' 키의 keyCode
+                    print("command + A pressed")
+                case 1:  // 'S' 키의 keyCode
+                    print("command + S pressed")
+                case 2:  // 'D' 키의 keyCode
+                    print("command + D pressed")
+                case 3:  // 'F' 키의 keyCode
+                    print("command + F pressed")
+                default:
+                    break
+                }
+            } else {
+                switch event.keyCode {
+                case 12: // 'Q' 키의 keyCode
+                    print("Q pressed")
+                case 13: // 'W' 키의 keyCode
+                    print("W pressed")
+                case 14: // 'E' 키의 keyCode
+                    print("E pressed")
+                case 15: // 'R' 키의 keyCode
+                    print("R pressed")
+                case 0:  // 'A' 키의 keyCode
+                    print("A pressed")
+                case 1:  // 'S' 키의 keyCode
+                    print("S pressed")
+                    StorageConfig.shared.setThreshold(.percentage50)
+                    StorageConfig.shared.setPeriod(.period10s)
+                case 2:  // 'D' 키의 keyCode
+                    print("D pressed")
+                    DispatchQueue.main.async {
+                        StorageConfig.shared.setThreshold(.percentage30)
+                    }
+                    StorageConfig.shared.setPeriod(.period1s)
+                case 3:  // 'F' 키의 keyCode
+                    print("F pressed")
+                case 53: // Escape 키
+                    print("escape")
+//                    menubarVCDelegate?.toggleWindow(sender: nil)
+                default:
+                    break
+                }
+            }
+            return event
+        }
+    }
+}

Box42/Main/BoxBaseContainerViewController.swift

@@ -25,6 +25,10 @@ class BoxBaseContainerViewController: NSViewController {
 
     weak var menubarVCDelegate: MenubarViewControllerDelegate? // extension
 
+
+    var quickSlotButtonCollectionVC: QuickSlotButtonCollectionViewController =  QuickSlotButtonCollectionViewController()
+
+
     override func loadView() {
         self.view = NSView()
         self.view.addSubview(splitView)

Box42/Preferences/View/Funtion/ShortcutSettingView.swift

@@ -22,15 +22,15 @@ class ShortcutSettingView: NSView {
     // Create an array of labels and text fields for various shortcut settings
     let shortcutSettings: [(label: String, defaultKey: String)] = [
         ("앱 Show 단축키 설정", "Middle Mouse"),
-        ("Pin Box 단축키 설정", "P"),
-        ("퀵슬롯 1 설정", "Q"),
-        ("퀵슬롯 2 설정", "W"),
-        ("퀵슬롯 3 설정", "E"),
-        ("퀵슬롯 4 설정", "R"),
-        ("퀵슬롯 5 설정", "A"),
-        ("퀵슬롯 6 설정", "S"),
-        ("퀵슬롯 7 설정", "D"),
-        ("퀵슬롯 8 설정", "F")
+        ("Pin Box 단축키 설정", "^B"),
+        ("퀵슬롯 1 설정", "^Q"),
+        ("퀵슬롯 2 설정", "^W"),
+        ("퀵슬롯 3 설정", "^E"),
+        ("퀵슬롯 4 설정", "^R"),
+        ("퀵슬롯 5 설정", "^A"),
+        ("퀵슬롯 6 설정", "^S"),
+        ("퀵슬롯 7 설정", "^D"),
+        ("퀵슬롯 8 설정", "^F")
     ]
 
     lazy var stackView: NSStackView = {

Box42/QuickSlot/Controller/QuickSlotScriptsLogicController.swift

@@ -7,42 +7,31 @@
 
 import AppKit
 
-class ScriptsLogicController {
-
-    static let shared = ScriptsLogicController()
+class QuickSlotScriptsLogicController {
+    static let shared = QuickSlotScriptsLogicController()
 
     private init() {
         NotificationCenter.default.addObserver(self, selector: #selector(handleButtonTapped), name: .collectionButtonTapped, object: nil)
     }
 
     @objc func handleButtonTapped(notification: NSNotification) {
         if let button = notification.object as? NSButton {
-            SecurityScopedResourceAccess.accessResourceExecuteShellScript(scriptPath: button.associatedString ?? "")
+            if let associatedString = button.associatedString {
+                if let lastThreeCharacters = button.associatedString?.suffix(3) {
+                    if lastThreeCharacters == ".sh" {
+                        ScriptsFileManager.downloadFile(from: "https://42box.kr/" + associatedString)
+                    }
+                }
+            }
         }
     }
 
-    private func executeCleanScript() {
-        if let scriptPath = Bundle.main.path(forResource: "cleanCache", ofType: "sh") {
-            let task = Process()
-            task.launchPath = "/bin/sh"
-            task.arguments = [scriptPath]
-
-            let outputPipe = Pipe()
-            task.standardOutput = outputPipe
-            task.standardError = outputPipe
-
-            task.launch()
-            task.waitUntilExit()
-
-            let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
-            let output = String(data: outputData, encoding: .utf8) ?? ""
-
-            DispatchQueue.main.async {
-                print("Output: \(output)")
-            }
-        } else {
-            DispatchQueue.main.async {
-                print("Script not found")
+    func shortCutKeyUP(_ keyCode: Int) {
+        if QuickSlotViewModel.shared.buttons.count > keyCode {
+            if let lastThreeCharacters = QuickSlotViewModel.shared.buttons[keyCode].path?.suffix(3) {
+                if lastThreeCharacters == ".sh" {
+                    ScriptsFileManager.downloadFile(from: "https://42box.kr/" + QuickSlotViewModel.shared.buttons[keyCode].path!)
+                }
             }
         }
     }

Box42/QuickSlot/Model/QuickSlotButtonModel.swift

@@ -7,15 +7,21 @@
 
 import Foundation
 
+struct QuickSlotModels: Codable {
+    let quickSlotList : [QuickSlotButtonModel]
+}
+
 // Model
 struct QuickSlotButtonModel: Codable {
-    let id: UUID
+    let scriptUuid: UUID
     var title: String
     var path: String?
+    var type: String?
 
-    init(id: UUID = UUID(), title: String = "Default", path: String? = nil) {
-        self.id = id
+    init(id: UUID = UUID(), title: String = "Default", path: String? = "none", type: String = "sh") {
+        self.scriptUuid = id
         self.title = title
         self.path = path
+        self.type = type
     }
 }

Box42/QuickSlot/Model/QuickSlotUI.swift

@@ -23,7 +23,7 @@ enum QuickSlotUI {
     }
 
     enum title {
-        static let clean = "Clean"
+        static let clean = "CleanCache"
         static let preferences = "Preferences"
         static let scripts = "Scripts"
         static let user = "User"