Revision: 6926
http://skim-app.svn.sourceforge.net/skim-app/?rev=6926&view=rev
Author: hofman
Date: 2010-12-03 16:07:15 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
return error from conversion controller, so we know when the user canceled and
don't show an extra alert in that case
Modified Paths:
--------------
trunk/SKConversionProgressController.h
trunk/SKConversionProgressController.m
trunk/SKMainDocument.m
Modified: trunk/SKConversionProgressController.h
===================================================================
--- trunk/SKConversionProgressController.h 2010-12-03 15:31:26 UTC (rev
6925)
+++ trunk/SKConversionProgressController.h 2010-12-03 16:07:15 UTC (rev
6926)
@@ -46,16 +46,16 @@
NSString *fileType;
CGPSConverterRef converter;
volatile int32_t convertingPS;
- volatile int32_t taskShouldStop;
+ volatile int32_t cancelled;
}
@property (nonatomic, retain) IBOutlet NSButton *cancelButton;
@property (nonatomic, retain) IBOutlet NSProgressIndicator *progressBar;
@property (nonatomic, retain) IBOutlet NSTextField *textField;
-+ (NSData *)PDFDataWithPostScriptData:(NSData *)psData;
-+ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile;
-+ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile;
++ (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
++ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile error:(NSError **)outError;
++ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile error:(NSError **)outError;
- (IBAction)cancel:(id)sender;
- (IBAction)close:(id)sender;
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2010-12-03 15:31:26 UTC (rev
6925)
+++ trunk/SKConversionProgressController.m 2010-12-03 16:07:15 UTC (rev
6926)
@@ -45,6 +45,7 @@
#import "SKDocumentController.h"
#import <libkern/OSAtomic.h>
#import "NSGeometry_SKExtensions.h"
+#import "NSDocument_SKExtensions.h"
#define PROVIDER_KEY @"provider"
#define CONSUMER_KEY @"consumer"
@@ -65,8 +66,8 @@
@interface SKConversionProgressController (Private)
+ (NSString *)dviToolPath;
+ (NSString *)xdvToolPath;
-- (NSData *)PDFDataWithPostScriptData:(NSData *)psData;
-- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType;
+- (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
+- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError;
- (void)conversionCompleted:(BOOL)didComplete;
- (void)conversionStarted;
- (void)converterWasStopped;
@@ -109,23 +110,23 @@
@synthesize cancelButton, progressBar, textField;
-+ (NSData *)PDFDataWithPostScriptData:(NSData *)psData {
- return [[[[self alloc] init] autorelease]
PDFDataWithPostScriptData:psData];
++ (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
+ return [[[[self alloc] init] autorelease] PDFDataWithPostScriptData:psData
error:outError];
}
-+ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile {
++ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile error:(NSError **)outError {
NSString *dviToolPath = [self dviToolPath];
if (dviToolPath)
- return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:dviFile
toolPath:dviToolPath fileType:SKDVIDocumentType];
+ return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:dviFile
toolPath:dviToolPath fileType:SKDVIDocumentType error:outError];
else
NSBeep();
return nil;
}
-+ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile {
++ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile error:(NSError **)outError {
NSString *xdvToolPath = [self xdvToolPath];
if (xdvToolPath)
- return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:xdvFile
toolPath:xdvToolPath fileType:SKXDVDocumentType];
+ return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:xdvFile
toolPath:xdvToolPath fileType:SKXDVDocumentType error:outError];
else
NSBeep();
return nil;
@@ -152,13 +153,12 @@
- (IBAction)cancel:(id)sender {
OSMemoryBarrier();
- if (convertingPS) {
- if (CGPSConverterAbort(converter) == false)
- [self converterWasStopped];
- } else if (taskShouldStop == 0) {
- OSAtomicCompareAndSwap32Barrier(0, 1, (int32_t *)&taskShouldStop);
+ if (cancelled == 1) {
+ [self converterWasStopped];
} else {
- [self converterWasStopped];
+ OSAtomicCompareAndSwap32Barrier(0, 1, (int32_t *)&cancelled);
+ if (convertingPS)
+ CGPSConverterAbort(converter);
}
}
@@ -220,6 +220,11 @@
SKAutoSizeButtons([NSArray arrayWithObjects:cancelButton, nil], YES);
}
+- (BOOL)shouldKeepRunning {
+ OSMemoryBarrier();
+ return cancelled == 0;
+}
+
#pragma mark PostScript
- (void)doPSConversionWithInfo:(NSDictionary *)info {
@@ -234,13 +239,13 @@
[pool release];
}
-- (NSData *)PDFDataWithPostScriptData:(NSData *)psData {
+- (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
NSAssert(NULL == converter, @"attempted to reenter
SKConversionProgressController, but this is not supported");
fileType = SKPostScriptDocumentType;
convertingPS = 1;
- taskShouldStop = 1;
+ cancelled = 0;
// pass self as info
converter = CGPSConverterCreate((void *)self, &SKPSConverterCallbacks,
NULL);
@@ -260,6 +265,12 @@
if (rv != SKConversionSucceeded) {
SKCFDESTROY(pdfData);
+ if (outError) {
+ if ([self shouldKeepRunning])
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ else
+ *outError = [NSError errorWithDomain:NSCocoaErrorDomain
code:NSUserCancelledError userInfo:nil];
+ }
}
return [(id)pdfData autorelease];
@@ -311,11 +322,6 @@
return xdvToolPath;
}
-- (BOOL)shouldKeepRunning {
- OSMemoryBarrier();
- return taskShouldStop == 0;
-}
-
- (void)doDVIConversionWithInfo:(NSDictionary *)info {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -378,14 +384,14 @@
[pool release];
}
-- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType {
+- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError {
NSAssert(NULL == converter, @"attempted to reenter
SKConversionProgressController, but this is not supported");
NSMutableData *pdfData = nil;
fileType = aFileType;
convertingPS = 0;
- taskShouldStop = 0;
+ cancelled = 0;
pdfData = [[NSMutableData alloc] init];
if ([[toolPath lastPathComponent] isEqualToString:@"dvips"]) {
@@ -398,8 +404,15 @@
NSInteger rv = [self runModalSelector:@selector(doDVIConversionWithInfo:)
withObject:dictionary];
- if (rv != SKConversionSucceeded)
+ if (rv != SKConversionSucceeded) {
SKDESTROY(pdfData);
+ if (outError) {
+ if ([self shouldKeepRunning])
+ *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ else
+ *outError = [NSError errorWithDomain:NSCocoaErrorDomain
code:NSUserCancelledError userInfo:nil];
+ }
+ }
return [pdfData autorelease];
}
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2010-12-03 15:31:26 UTC (rev 6925)
+++ trunk/SKMainDocument.m 2010-12-03 16:07:15 UTC (rev 6926)
@@ -646,13 +646,14 @@
- (BOOL)readFromData:(NSData *)data ofType:(NSString *)docType error:(NSError
**)outError {
PDFDocument *pdfDoc = nil;
+ NSError *error = nil;
[tmpData release];
tmpData = [[SKTemporaryData alloc] init];
if ([docType isEqualToString:SKPostScriptDocumentType]) {
[self setPSOrDVIData:data];
- data = [SKConversionProgressController PDFDataWithPostScriptData:data];
+ data = [SKConversionProgressController PDFDataWithPostScriptData:data
error:&error];
}
if (data)
@@ -667,7 +668,7 @@
return YES;
} else {
if (outError != NULL)
- *outError = [NSError errorWithDomain:SKDocumentErrorDomain
code:SKReadFileError userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable to load file", @"Error
description"), NSLocalizedDescriptionKey, nil]];
+ *outError = error ?: [NSError
errorWithDomain:SKDocumentErrorDomain code:SKReadFileError
userInfo:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"Unable
to load file", @"Error description"), NSLocalizedDescriptionKey, nil]];
return NO;
}
}
@@ -721,13 +722,13 @@
if (data = [fileData retain])
pdfDoc = [[SKPDFDocument alloc] initWithURL:absoluteURL];
} else if ([docType isEqualToString:SKPostScriptDocumentType]) {
- if (data = [[SKConversionProgressController
PDFDataWithPostScriptData:fileData] retain])
+ if (data = [[SKConversionProgressController
PDFDataWithPostScriptData:fileData error:&error] retain])
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
} else if ([docType isEqualToString:SKDVIDocumentType]) {
- if (data = [[SKConversionProgressController
PDFDataWithDVIFile:[absoluteURL path]] retain])
+ if (data = [[SKConversionProgressController
PDFDataWithDVIFile:[absoluteURL path] error:&error] retain])
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
} else if ([docType isEqualToString:SKXDVDocumentType]) {
- if (data = [[SKConversionProgressController
PDFDataWithXDVFile:[absoluteURL path]] retain])
+ if (data = [[SKConversionProgressController
PDFDataWithXDVFile:[absoluteURL path] error:&error] retain])
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit