Menu
▾
▴
[Radmind-commit] radmind-assistant/rsm RSMLoadsetManager.m, 1.49, 1.50
|
From: Andrew M. <fit...@us...> - 2008-06-24 20:17:24
|
Update of /cvsroot/radmind/radmind-assistant/rsm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13353 Modified Files: RSMLoadsetManager.m Log Message: Improved task cancellation. Improved task logging. Improved discovery of radmind tools. Improved error reporting. Index: RSMLoadsetManager.m =================================================================== RCS file: /cvsroot/radmind/radmind-assistant/rsm/RSMLoadsetManager.m,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** RSMLoadsetManager.m 30 Mar 2008 14:07:30 -0000 1.49 --- RSMLoadsetManager.m 24 Jun 2008 20:17:21 -0000 1.50 *************** *** 5,9 **** #import "RAOutlineView.h" #import "RAEditorLauncher.h" - #import "RAAuthKiller.h" #import "RAServerController.h" #import "RSMLoadsetEditor.h" --- 5,8 ---- *************** *** 493,497 **** NSEnumerator *en; BOOL caseInsensitive = NO; - char toolpath[ MAXPATHLEN ]; id activeTable = [ transcriptWindow firstResponder ]; id item, rowNumber; --- 492,495 ---- *************** *** 519,529 **** message = [ NSString stringWithFormat: @"Verifying %@...", [ transcript lastPathComponent ]]; ! if ( pathfortool( "lcksum", toolpath ) != 0 ) { ! NSLog( @"access lcksum: %s", strerror( errno )); ! return; ! } ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", ! @"-d", [[ self delegate ] sessionTmpDirectory ], @"--", ! [ NSString stringWithUTF8String: toolpath ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; --- 517,524 ---- message = [ NSString stringWithFormat: @"Verifying %@...", [ transcript lastPathComponent ]]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", @"-d", ! [[ self delegate ] sessionTmpDirectory ], @"--", ! [[ NSWorkspace sharedWorkspace ] ! pathForRadmindTool: @"lcksum" ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; *************** *** 532,551 **** [ NSArray arrayWithObjects: @"-n", @"-i", @"-%", @"-csha1", transcript, nil ]]; ! ! [ toolProgressDetailsTextView logMessage: @"# %s -n -i -%% -c sha1 %@\n", ! toolpath, transcript ]; break; case RA_TRANSCRIPT_UPDATE: - if ( pathfortool( "lcksum", toolpath ) != 0 ) { - NSLog( @"access lcksum: %s", strerror( errno )); - return; - } message = [ NSString stringWithFormat: @"Updating %@...", [ transcript lastPathComponent ]]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", ! @"-d", [[ self delegate ] sessionTmpDirectory ], @"--", ! [ NSString stringWithUTF8String: toolpath ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; --- 527,542 ---- [ NSArray arrayWithObjects: @"-n", @"-i", @"-%", @"-csha1", transcript, nil ]]; ! [ toolProgressDetailsTextView logRadmindTask: args ]; ! [ _rsmLogger logArguments: args ]; break; case RA_TRANSCRIPT_UPDATE: message = [ NSString stringWithFormat: @"Updating %@...", [ transcript lastPathComponent ]]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", @"-d", ! [[ self delegate ] sessionTmpDirectory ], @"--", ! [[ NSWorkspace sharedWorkspace ] ! pathForRadmindTool: @"lcksum" ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; *************** *** 555,575 **** @"-i", @"-%", @"-csha1", transcript, nil ]]; ! [ toolProgressDetailsTextView logMessage: @"# %s -i -%% -c sha1 %@\n", ! toolpath, transcript ]; break; case RA_TRANSCRIPT_LOCAL_BACKUP: - if ( pathfortool( "lmerge", toolpath ) != 0 ) { - NSBeep(); - NSLog( @"access lmerge: %s", strerror( errno )); - return; - } - message = [ NSString stringWithFormat: @"Making local backup of %@...", [ transcript lastPathComponent ]]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", ! @"-d", [[ self delegate ] sessionTmpDirectory ], @"--", ! [ NSString stringWithUTF8String: toolpath ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; --- 546,561 ---- @"-i", @"-%", @"-csha1", transcript, nil ]]; ! [ toolProgressDetailsTextView logRadmindTask: args ]; ! [ _rsmLogger logArguments: args ]; break; case RA_TRANSCRIPT_LOCAL_BACKUP: message = [ NSString stringWithFormat: @"Making local backup of %@...", [ transcript lastPathComponent ]]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", @"-d", ! [[ self delegate ] sessionTmpDirectory ], @"--", ! [[ NSWorkspace sharedWorkspace ] ! pathForRadmindTool: @"lmerge" ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; *************** *** 582,588 **** timeZone: nil locale: nil ]], nil ]]; ! [ toolProgressDetailsTextView logMessage: ! @"# %s -u 077 %@ %@ %@.backup\n", ! toolpath, transcript, transcript, transcript ]; break; --- 568,573 ---- timeZone: nil locale: nil ]], nil ]]; ! [ toolProgressDetailsTextView logRadmindTask: args ]; ! [ _rsmLogger logArguments: args ]; break; *************** *** 1083,1088 **** NSArray *args = nil; NSDictionary *mergeInfo = nil; - char lmerge[ MAXPATHLEN ] = { 0 }; - NSString *lmergePath = nil; BOOL caseInsensitive = NO; --- 1068,1071 ---- *************** *** 1127,1136 **** return; } - - if ( pathfortool( "lmerge", lmerge ) != 0 ) { - NSLog( @"access lmerge: %s", strerror( errno )); - return; - } - lmergePath = [ NSString stringWithUTF8String: lmerge ]; [ progBar setUsesThreadedAnimation: YES ]; --- 1110,1113 ---- *************** *** 1142,1148 **** contextInfo: nil ]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", ! @"-d", [[ self delegate ] sessionTmpDirectory ], @"--", ! lmergePath, nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; --- 1119,1126 ---- contextInfo: nil ]; ! args = [ NSArray arrayWithObjects: @"-A", @"ExecuteCommand", @"-d", ! [[ self delegate ] sessionTmpDirectory ], @"--", ! [[ NSWorkspace sharedWorkspace ] ! pathForRadmindTool: @"lmerge" ], nil ]; if ( caseInsensitive ) { args = [ args arrayByAddingObject: @"-I" ]; *************** *** 1172,1175 **** --- 1150,1155 ---- controller: self ]; } + + [ _rsmLogger logArguments: args ]; } *************** *** 1330,1333 **** --- 1310,1314 ---- { BOOL refreshLoadsetListing = NO; + pid_t pid = [ self currentCommandPID ]; if ( ID != [ self loadsetManagerHelperThreadID ] ) { *************** *** 1354,1358 **** NULL, NULL, NULL, NSLocalizedString( @"Task with process id number %d cancelled.", @"Task with process id number %d cancelled." ), ! [ self currentCommandPID ] ); currentProcessKilled = NO; return; --- 1335,1339 ---- NULL, NULL, NULL, NSLocalizedString( @"Task with process id number %d cancelled.", @"Task with process id number %d cancelled." ), ! pid ); currentProcessKilled = NO; return; *************** *** 1437,1441 **** } ! NSLog( @"%@ deleted", [ self transcript ] ); refreshLoadsetListing = YES; --- 1418,1422 ---- } ! [ _rsmLogger logMessage: @"%@ deleted", [ self transcript ]]; refreshLoadsetListing = YES; *************** *** 1447,1451 **** } ! NSLog( @"checked in %@", [[ self transcript ] lastPathComponent ] ); refreshLoadsetListing = YES; break; --- 1428,1433 ---- } ! [ _rsmLogger logMessage: @"Checked in %@", ! [[ self transcript ] lastPathComponent ]]; refreshLoadsetListing = YES; break; *************** *** 1466,1470 **** } ! NSLog( @"%@ backed up.", [[ self transcript ] lastPathComponent ] ); refreshLoadsetListing = YES; break; --- 1448,1453 ---- } ! [ _rsmLogger logMessage: ! @"%@ hardlink snapshot created", [ self transcript ]]; refreshLoadsetListing = YES; break; *************** *** 1479,1486 **** TASK_ERROR: ! NSLog( @"Error: exit status %d", status ); } ! - ( void )toolError: ( char * )error fromThreadWithID: ( int )ID { if ( ID != [ self loadsetManagerHelperThreadID ] ) { --- 1462,1469 ---- TASK_ERROR: ! [ _rsmLogger logMessage: @"Error: exit status %d", status ]; } ! - ( oneway void )toolError: ( NSString * )error fromThreadWithID: ( int )ID { if ( ID != [ self loadsetManagerHelperThreadID ] ) { *************** *** 1492,1496 **** NSRunAlertPanel( NSLocalizedString( @"Error", @"Error" ), ! @"%s", NSLocalizedString( @"OK", @"OK" ), @"", @"", error ); } --- 1475,1479 ---- NSRunAlertPanel( NSLocalizedString( @"Error", @"Error" ), ! @"%@", NSLocalizedString( @"OK", @"OK" ), @"", @"", error ); } *************** *** 1587,1591 **** int rc; pid_t pid; ! RAAuthKiller *akill = nil; rc = NSRunAlertPanel( @"Are you sure you want to cancel?", --- 1570,1575 ---- int rc; pid_t pid; ! NSString *error = nil; ! RAServerAuth *akill = nil; rc = NSRunAlertPanel( @"Are you sure you want to cancel?", *************** *** 1609,1615 **** currentProcessKilled = YES; ! akill = [[ RAAuthKiller alloc ] init ]; ! [ akill killTool: pid forController: self ]; [ akill release ]; } --- 1593,1602 ---- currentProcessKilled = YES; ! akill = [[ RAServerAuth alloc ] init ]; ! rc = [ akill cancelTask: pid error: &error ]; [ akill release ]; + if ( error != nil ) { + NSRunAlertPanel( @"Could not cancel", error, @"OK", @"", @"" ); + } } |
