cocoadock 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e20bb778be0635e07ee877840cee13af33fce3d809dcb561b73fad2d6b753b
-  data.tar.gz: '039819d9514d0a4c74b466363ba864cdb25489f28317e4f9c862d6076083304c'
+  metadata.gz: dd9b3b0da8d7451cf3d5bb0c8b3f7094aa8d3e799e98b496bca70bd33c288d85
+  data.tar.gz: 0f485accdde26fe341e0f1a4fbc789e6148b54720deb57f07a5475cc1e6aed6a
 SHA512:
-  metadata.gz: e058a48e31c7a80115fc71aedf39213e2644d5fad98604e5106ae59ff0e36ba237db1d6392077df87ae380e4c1934241296685fede7f0a9faa93087157ba4f0a
-  data.tar.gz: b0b07f1c8f8812e0f0f7052be2dac354e8e538e74b6f3805959e4a4c16061097778d722563ef69f6bcdc9c775f9be58cd7d9a9ad379216be3ce70aa9e432e7a0
+  metadata.gz: 2338f7ca8fa704d59d04d70fd85b49dbeafed777fea482eb2e529238fe9a013262584779fd631b28b36ae744dd2b87556a633aed16bedf8173d633487274ca77
+  data.tar.gz: de6373a9858118b3812f7287061775a298c54166f6322416c7c484b2dc3f3926deb4e346343c00c571a7d421bd06bda283744eec77d8bf4ac91f3e6dc34f4e40

data/ext/cocoadock/cocoadock.m

@@ -5,71 +5,235 @@ VALUE rb_mCocoadock;
 VALUE rb_mCocoadockClass;
 
 VALUE cocoadock_initialize(VALUE self);
+VALUE cocoadock_is_app_to_dock(VALUE self, VALUE path);
 VALUE cocoadock_add_app_to_dock(VALUE self, VALUE path);
 VALUE cocoadock_remove_app_from_dock(VALUE self, VALUE path);
 
-void addAppToDock(const char *app_path) {
-    NSString *appPath = [[NSString alloc] initWithCString:app_path encoding:NSUTF8StringEncoding];
+BOOL IsAppInDock(NSString *bundleID) {
+    if (!bundleID) return NO;
+
+    // Load Dock plist directly
+    NSString *plistPath = [@"~/Library/Preferences/com.apple.dock.plist" stringByExpandingTildeInPath];
+    NSDictionary *dockPlist = [NSDictionary dictionaryWithContentsOfFile:plistPath];
+    NSArray *persistentApps = dockPlist[@"persistent-apps"];
+    if (!persistentApps) return NO;
+
+    for (NSDictionary *item in persistentApps) {
+        NSDictionary *tileData = item[@"tile-data"];
+        if (!tileData) continue;
+
+        // 1️⃣ Check bundle identifier
+        NSString *appBundleID = tileData[@"bundle-identifier"];
+        if ([appBundleID isEqualToString:bundleID]) {
+            return YES;
+        }
+
+        // 2️⃣ Fallback: check file path
+        NSDictionary *fileData = tileData[@"file-data"];
+        NSString *path = fileData[@"_CFURLString"];
+        if (!path) continue;
+
+        // Handle possible URL or relative path
+        if (![path hasPrefix:@"/"]) {
+            NSURL *url = [NSURL URLWithString:path];
+            path = url.path;
+        }
+
+        if (!path) continue;
 
-    // Convert to file URL with percent escapes
-    NSURL *appURL = [NSURL fileURLWithPath:appPath];
-    NSString *urlString = appURL.absoluteString;
-
-    // Now form the Dock entry
-    NSString *dockEntry = [NSString stringWithFormat:
-        @"'<dict>"
-         "<key>tile-data</key><dict>"
-           "<key>file-data</key><dict>"
-             "<key>_CFURLString</key><string>%@</string>"
-             "<key>_CFURLStringType</key><integer>15</integer>"
-           "</dict>"
-         "</dict>"
-       "</dict>'", urlString];
-
-    NSString *command = [NSString stringWithFormat:
-        @"defaults write com.apple.dock persistent-apps -array-add %@ && killall Dock", dockEntry];
-
-    // Execute the command
-    NSTask *task = [[NSTask alloc] init];
-    task.launchPath = @"/bin/sh";
-    task.arguments = @[@"-c", command];
-    [task launch];
+        // Resolve symlinks
+        path = [[NSURL fileURLWithPath:path] URLByResolvingSymlinksInPath].path;
+
+        NSBundle *bundle = [NSBundle bundleWithPath:path];
+        if (bundle && [bundle.bundleIdentifier isEqualToString:bundleID]) {
+            return YES;
+        }
+    }
+
+    return NO;
 }
 
-void removeAppFromDock(const char* app_path) {
-    NSString *appPath = [[NSString alloc] initWithCString:app_path encoding:NSUTF8StringEncoding];
-    NSURL *appURL = [NSURL fileURLWithPath:appPath];
-    NSString *urlString = appURL.absoluteString;
-
-    // Step 1: Export current Dock preferences
-    NSString *exportPlistCmd = @"defaults export com.apple.dock - > /tmp/com.apple.dock.plist";
-    system([exportPlistCmd UTF8String]);
-
-    // Step 2: Load the plist
-    NSMutableDictionary *dockPlist = [NSMutableDictionary dictionaryWithContentsOfFile:@"/tmp/com.apple.dock.plist"];
-    NSMutableArray *persistentApps = [dockPlist[@"persistent-apps"] mutableCopy];
-    if (!persistentApps) return;
-
-    // Step 3: Filter out the app by matching its _CFURLString
-    NSMutableArray *filtered = [NSMutableArray array];
-    for (NSDictionary *entry in persistentApps) {
-        NSDictionary *tileData = entry[@"tile-data"];
+
+NSURL *AppURLForBundleID(NSString *bundleID) {
+    if (!bundleID) return nil;
+
+    CFArrayRef urls = LSCopyApplicationURLsForBundleIdentifier(
+        (__bridge CFStringRef)bundleID,
+        NULL
+    );
+
+    if (!urls || CFArrayGetCount(urls) == 0) {
+        if (urls) CFRelease(urls);
+        return nil;
+    }
+
+    CFURLRef firstURL = CFArrayGetValueAtIndex(urls, 0);
+    NSURL *appURL = (__bridge NSURL *)firstURL;
+
+    CFRelease(urls); // release the array, not the item
+    return appURL;
+}
+
+NSDictionary *DockTileForAppURL(NSURL *appURL) {
+    if (!appURL) return nil;
+
+    NSDictionary *fileData = @{
+        @"_CFURLString": appURL.absoluteString,
+        @"_CFURLStringType": @15
+    };
+
+    NSDictionary *tileData = @{
+        @"file-data": fileData
+    };
+
+    return @{
+        @"tile-type": @"file-tile",
+        @"tile-data": tileData
+    };
+}
+
+void AddDockAppByBundleID(NSString *bundleID) {
+    CFArrayRef persistentApps = CFPreferencesCopyAppValue(
+        CFSTR("persistent-apps"),
+        CFSTR("com.apple.dock")
+    );
+
+    if (!persistentApps) {
+        NSLog(@"Failed to read Dock preferences");
+        return;
+    }
+
+    NSMutableArray *apps =
+        [(__bridge NSArray *)persistentApps mutableCopy];
+
+    if (!apps || !bundleID) return;
+
+    NSURL *appURL = AppURLForBundleID(bundleID);
+    if (!appURL) {
+        NSLog(@"Could not resolve app for bundle ID %@", bundleID);
+        return;
+    }
+
+    NSString *targetPath = appURL.path;
+
+    // Prevent duplicates
+    for (NSDictionary *item in apps) {
+        NSDictionary *fileData = item[@"tile-data"][@"file-data"];
+        NSString *urlString = fileData[@"_CFURLString"];
+        if (!urlString) continue;
+
+        NSString *path = [[NSURL URLWithString:urlString] path];
+        if ([path isEqualToString:targetPath]) {
+            return;
+        }
+    }
+
+    NSDictionary *dockItem = DockTileForAppURL(appURL);
+    if (dockItem) {
+        [apps addObject:dockItem];
+    }
+
+    CFPreferencesSetAppValue(
+        CFSTR("persistent-apps"),
+        (__bridge CFArrayRef)apps,
+        CFSTR("com.apple.dock")
+    );
+
+    CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+
+    CFRelease(persistentApps);
+}
+
+void RemoveDockAppByBundleID(NSString *bundleID) {
+    CFArrayRef persistentApps = CFPreferencesCopyAppValue(
+        CFSTR("persistent-apps"),
+        CFSTR("com.apple.dock")
+    );
+
+    NSMutableArray *apps =
+        [(__bridge NSArray *)persistentApps mutableCopy];
+
+    if (!apps || !bundleID) {
+        return;
+    }
+
+    for (NSInteger i = apps.count - 1; i >= 0; i--) {
+        NSDictionary *item = apps[i];
+        NSDictionary *tileData = item[@"tile-data"];
+
+        NSString *dockBundleID = tileData[@"bundle-identifier"];
+        if ([dockBundleID isEqualToString:bundleID]) {
+            [apps removeObjectAtIndex:i];
+            continue;
+        }
+
         NSDictionary *fileData = tileData[@"file-data"];
-        NSString *entryURL = fileData[@"_CFURLString"];
-        if (![entryURL isEqualToString:urlString]) {
-            [filtered addObject:entry];
+        NSString *urlString = fileData[@"_CFURLString"];
+        if (urlString) {
+            NSString *path = [[NSURL URLWithString:urlString] path];
+            if ([path containsString:bundleID]) {
+                [apps removeObjectAtIndex:i];
+            }
+        }
+    }
+
+    CFPreferencesSetAppValue(
+        CFSTR("persistent-apps"),
+        (__bridge CFArrayRef)apps,
+        CFSTR("com.apple.dock")
+    );
+
+    CFPreferencesAppSynchronize(CFSTR("com.apple.dock"));
+
+    if (persistentApps) {
+        CFRelease(persistentApps);
+    }
+}
+
+BOOL isAppInDock(const char *app_path) {
+    NSString *appPath = [[NSString alloc] initWithCString:app_path encoding:NSUTF8StringEncoding];
+    NSBundle *bundle = [NSBundle bundleWithPath:appPath];
+
+    if (!bundle) {
+        NSLog(@"Not a valid app bundle");
+        return NO;
+    }
+ 
+    NSString *bundleID = bundle.bundleIdentifier;
+
+    return IsAppInDock(bundleID);
+}
+
+void addAppToDock(const char *app_path) {
+    @autoreleasepool {
+        NSString *appPath = [[NSString alloc] initWithCString:app_path encoding:NSUTF8StringEncoding];
+
+        NSBundle *bundle = [NSBundle bundleWithPath:appPath];
+
+        if (!bundle) {
+            NSLog(@"Not a valid app bundle");
+            return;
         }
+     
+        NSString *bundleID = bundle.bundleIdentifier;
+        AddDockAppByBundleID(bundleID);
     }
+}
 
-    // Step 4: Save updated plist and re-import
-    dockPlist[@"persistent-apps"] = filtered;
-    [dockPlist writeToFile:@"/tmp/com.apple.dock.plist" atomically:YES];
+void removeAppFromDock(const char* app_path) {
+    @autoreleasepool {
+        NSString *appPath = [[NSString alloc] initWithCString:app_path encoding:NSUTF8StringEncoding];
 
-    NSString *importCmd = @"defaults import com.apple.dock /tmp/com.apple.dock.plist";
-    system([importCmd UTF8String]);
+        NSBundle *bundle = [NSBundle bundleWithPath:appPath];
 
-    // Step 5: Restart Dock
-    system("killall Dock");
+        if (!bundle) {
+            NSLog(@"Not a valid app bundle");
+            return;
+        }
+     
+        NSString *bundleID = bundle.bundleIdentifier;
+        RemoveDockAppByBundleID(bundleID);
+    }
 }
 
 RUBY_FUNC_EXPORTED void
@@ -79,6 +243,7 @@ Init_cocoadock(void)
   rb_mCocoadockClass = rb_define_class_under(rb_mCocoadock, "CocoaDock", rb_cObject);
   rb_define_method(rb_mCocoadockClass, "initialize", cocoadock_initialize, 0);
   rb_define_method(rb_mCocoadockClass, "add_app", cocoadock_add_app_to_dock, 1);
+  rb_define_method(rb_mCocoadockClass, "app_in_dock?", cocoadock_is_app_to_dock, 1);
   rb_define_method(rb_mCocoadockClass, "remove_app", cocoadock_remove_app_from_dock, 1);
 }
 
@@ -87,9 +252,17 @@ VALUE cocoadock_initialize(VALUE self) {
   return self;
 }
 
+VALUE cocoadock_is_app_to_dock(VALUE self, VALUE path) {
+    const char *c_app_path = StringValueCStr(path);
+    BOOL result = isAppInDock(c_app_path);
+    if (result == YES) {
+        return Qtrue;
+    }
+    return Qfalse;
+}
+
 VALUE cocoadock_add_app_to_dock(VALUE self, VALUE path) {
     const char *c_app_path = StringValueCStr(path);
-    //NSString *appPath = [[NSString alloc] initWithCString:c_app_path encoding:NSUTF8StringEncoding];
     addAppToDock(c_app_path);
 }
 

data/lib/cocoadock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cocoadock
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoadock
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tommy Jeff
 bindir: exe
 cert_chain: []
-date: 2025-07-02 00:00:00.000000000 Z
+date: 2026-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Cocoa dock functions for Ruby on macOS
 email: