BookMacster 1.15.1, BookMacster 1.6.14

Author: jerrykrinock

SSWebBrowsing.m

@@ -159,7 +159,13 @@ + (void)browseToURLString:(NSString*)urlString
 							  launchIdentifiers:NULL] ;
 	}
 	else {
-		NSLog(@"Internal Error 324-6754.  SSOpenURLInBrowser: could not create URL from %@", urlString) ;
+		// Starting in BookMacster 1.15, we NSBeep() here instead of logging
+        // Internal Error 324-6754.  This happens if we are passed an invalid
+        // URL such as a JavaScript bookmarklet, for example…
+        //    javascript:var%20wRWMain1=window.open('','RefWorksBookmark');d=document;i='AddToRWScript';if(d.getElementById(i))RWAddToRW1();else{s=d.createElement('script');s.type='text/javascript';s.src='http://www.refworks.com/refworks/include/addtorw.asp';s.id=i;d.getElementsByTagName('head')[0].appendChild(s);}void(0);
+        if (NSApp) {
+            NSBeep() ;
+        }
 	}
 
 	//	openURLs

SSYDropboxIdler.m

@@ -156,13 +156,15 @@ - (BOOL)waitForIdleDropboxTimeout:(NSTimeInterval)timeout
                     NSInteger i ;
                     [self appendProgress: @"   Samples: "] ;
                     for (i=0; i<COUNT_OF_SECONDARY_TESTS; i++) {
-                        // See if we can get three more in a row with CPU usage 0.25 percent or less
+                        // See if we can get three more in a row with CPU usage
+                        // is SECONDARY_TEST_THRESHOLD_AVERAGE_CPU_PERCENT
+                        // percent or less
                         ok = [SSYOtherApper processPid:dropboxPid
                                                timeout:innerLoopPeriod  // better be much less than this, to get lots of samples
                                           cpuPercent_p:&cpuPercent
                                                error_p:error_p] ;
                         [self appendProgress:[NSString stringWithFormat:@"%0.1f%% ", cpuPercent]] ;
-                        if (cpuPercent > 0.25) {
+                        if (cpuPercent > SECONDARY_TEST_THRESHOLD_AVERAGE_CPU_PERCENT) {
                             [self appendProgress:[NSString stringWithFormat:
                                                   @"Threshold exceeded during %ld/%ld secondary tests.\nBack out to primary test.",
                                                   (long)(i+1),

SSYMultiTextFieldCell.m

@@ -69,7 +69,7 @@ - (NSRect)drawAtLeftImage:(NSImage*)image
 			NSRectFill(imageFrame);
 		}
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 		[image drawInRect:imageFrame
                   fromRect:NSZeroRect
                  operation:NSCompositePlusDarker

SSYOperation.h

@@ -154,4 +154,14 @@
  */
 - (void)unlockLock ;
 
+/*!
+ @brief    Unlocks the receiver's condition lock.
+ 
+ @details  This method may be used in special cases where an error or other
+ unexpected event might cause -prepareLock to be re-run before -unlockLock,
+ when some operation is retried.  If this method returns YES, you should skip
+ -prepareLock.
+ */
+- (BOOL)lockIsBlocking ;
+
 @end

SSYOperation.m

@@ -147,20 +147,18 @@ - (void)doSafely:(SEL)cmdNameC {
 - (void)prepareLock {
 	// Normally, oldLock should be cleared at this point, if prior usage of
     // this lock is done.
-    if ([self lock]) {
+    if ([self lockIsBlocking]) {
         NSString* msg = nil ;
-        if ([[self lock] condition] != SSY_OPERATION_CLEARED) {
-            msg = [NSString stringWithFormat:@"Warning 209-8483 %@ lock=%@ info=%@",
-                  self,
-                  [self lock],
-                  [self info] ];
-            NSLog(@"%@", msg) ;
+        msg = [NSString stringWithFormat:@"Warning 209-8483 %@ lock=%@ info=%@",
+               self,
+               [self lock],
+               [self info] ];
+        NSLog(@"%@", msg) ;
 #if DEBUG
-            NSAssert(NO, msg) ;
+        NSAssert(NO, msg) ;
 #endif
-        }
     }
-    
+
 	// I considered doing this:
 	// [oldLock unlockWithCondition:SSY_OPERATION_CLEARED] ;
 	// But am worried that it might raise an exception trying to unlock a lock on a
@@ -220,6 +218,16 @@ - (void)unlockLock {
     [lock release] ;
 }
 
+- (BOOL)lockIsBlocking {
+    BOOL answer = NO ;
+    if ([self lock]) {
+        if ([[self lock] condition] != SSY_OPERATION_CLEARED) {
+            answer = YES ;
+        }
+    }
+    
+    return answer ;
+}
 
 - (void)main {
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init] ;

SSYOtherApper.h

@@ -130,7 +130,7 @@ __attribute__((visibility("default"))) @interface SSYOtherApper : NSObject {}
 
 /*!
  @brief    Returns the unix process ID (pid) of any process whose last path
- component matches a given process name, and whose  which has the same unit
+ component matches a given process name, and whose user id is the same
  user id as the current process, or 0 if no such process is running.
 
  @details  Starting with BookMacster 1.9, this method is now based on

SSYOtherApper.m

@@ -304,10 +304,10 @@ + (NSString*)fullPathForAppWithBundleIdentifier:(NSString*)bundleIdentifier {
 
 + (NSArray*)pidsExecutablesFull:(BOOL)fullExecutablePath {
 	// Run unix task "ps" and get results as an array, with each element containing process command and user
-	// The invocation to be constructed is: ps -x[c]awww -o pid -o user -o command
+	// The invocation to be constructed is: ps -xa[c]awww -o pid -o user -o command
 	// -ww is required for long command path strings!!
 	NSData* stdoutData ;
-	NSString* options = fullExecutablePath ? @"-xww" : @"-xcww" ;
+	NSString* options = fullExecutablePath ? @"-xaww" : @"-xacww" ;
 	NSArray* args = [[NSArray alloc] initWithObjects:options, @"-o", @"pid=", @"-o", @"user=", @"-o", @"comm=", nil] ;
 	// In args, the "=" say to omit the column headers
 	[SSYShellTasker doShellTaskCommand:@"/bin/ps"