Commit: dbe280ee71116476492ccb72e8dc298a2b33e9d0 - BSInlinePreviewer (git)

BathyScapheで画像のインラインプレビューを可能にするプラグイン

Commit MetaInfo

• Revisão: dbe280ee71116476492ccb72e8dc298a2b33e9d0 (tree)
• Hora: 2014-01-29 21:28:04
• Autor: masakih <masakih@user...>
• Commiter: masakih

Mensagem de Log

[Mod] 画像の挿入位置を首都来るメソッドを分離

Mudança Sumário

• modified: BSInlinePreviewer.h
• modified: BSInlinePreviewer.m

Diff

--- a/BSInlinePreviewer.h
+++ b/BSInlinePreviewer.h
@@ -20,7 +20,7 @@
 	
 	id threadView;
 	NSTextStorage *textStrage;
-	unsigned actionIndex;
+	NSUInteger actionIndex;
 	
 	id previewAttributes;
 	
@@ -46,8 +46,8 @@
 - (id)targetThreadView;
 - (void)setTargetTextStorage:(NSTextStorage *)ts;
 - (NSTextStorage *)targetTextStorage;
-- (void)setActionIndex:(unsigned)p;
-- (unsigned)actionIndex;
+- (void)setActionIndex:(NSUInteger)p;
+- (NSUInteger)actionIndex;
 - (BOOL)prepareTarget;
 
 - (id)previewAttributes;

--- a/BSInlinePreviewer.m
+++ b/BSInlinePreviewer.m
@@ -128,64 +128,22 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 		return NO;
 	}
 	
-	// get insert position.
-	NSRange linkRange;// = [self linkRange];
-	{
-		unsigned	charIndex_ = [self actionIndex];
-		NSTextStorage *ts = [self targetTextStorage];
-		
-		NSRange limit;
-		if(charIndex_ > 100) {
-			limit = NSMakeRange(charIndex_ - 100, 200);
-		} else {
-			limit = NSMakeRange(0, 200);
-		}
-		unsigned over = NSMaxRange(limit) - [ts length];
-		if(over > 0) {
-			limit.length -= over;
-		}
-		
-		id attr = nil;
-		id checked = nil;
-		@try {
-			attr = [ts attribute:NSLinkAttributeName
-						 atIndex:charIndex_
-		   longestEffectiveRange:&linkRange
-						 inRange:limit];
-			//		NSLog(@"link attr -> %@", attr);
-			//		NSLog(@"attr range -> %@", NSStringFromRange(longest));
-			
-			checked = [ts attribute:BSInlinePreviewerPreviewed
-							atIndex:charIndex_
-			  longestEffectiveRange:NULL
-							inRange:limit];
-		}
-		@catch(NSException *ex) {
-			if([[ex name] isEqualToString:NSRangeException]) {
-				linkRange.location = NSNotFound;
-			} else {
-				@throw;
-			}
-		}
-		
-		if(!attr) {
-			linkRange.location = NSNotFound;
-		}
-		if(checked) {
-			linkRange.location = alreadyPreviewed;
-		}
+	NSUInteger	charIndex_ = [self actionIndex];
+	NSTextStorage *ts = [self targetTextStorage];
+	
+	NSRange limit;
+	if(charIndex_ > 100) {
+		limit = NSMakeRange(charIndex_ - 100, 200);
+	} else {
+		limit = NSMakeRange(0, 200);
 	}
-	if(linkRange.location == NSNotFound) {
-		NSLog(@"con not found insert position.");
-		return NO;
+	NSUInteger over = NSMaxRange(limit) - [ts length];
+	if(over > 0) {
+		limit.length -= over;
 	}
-	if(linkRange.location == alreadyPreviewed) return NO;
-	
-	BSILinkInfomation *link = [[[BSILinkInfomation alloc] init] autorelease];
-	link.urlString = [url absoluteString];
-	link.range = linkRange;
-		
-	[self downloadAndInsertImages:@[link]];
+	NSArray *links = [self linksForRange:limit];
+
+	[self downloadAndInsertImages:links];
 	
 	return YES;
 }
@@ -220,18 +178,23 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 		return NO;
 	}
 	
-	// get insert position.
-	NSMutableArray *links = [NSMutableArray array];
+	NSArray *links = [self linksForRange:[threadView selectedRange]];
 	
-	NSRange selectedRange = [threadView selectedRange];
-	NSTextStorage *ts = [self targetTextStorage];
+	[self downloadAndInsertImages:links];
 		
-	NSUInteger selectionMax = NSMaxRange(selectedRange);
+	return YES;
+}
+
+- (NSArray *)linksForRange:(NSRange)range
+{
+	NSMutableArray *links = [NSMutableArray array];
+	NSTextStorage *ts = [self targetTextStorage];
+	
+	NSUInteger selectionMax = NSMaxRange(range);
 	id attr = nil;
 	BOOL didChecked = NO;
-	NSUInteger location = selectedRange.location;
+	NSUInteger location = range.location;
 	NSRange longest;
-	NSRange range = selectedRange;
 	do {
 		attr = [ts attribute:NSLinkAttributeName
 					 atIndex:location
@@ -240,7 +203,7 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 		didChecked = ([ts attribute:BSInlinePreviewerPreviewed
 							atIndex:location
 			  longestEffectiveRange:NULL
-							inRange:range]) ? YES : NO;		
+							inRange:range]) ? YES : NO;
 		if(!didChecked && [self isValiableLinkAttr:attr]) {
 			BSILinkInfomation *link = [[[BSILinkInfomation alloc] init] autorelease];
 			link.urlString = [self URLStringFromAttr:attr];
@@ -251,11 +214,8 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 		range.length -= longest.length;
 	} while(location < selectionMax);
 	
-	[self downloadAndInsertImages:links];
-		
-	return YES;
+	return links;
 }
-	
 - (BOOL)validateLink:(NSURL *)anURL
 {
 	NSArray *imageExtensions;
@@ -365,11 +325,11 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 {
 	return textStrage;
 }
-- (void)setActionIndex:(unsigned)p
+- (void)setActionIndex:(NSUInteger)p
 {
 	actionIndex = p;
 }
-- (unsigned)actionIndex
+- (NSUInteger)actionIndex
 {
 	return actionIndex;
 }