Revision: 6786
http://skim-app.svn.sourceforge.net/skim-app/?rev=6786&view=rev
Author: hofman
Date: 2010-09-08 11:27:25 +0000 (Wed, 08 Sep 2010)
Log Message:
-----------
check file type of document for bookmark from scripting, and use NSNotFound for
missing page index for .skim files
Modified Paths:
--------------
trunk/SKBookmark.m
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2010-09-08 11:11:04 UTC (rev 6785)
+++ trunk/SKBookmark.m 2010-09-08 11:27:25 UTC (rev 6786)
@@ -260,15 +260,24 @@
NSURL *aURL = [properties objectForKey:@"scriptingFile"] ?:
contentsValue;
NSString *aPath = [aURL respondsToSelector:@selector(path)] ?
[aURL path] : nil;
NSString *aLabel = [properties objectForKey:@"label"] ?:
[aPath lastPathComponent] ?: @"";
+ NSDocumentController *dc = [NSDocumentController
sharedDocumentController];
+ Class docClass;
if (aPath == nil) {
+ [[NSScriptCommand currentCommand]
setScriptErrorNumber:NSRequiredArgumentsMissingScriptError];
+ [[NSScriptCommand currentCommand]
setScriptErrorString:@"New file bookmark requires a file."];
+ } else if ([[NSFileManager defaultManager]
fileExistsAtPath:aPath] == NO) {
[[NSScriptCommand currentCommand]
setScriptErrorNumber:NSArgumentsWrongScriptError];
- [[NSScriptCommand currentCommand]
setScriptErrorString:@"New file bookmark requires a path."];
- } else if ([[NSFileManager defaultManager]
fileExistsAtPath:aPath] == NO) {
- [[NSScriptCommand currentCommand]
setScriptErrorNumber:NSRequiredArgumentsMissingScriptError];
- [[NSScriptCommand currentCommand]
setScriptErrorString:@"New file bookmark requires an existing path."];
+ [[NSScriptCommand currentCommand]
setScriptErrorString:@"New file bookmark requires an existing file."];
+ } else if (docClass = [dc documentClassForType:[dc
typeForContentsOfURL:aURL error:NULL]]) {
+ NSUInteger aPageNumber = [[properties
objectForKey:@"pageNumber"] unsignedIntegerValue];
+ if (aPageNumber > 0)
+ aPageNumber--;
+ else
+ aPageNumber = [docClass
instancesRespondToSelector:@selector(mainWindowController)] ? 0 : NSNotFound;
+ bookmark = [[SKBookmark alloc] initWithPath:aPath
pageIndex:aPageNumber label:aLabel];
} else {
- NSUInteger aPageNumber = [[properties
objectForKey:@"pageNumber"] unsignedIntegerValue];
- bookmark = [[SKBookmark alloc] initWithPath:aPath
pageIndex:(aPageNumber > 0 ? aPageNumber - 1 : 0) label:aLabel];
+ [[NSScriptCommand currentCommand]
setScriptErrorNumber:NSArgumentsWrongScriptError];
+ [[NSScriptCommand currentCommand]
setScriptErrorString:@"Unsupported file type for new bookmark."];
}
break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit