feature(*) implement icon scan and iew in menu item

ololx · ololx · commit 0a7db0780aa5 · 2021-11-14T16:56:21.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Refactor application.
 
+## [0.0.2-alpha] - 2021-11-14
+
+### Added
+
+- The scanning icons for menu items from the app `Info.plist`.
+
 ## [0.0.1-alpha] - 2021-11-03
 
 ### Added
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 The Quick Symlink is a `Finder extension`  which provides a `contextual menu item` for the symbolic links creation on macOS. 
 
-[![status](https://img.shields.io/badge/status-active-active?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-0.0.1--alpha-informational?style=flat-square)](BADGES_GUIDE.md#version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-active-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance) [![last release](https://img.shields.io/badge/last_release-November_03,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-November_03,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
+[![status](https://img.shields.io/badge/status-active-active?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-0.0.2--alpha-informational?style=flat-square)](BADGES_GUIDE.md#version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-active-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance) [![last release](https://img.shields.io/badge/last_release-November_03,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-November_14,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
 
 [![license](https://img.shields.io/badge/license-MIT-informational?style=flat-square)](LICENSE) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](CODE_OF_CONDUCT.md)
 
diff --git a/empty-new-file/commons/EmptyNewFileDefaults.swift b/empty-new-file/commons/EmptyNewFileDefaults.swift
@@ -36,7 +36,8 @@ public extension EmptyNewFileDefaults {
 
 public enum EmptyNewFileExtension {
     
-    static var extensions: [String] {
+    static var extensions: [String: String] {
+        
         get {
             return extensionsDefaults.get();
             
@@ -47,5 +48,19 @@ public enum EmptyNewFileExtension {
         }
     }
     
-    private static var extensionsDefaults = EmptyNewFileDefaults(key: "extensions", defaultValue: ["js", "css", "html", "md"]);
+    static var incs: [String: String] {
+        
+        get {
+            return icnsDefaults.get();
+            
+        }
+        set {
+            icnsDefaults.set(newValue);
+            
+        }
+    }
+    
+    private static var extensionsDefaults = EmptyNewFileDefaults(key: "extensions", defaultValue: ["js": "js", "css": "css", "html": "html", "md": "md"]);
+    
+    private static var icnsDefaults = EmptyNewFileDefaults(key: "icns", defaultValue: ["":""]);
 }
diff --git a/empty-new-file/commons/ExtensionScanner.swift b/empty-new-file/commons/ExtensionScanner.swift
@@ -25,9 +25,11 @@ public extension Sequence where Element: Hashable {
 
 public struct UTTypeConformsTo: Codable {
     var typeConformsTo: [String]?
+    var iconConformsTo: String?
     
     private enum CodingKeys : String, CodingKey {
         case typeConformsTo = "CFBundleTypeExtensions"
+        case iconConformsTo = "CFBundleTypeIconFile"
     }
 }
 
@@ -49,6 +51,7 @@ public class AppExtentionsScanner: ExtentionsScanner {
     public func scan() -> [String]! {
         let applicationsDirectory = FileManager.default.urls(for: .applicationDirectory, in: .localDomainMask)[0];
         var extentions: [String] = [];
+        var icns: [String: String] = [:];
         
         do {
             let apps = try FileManager.default.contentsOfDirectory(at: applicationsDirectory, includingPropertiesForKeys: nil);
@@ -66,6 +69,14 @@ public class AppExtentionsScanner: ExtentionsScanner {
                             
                             for extensionName in exportedTypeDeclaration.typeConformsTo! {
                                 extentions.append(extensionName.lowercased())
+                                if (exportedTypeDeclaration.iconConformsTo != nil) {
+                                    var iconName = exportedTypeDeclaration.iconConformsTo!;
+                                    if (!iconName.contains(".icns")) {
+                                        iconName.append(".icns");
+                                    }
+                                    print(iconName)
+                                    icns.updateValue(app.appendingPathComponent("Contents").appendingPathComponent("Resources").appendingPathComponent(iconName).absoluteString, forKey: extensionName.lowercased())
+                                }
                             }
                         }
                     }
@@ -78,6 +89,8 @@ public class AppExtentionsScanner: ExtentionsScanner {
             NSLog("ExtensionScanner.scan() failed to scan apps: %@", error.description as NSString);
         }
         
+        EmptyNewFileExtension.incs = icns;
+        
         return extentions;
     }
 }
diff --git a/empty-new-file/empty-new-file-menu/FinderSync.swift b/empty-new-file/empty-new-file-menu/FinderSync.swift
@@ -48,34 +48,38 @@ class FinderSync: FIFinderSync {
     
     override func menu(for menuKind: FIMenuKind) -> NSMenu {
         // Produce a menu for the extension (to be shown when right clicking a folder in Finder)
-        let quickSymlinkMenu = NSMenu(title: "");
+        let emptyBlankFileMenu = NSMenu(title: "");
+        emptyBlankFileMenu.setAccessibilityIndex(0)
         
-        var exts = EmptyNewFileExtension.extensions;
+        let exts = EmptyNewFileExtension.extensions;
+        let icns = EmptyNewFileExtension.incs;
         for ext in exts {
-            print(ext)
+            let item = NSMenuItem.init();
+            item.title = "\(ext.value)";
+            item.action = #selector(createSymlink(_:));
+            item.target = self
             
-            quickSymlinkMenu.addItem(
-                withTitle: "\(ext)",
-                action: #selector(createSymlink(_:)),
-                keyEquivalent: ""
-            );
+            if (icns["\(ext.key)"] != nil) {
+                item.image = NSImage.init(byReferencing: URL.init(string: icns[ext.key]!)!)
+            }
+            
+            emptyBlankFileMenu.addItem(item);
         }
         
         
         
-        let quickSymLinkMainMenu = NSMenu(title: "");
-        let quickSymlinkMenuItem = NSMenuItem(
+        let emptyBlankFileMainMenu = NSMenu(title: "");
+        let emptyBlankFileMenuItem = NSMenuItem(
             title:  "New file",
             action: nil,
             keyEquivalent: ""
         );
-        quickSymLinkMainMenu.setSubmenu(quickSymlinkMenu, for: quickSymlinkMenuItem);
-        quickSymLinkMainMenu.addItem(quickSymlinkMenuItem);
-        return quickSymLinkMainMenu;
+        emptyBlankFileMainMenu.setSubmenu(emptyBlankFileMenu, for: emptyBlankFileMenuItem);
+        emptyBlankFileMainMenu.addItem(emptyBlankFileMenuItem);
+        return emptyBlankFileMainMenu;
     }
     
     @IBAction func createSymlink(_ sender: NSMenuItem!) {
-        print("123")
         guard let target = FIFinderSyncController.default().targetedURL() else {
             
             NSLog("Failed to obtain targeted URL: %@")
@@ -102,5 +106,16 @@ class FinderSync: FIFinderSync {
             NSLog("Failed to create file: %@", error.description as NSString)
         }
     }
+    
+    private func loadImage(filePath: String) -> NSImage? {
+        let fileURL = URL.init(string: filePath);
+        do {
+            let imageData = try Data(contentsOf: fileURL!)
+            return NSImage(data: imageData)
+        } catch {
+            print("Error loading image : \(error)")
+        }
+        return nil
+    }
 }
 
diff --git a/empty-new-file/empty-new-file/ViewController.swift b/empty-new-file/empty-new-file/ViewController.swift
@@ -41,11 +41,11 @@ class ViewController: NSViewController {
     }
 
     @IBAction func saveExtensions(_ sender: Any) {
-        var extensions: [String] = [];
+        var extensions: [String: String] = [:];
         
         for checkbutton in self.extensionsCheckboxes {
             if (checkbutton.state == .on) {
-                extensions.append(checkbutton.title);
+                extensions.updateValue(checkbutton.title, forKey: checkbutton.title);
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,11 @@ public extension Sequence where Element: Hashable {`
`25`	`25`
`26`	`26`	`public struct UTTypeConformsTo: Codable {`
`27`	`27`	`var typeConformsTo: [String]?`
	`28`	`+ var iconConformsTo: String?`
`28`	`29`
`29`	`30`	`private enum CodingKeys : String, CodingKey {`
`30`	`31`	`case typeConformsTo = "CFBundleTypeExtensions"`
	`32`	`+ case iconConformsTo = "CFBundleTypeIconFile"`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
`@@ -49,6 +51,7 @@ public class AppExtentionsScanner: ExtentionsScanner {`
`49`	`51`	`public func scan() -> [String]! {`
`50`	`52`	`let applicationsDirectory = FileManager.default.urls(for: .applicationDirectory, in: .localDomainMask)[0];`
`51`	`53`	`var extentions: [String] = [];`
	`54`	`+ var icns: [String: String] = [:];`
`52`	`55`
`53`	`56`	`do {`
`54`	`57`	`let apps = try FileManager.default.contentsOfDirectory(at: applicationsDirectory, includingPropertiesForKeys: nil);`
`@@ -66,6 +69,14 @@ public class AppExtentionsScanner: ExtentionsScanner {`
`66`	`69`
`67`	`70`	`for extensionName in exportedTypeDeclaration.typeConformsTo! {`
`68`	`71`	`extentions.append(extensionName.lowercased())`
	`72`	`+ if (exportedTypeDeclaration.iconConformsTo != nil) {`
	`73`	`+ var iconName = exportedTypeDeclaration.iconConformsTo!;`
	`74`	`+ if (!iconName.contains(".icns")) {`
	`75`	`+ iconName.append(".icns");`
	`76`	`+ }`
	`77`	`+ print(iconName)`
	`78`	`+ icns.updateValue(app.appendingPathComponent("Contents").appendingPathComponent("Resources").appendingPathComponent(iconName).absoluteString, forKey: extensionName.lowercased())`
	`79`	`+ }`
`69`	`80`	`}`
`70`	`81`	`}`
`71`	`82`	`}`
`@@ -78,6 +89,8 @@ public class AppExtentionsScanner: ExtentionsScanner {`
`78`	`89`	`NSLog("ExtensionScanner.scan() failed to scan apps: %@", error.description as NSString);`
`79`	`90`	`}`
`80`	`91`
	`92`	`+ EmptyNewFileExtension.incs = icns;`
	`93`	`+`
`81`	`94`	`return extentions;`
`82`	`95`	`}`
`83`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ class ViewController: NSViewController {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@IBAction func saveExtensions(_ sender: Any) {`
`44`		`- var extensions: [String] = [];`
	`44`	`+ var extensions: [String: String] = [:];`
`45`	`45`
`46`	`46`	`for checkbutton in self.extensionsCheckboxes {`
`47`	`47`	`if (checkbutton.state == .on) {`
`48`		`- extensions.append(checkbutton.title);`
	`48`	`+ extensions.updateValue(checkbutton.title, forKey: checkbutton.title);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`