Commit: b898e058bf9dbfc5ef9cd0aca33863f6bab5850d - BSInlinePreviewer (git)

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

Commit MetaInfo

• Revisão: b898e058bf9dbfc5ef9cd0aca33863f6bab5850d (tree)
• Hora: 2014-01-29 00:04:32
• Autor: masakih <masakih@user...>
• Commiter: masakih

Mensagem de Log

[Mod] 画像のダウンロードと挿入をメソッドにまとめた

Mudança Sumário

• modified: BSInlinePreviewer.m

Diff

--- a/BSInlinePreviewer.m
+++ b/BSInlinePreviewer.m
@@ -22,6 +22,8 @@
 
 - (void)showProgressPanel;
 - (void)closeProgressPanel;
+
+- (void)downloadAndInsertImages:(NSArray *)links;
 @end
 
 @interface NSObject(BSInlinePreviewerDummy)
@@ -127,34 +129,63 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 	}
 	
 	// get insert position.
-	NSRange linkRange = [self linkRange];
+	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;
+		}
+	}
 	if(linkRange.location == NSNotFound) {
 		NSLog(@"con not found insert position.");
 		return NO;
 	}
 	if(linkRange.location == alreadyPreviewed) return NO;
-	unsigned insertIndex = linkRange.location;
-	
-	// download image.
-	self.totalDownloads = self.remainder = 1;
-	[self showProgressPanel];
-	NSImage *image = [self downloadImageURL:url];
-	self.remainder  = 0;
-	[self closeProgressPanel];
-	if(!image) { NSBeep(); return NO; }
 	
-	// insert image.
-	NSTextStorage *ts = [self targetTextStorage];
-	[ts beginEditing];
-	{
-		[ts addAttribute:BSInlinePreviewerPreviewed
-				   value:[NSNumber numberWithBool:YES]
-				   range:linkRange];
+	BSILinkInfomation *link = [[[BSILinkInfomation alloc] init] autorelease];
+	link.urlString = [url absoluteString];
+	link.range = linkRange;
 		
-		id newInsertion = [self attachmentAttributedStringWithImage:image];
-		[ts insertAttributedString:newInsertion atIndex:insertIndex];
-	}
-	[ts endEditing];
+	[self downloadAndInsertImages:@[link]];
 	
 	return YES;
 }
@@ -220,40 +251,8 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 		range.length -= longest.length;
 	} while(location < selectionMax);
 	
-	// download images.
-	self.totalDownloads = self.remainder = [links count];
-	
-	[self showProgressPanel];
-	for(BSILinkInfomation *link in links) {
-		NSURL *url = [NSURL URLWithString:link.urlString];
-		if([self validateLink:url]) {
-			link.image = [self downloadImageURL:url];
-		}
-		self.remainder--;
-		[progressPanel displayIfNeeded];
-	}
-	[self closeProgressPanel];
-	
-	
-	// insert images.
-//	[ts beginEditing];
-	NSUInteger linkOffset = 0;
-	for(BSILinkInfomation *link in links) {
-		if(!link.image) continue;
-		NSRange linkRange = link.range;
-		linkRange.location += linkOffset;
-		[ts addAttribute:BSInlinePreviewerPreviewed
-				   value:[NSNumber numberWithBool:YES]
-				   range:linkRange];
-		
-		id newInsertion = [self attachmentAttributedStringWithImage:link.image];
-		[ts insertAttributedString:newInsertion atIndex:linkRange.location];
+	[self downloadAndInsertImages:links];
 		
-		linkOffset += [newInsertion length];
-		[[threadView window] displayIfNeeded];
-	}
-//	[ts endEditing];
-	
 	return YES;
 }
 	
@@ -442,54 +441,43 @@ static NSString *ThumbnailSizeKey = @"com.masakih.BSInlinePreviewer.thumbnailSiz
 	return attrs_;
 }
 
-- (NSRange)linkRange
+- (void)downloadAndInsertImages:(NSArray *)links
 {
-	unsigned	charIndex_ = [self actionIndex];
 	NSTextStorage *ts = [self targetTextStorage];
 	
-	NSRange limit;
-	NSRange longest;
-	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;
-	}
+	// download images.
+	self.totalDownloads = self.remainder = [links count];
 	
-	id attr = nil;
-	id checked = nil;
-	@try {
-		attr = [ts attribute:NSLinkAttributeName
-					 atIndex:charIndex_
-	   longestEffectiveRange:&longest
-					 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]) {
-			longest.location = NSNotFound;
-		} else {
-			@throw;
+	[self showProgressPanel];
+	for(BSILinkInfomation *link in links) {
+		NSURL *url = [NSURL URLWithString:link.urlString];
+		if([self validateLink:url]) {
+			link.image = [self downloadImageURL:url];
 		}
+		self.remainder--;
+		[progressPanel displayIfNeeded];
 	}
+	[self closeProgressPanel];
 	
-	if(!attr) {
-		longest.location = NSNotFound;
-	}
-	if(checked) {
-		longest.location = alreadyPreviewed;
-	}
 	
-	return longest;
+	// insert images.
+	//	[ts beginEditing];
+	NSUInteger linkOffset = 0;
+	for(BSILinkInfomation *link in links) {
+		if(!link.image) continue;
+		NSRange linkRange = link.range;
+		linkRange.location += linkOffset;
+		[ts addAttribute:BSInlinePreviewerPreviewed
+				   value:[NSNumber numberWithBool:YES]
+				   range:linkRange];
+		
+		id newInsertion = [self attachmentAttributedStringWithImage:link.image];
+		[ts insertAttributedString:newInsertion atIndex:linkRange.location];
+		
+		linkOffset += [newInsertion length];
+		[[threadView window] displayIfNeeded];
+	}
+	//	[ts endEditing];
 }
 
 - (NSImage *)fitImage:(NSImage *)image toSize:(NSSize)targetSize