fix user plugins [Fixes #319]

nate-parrott · Feb 11, 2015 · b477213 · b477213
1 parent 34d5e24
commit b477213
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 18 deletions.
diff --git a/FlashlightApp/EasySIMBL/AppDelegate.m b/FlashlightApp/EasySIMBL/AppDelegate.m
@@ -262,7 +262,7 @@ - (IBAction)requestAPlugin:(id)sender {
 }
 #pragma mark Links
 - (IBAction)showPythonAPI:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/nate-parrott/Flashlight/blob/master/Docs/Tutorial.markdown"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/nate-parrott/Flashlight/wiki/Creating-a-Plugin"]];
 
 }
 

diff --git a/FlashlightApp/EasySIMBL/Base.lproj/MainMenu.xib b/FlashlightApp/EasySIMBL/Base.lproj/MainMenu.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6250" systemVersion="14D72i" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="101000" identifier="macosx"/>
         <development version="5000" identifier="xcode"/>
@@ -741,8 +741,20 @@
                                                     <action selector="openSettings:" target="FQb-yf-BXy" id="Mpy-la-wLc"/>
                                                 </connections>
                                             </button>
+                                            <button verticalHuggingPriority="750" id="LNg-W2-VyP">
+                                                <rect key="frame" x="347" y="8" width="97" height="17"/>
+                                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                <buttonCell key="cell" type="inline" title="Edit" bezelStyle="inline" imagePosition="overlaps" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="pqr-Lb-xGV">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="smallSystemBold"/>
+                                                </buttonCell>
+                                                <connections>
+                                                    <action selector="edit:" target="FQb-yf-BXy" id="nmg-Bk-cJc"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <connections>
+                                            <outlet property="editButton" destination="LNg-W2-VyP" id="dIe-LV-X3I"/>
                                             <outlet property="loader" destination="Agl-8K-jT3" id="Ewm-F1-sNa"/>
                                             <outlet property="removeButton" destination="XCq-UX-7Ic" id="6Ja-6I-Mga"/>
                                             <outlet property="settingsButton" destination="4lu-N2-9Kf" id="mxP-Y2-S4V"/>

diff --git a/FlashlightApp/EasySIMBL/PluginCellView.m b/FlashlightApp/EasySIMBL/PluginCellView.m
@@ -14,7 +14,7 @@
 
 @interface PluginCellView ()
 
-@property (nonatomic) IBOutlet NSButton *settingsButton;
+@property (nonatomic) IBOutlet NSButton *settingsButton, *editButton;
 
 @end
 
@@ -33,6 +33,11 @@ - (void)setObjectValue:(id)objectValue {
         [self.loader stopAnimation:nil];
     }
     self.settingsButton.hidden = [self.plugin installing] || ![self.plugin hasOptions];
+    self.editButton.hidden = !self.plugin.isAutomatorWorkflow;
+}
+
+- (IBAction)edit:(id)sender {
+    [self.listController editAutomatorPluginNamed:self.plugin.name];
 }
 
 - (IBAction)remove:(id)sender {

diff --git a/FlashlightApp/EasySIMBL/PluginEditorWindowController.h b/FlashlightApp/EasySIMBL/PluginEditorWindowController.h
@@ -8,8 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-NSString * const PluginDidChangeOnDiskNotification;
-
 @interface PluginEditorWindowController : NSWindowController
 
 @property (nonatomic) NSString *pluginPath;

diff --git a/FlashlightApp/EasySIMBL/PluginEditorWindowController.m b/FlashlightApp/EasySIMBL/PluginEditorWindowController.m
@@ -7,8 +7,7 @@
 //
 
 #import "PluginEditorWindowController.h"
-
-NSString * const PluginDidChangeOnDiskNotification = @"PluginDidChangeOnDiskNotification";
+#import <utime.h>
 
 @interface PluginEditorWindowController () <NSTextViewDelegate, NSTextFieldDelegate>
 
@@ -38,11 +37,10 @@ - (void)save {
     json[@"examples"] = [self.examples.string componentsSeparatedByString:@"\n"];
     [[NSJSONSerialization dataWithJSONObject:json options:0 error:nil] writeToFile:[self.pluginPath stringByAppendingPathComponent:@"info.json"] atomically:YES];
     [self.examples.string writeToFile:[self.pluginPath stringByAppendingPathComponent:@"examples.txt"] atomically:YES encoding:NSUTF8StringEncoding error:nil];
+    utime(self.pluginPath.stringByDeletingLastPathComponent.UTF8String, NULL);
 
     self.saveTimer = nil;
     self.pendingSave = NO;
-
-    [[NSNotificationCenter defaultCenter] postNotificationName:PluginDidChangeOnDiskNotification object:self];
 }
 #pragma mark Actions
 - (IBAction)edited:(id)sender {
@@ -61,7 +59,6 @@ - (IBAction)deletePlugin:(id)sender {
     self.pendingSave = NO;
     [self.saveTimer invalidate];
     self.saveTimer = nil;
-    [[NSNotificationCenter defaultCenter] postNotificationName:PluginDidChangeOnDiskNotification object:self];
     [self close];
 }
 #pragma mark NSTextViewDelegate

diff --git a/FlashlightApp/EasySIMBL/PluginListController.h b/FlashlightApp/EasySIMBL/PluginListController.h
@@ -43,4 +43,6 @@
 
 @property (nonatomic) BOOL enabled;
 
+- (void)editAutomatorPluginNamed:(NSString *)name;
+
 @end
diff --git a/FlashlightApp/EasySIMBL/PluginListController.m b/FlashlightApp/EasySIMBL/PluginListController.m
@@ -260,7 +260,7 @@ - (void)startWatchingPluginsDir {
     self.fileDesc = open([[self localPluginsPath] fileSystemRepresentation], O_EVTONLY);
 
     // watch the file descriptor for writes
-    self.dispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, self.fileDesc, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_EXTEND | DISPATCH_VNODE_RENAME | DISPATCH_VNODE_REVOKE, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
+    self.dispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, self.fileDesc, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_EXTEND | DISPATCH_VNODE_RENAME | DISPATCH_VNODE_REVOKE | DISPATCH_VNODE_ATTRIB, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0));
 
     // call the passed block if the source is modified
     __weak PluginListController *weakSelf = self;
@@ -283,13 +283,10 @@ - (void)startWatchingPluginsDir {
 
     // at this point the dispatch source is paused, so start watching
     dispatch_resume(self.dispatchSource);
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reloadFromDisk) name:PluginDidChangeOnDiskNotification object:nil];
 }
 
 - (void)stopWatchingPluginsDir {
     dispatch_cancel(self.dispatchSource);
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:PluginDidChangeOnDiskNotification object:nil];
 }
 
 - (void)reloadFromDisk {

diff --git a/FlashlightApp/EasySIMBL/SearchPluginEditorWindowController.m b/FlashlightApp/EasySIMBL/SearchPluginEditorWindowController.m
@@ -64,8 +64,6 @@ - (void)save {
 
     self.saveTimer = nil;
     self.pendingSave = NO;
-
-    [[NSNotificationCenter defaultCenter] postNotificationName:PluginDidChangeOnDiskNotification object:self];
 }
 #pragma mark Window
 - (void)windowDidLoad {
@@ -101,7 +99,6 @@ - (IBAction)deletePlugin:(id)sender {
     self.pendingSave = NO;
     [self.saveTimer invalidate];
     self.saveTimer = nil;
-    [[NSNotificationCenter defaultCenter] postNotificationName:PluginDidChangeOnDiskNotification object:self];
     [self close];
 }
 

diff --git a/FlashlightApp/FlashlightKit/FlashlightKit/PSPluginExampleSource.m b/FlashlightApp/FlashlightKit/FlashlightKit/PSPluginExampleSource.m
@@ -45,7 +45,7 @@ - (void)startWatchingForFileChanges {
 
     self.fileEventQueue = dispatch_queue_create("-[PSPluginExampleSource fileEventQueue]", dispatch_queue_attr_make_with_qos_class(0, QOS_CLASS_BACKGROUND, 0));
     // watch the file descriptor for writes
-    self.dispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fileDesc, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_EXTEND | DISPATCH_VNODE_RENAME | DISPATCH_VNODE_REVOKE, self.fileEventQueue);
+    self.dispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fileDesc, DISPATCH_VNODE_DELETE | DISPATCH_VNODE_WRITE | DISPATCH_VNODE_EXTEND | DISPATCH_VNODE_RENAME | DISPATCH_VNODE_REVOKE | DISPATCH_VNODE_ATTRIB, self.fileEventQueue);
 
     __weak PSPluginExampleSource *weak_self = self;
     // call the passed block if the source is modified
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,4 +43,6 @@

		@property (nonatomic) BOOL enabled;

		- (void)editAutomatorPluginNamed:(NSString *)name;

		@end