refactoring context

Author: l2fprod

Flitro/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -34,29 +34,27 @@ struct ContextEditorView: View {
                 showAddTerminalDialog: $showAddTerminalDialog
             )
             .onDrop(of: [UTType.fileURL, UTType.url, UTType.text, UTType.plainText], isTargeted: nil) { providers in
-                return handleUniversalDrop(providers: providers)
+                return UniversalDropHandler.handleUniversalDrop(providers: providers, contextManager: contextManager, selectedContextID: selectedContextID)
             }
         }
         .frame(minWidth: 900, minHeight: 600)
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
+}
 
-    private func handleUniversalDrop(providers: [NSItemProvider]) -> Bool {
-        guard let contextIndex = contextManager.contexts.firstIndex(where: { $0.id == selectedContextID }) else { 
+struct UniversalDropHandler {
+    static func handleUniversalDrop(providers: [NSItemProvider], contextManager: ContextManager, selectedContextID: UUID?) -> Bool {
+        guard let contextIndex = contextManager.contexts.firstIndex(where: { $0.id == selectedContextID }) else {
             print("No selected context found for drop")
-            return false 
+            return false
         }
-        
         guard !providers.isEmpty else {
             print("No providers in drop")
             return false
         }
-        
         var handled = false
-        
         for provider in providers {
             print("Processing provider with types: \(provider.registeredTypeIdentifiers)")
-            
             if provider.hasItemConformingToTypeIdentifier(UTType.fileURL.identifier) || provider.hasItemConformingToTypeIdentifier("public.file-url") {
                 let typeIdentifier = provider.hasItemConformingToTypeIdentifier(UTType.fileURL.identifier) ? UTType.fileURL.identifier : "public.file-url"
                 provider.loadItem(forTypeIdentifier: typeIdentifier, options: nil) { item, error in
@@ -65,28 +63,24 @@ struct ContextEditorView: View {
                         return
                     }
                     print("Loaded item: \(String(describing: item))")
-                    
                     var url: URL?
                     if let urlObject = item as? URL {
                         url = urlObject
                     } else if let data = item as? Data {
                         url = URL(dataRepresentation: data, relativeTo: nil)
                         print("Converted data to URL: \(String(describing: url))")
                     }
-                    
                     if let url = url {
                         print("Processing URL: \(url)")
                         DispatchQueue.main.async {
                             if url.pathExtension == "app" {
-                                // Add as application
                                 if let bundle = Bundle(url: url), let bundleId = bundle.bundleIdentifier {
                                     let appItem = AppItem(name: url.deletingPathExtension().lastPathComponent, bundleIdentifier: bundleId, windowTitle: nil)
                                     contextManager.contexts[contextIndex].items.append(.application(appItem))
                                     contextManager.saveContexts()
                                     print("Added application: \(appItem.name)")
                                 }
                             } else if url.pathExtension == "sh" {
-                                // Add as terminal session (shell script)
                                 let session = TerminalSession(
                                     workingDirectory: url.deletingLastPathComponent().path,
                                     command: url.path,
@@ -95,8 +89,23 @@ struct ContextEditorView: View {
                                 contextManager.contexts[contextIndex].items.append(.terminalSession(session))
                                 contextManager.saveContexts()
                                 print("Added terminal session for script: \(session.title)")
+                                var bookmark: Data? = nil
+                                do {
+                                    bookmark = try url.bookmarkData(options: .withSecurityScope, includingResourceValuesForKeys: nil, relativeTo: nil)
+                                } catch {
+                                    bookmark = nil
+                                }
+                                let document = DocumentItem(
+                                    name: url.deletingPathExtension().lastPathComponent,
+                                    filePath: url.path,
+                                    application: "",
+                                    bookmark: bookmark
+                                )
+                                contextManager.contexts[contextIndex].items.append(.document(document))
+                                contextManager.saveContexts()
+                                print("Added document: \(document.name)")
                             } else {
-                                // Add as document
+                                // Fallback: add as document for any other file type
                                 var bookmark: Data? = nil
                                 do {
                                     bookmark = try url.bookmarkData(options: .withSecurityScope, includingResourceValuesForKeys: nil, relativeTo: nil)
@@ -144,7 +153,6 @@ struct ContextEditorView: View {
                     }
                 }
                 handled = true
-            } else if provider.hasItemConformingToTypeIdentifier(UTType.url.identifier) {
                 provider.loadItem(forTypeIdentifier: UTType.url.identifier, options: nil) { item, _ in
                     if let data = item as? Data, let url = URL(dataRepresentation: data, relativeTo: nil) {
                         let browserTab = BrowserTab(title: url.absoluteString, url: url.absoluteString, browser: "default")
@@ -161,11 +169,9 @@ struct ContextEditorView: View {
                     }
                 }
                 handled = true
-            } else if provider.hasItemConformingToTypeIdentifier(UTType.text.identifier) || provider.hasItemConformingToTypeIdentifier(UTType.plainText.identifier) {
                 let typeIdentifier = provider.hasItemConformingToTypeIdentifier(UTType.text.identifier) ? UTType.text.identifier : UTType.plainText.identifier
                 provider.loadItem(forTypeIdentifier: typeIdentifier, options: nil) { item, _ in
                     if let text = item as? String, !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-                        // Try to parse as URL first
                         if let url = URL(string: text.trimmingCharacters(in: .whitespacesAndNewlines)) {
                             let browserTab = BrowserTab(title: url.absoluteString, url: url.absoluteString, browser: "default")
                             DispatchQueue.main.async {
@@ -179,7 +185,6 @@ struct ContextEditorView: View {
                 handled = true
             }
         }
-        
         print("Drop handling complete. Handled: \(handled)")
         return handled
     }

Flitro/Assets.xcassets/MenuBarIcon.imageset/icon_22x22.png

@@ -8,4 +8,11 @@ sips -z 128 128 ../../../xdocs/icon/Flitro@1024.png --out icon_128x128.png
 sips -z 256 256 ../../../xdocs/icon/Flitro@1024.png --out icon_256x256.png
 sips -z 512 512 ../../../xdocs/icon/Flitro@1024.png --out icon_512x512.png
 cp ../../../xdocs/icon/Flitro@1024.png icon_1024x1024.png
-)
+)
+
+(
+cd ../../Flitro/Assets.xcassets/MenuBarIcon.imageset
+sips -z 22 22 -s format png  ../../../xdocs/icon/Flitro@22.svg --out icon_22x22.png
+sips -z 44 44 -s format png  ../../../xdocs/icon/Flitro.svg --out icon_44x44.png
+sips -z 66 66 -s format png  ../../../xdocs/icon/Flitro.svg --out icon_66x66.png
+)