Commit: 9ad10f9ecb1c550c2951ad9267e3d4439b61bd64 - BSInlinePreviewer (git)

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

Commit MetaInfo

• Révision: 9ad10f9ecb1c550c2951ad9267e3d4439b61bd64 (tree)
• l'heure: 2012-05-18 23:05:51
• Auteur: masakih <masakih@user...>
• Commiter: masakih

Message de Log

[New] BSIPEReplacerを新設。置換用

Change Summary

• modified: BSInlinePreviewer.xcodeproj/project.pbxproj
• modified: BSInlinePreviewerEx.m
• add: Ex/BSIPEReplacer.h
• add: Ex/BSIPEReplacer.m

Modification

--- a/BSInlinePreviewer.xcodeproj/project.pbxproj
+++ b/BSInlinePreviewer.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		F4ADF9591565114F00F666EB /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F468C69C1220CA07009EFA3E /* WebKit.framework */; };
 		F4ADF9671565124200F666EB /* BSInlinePreviewerEx.m in Sources */ = {isa = PBXBuildFile; fileRef = F4ADF9661565124200F666EB /* BSInlinePreviewerEx.m */; };
 		F4ADF9711565150D00F666EB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F4ADF96F156514F800F666EB /* InfoPlist.strings */; };
+		F4ADF98E1566774F00F666EB /* BSIPEReplacer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4ADF98C15666FAD00F666EB /* BSIPEReplacer.m */; };
 		F4C8070C0E53CCB000BF4144 /* BSInlinePreviewer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C8070B0E53CCB000BF4144 /* BSInlinePreviewer.m */; };
 		F4F1DC700E546EC800055177 /* notFound.png in Resources */ = {isa = PBXBuildFile; fileRef = F4F1DC6F0E546EC800055177 /* notFound.png */; };
 		F4FE88A010F772DD0076B366 /* Panel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4FE889E10F772DD0076B366 /* Panel.xib */; };
@@ -43,6 +44,8 @@
 		F4ADF9661565124200F666EB /* BSInlinePreviewerEx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSInlinePreviewerEx.m; sourceTree = "<group>"; };
 		F4ADF96E156514F800F666EB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F4ADF970156514FE00F666EB /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		F4ADF98B15666FAD00F666EB /* BSIPEReplacer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSIPEReplacer.h; path = Ex/BSIPEReplacer.h; sourceTree = "<group>"; };
+		F4ADF98C15666FAD00F666EB /* BSIPEReplacer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BSIPEReplacer.m; path = Ex/BSIPEReplacer.m; sourceTree = "<group>"; };
 		F4C807090E53CBE500BF4144 /* BSImagePreviewerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSImagePreviewerInterface.h; sourceTree = "<group>"; };
 		F4C8070A0E53CCB000BF4144 /* BSInlinePreviewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSInlinePreviewer.h; sourceTree = "<group>"; };
 		F4C8070B0E53CCB000BF4144 /* BSInlinePreviewer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSInlinePreviewer.m; sourceTree = "<group>"; };
@@ -159,6 +162,8 @@
 			children = (
 				F4ADF9651565124200F666EB /* BSInlinePreviewerEx.h */,
 				F4ADF9661565124200F666EB /* BSInlinePreviewerEx.m */,
+				F4ADF98B15666FAD00F666EB /* BSIPEReplacer.h */,
+				F4ADF98C15666FAD00F666EB /* BSIPEReplacer.m */,
 				F4ADF95F1565115000F666EB /* BSInlinePreviewerEx-Info.plist */,
 				F4ADF96F156514F800F666EB /* InfoPlist.strings */,
 			);
@@ -306,6 +311,7 @@
 				F4ADF9551565114F00F666EB /* BSInlinePreviewer.m in Sources */,
 				F4ADF9561565114F00F666EB /* BSILinkInfomation.m in Sources */,
 				F4ADF9671565124200F666EB /* BSInlinePreviewerEx.m in Sources */,
+				F4ADF98E1566774F00F666EB /* BSIPEReplacer.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/BSInlinePreviewerEx.m
+++ b/BSInlinePreviewerEx.m
@@ -9,8 +9,7 @@
 #import "BSInlinePreviewerEx.h"
 
 NSString *const CMRThreadViewerDidChangeThreadNotification  = @"CMRThreadViewerDidChangeThreadNotification";
-
-static NSString *const BSInlinePreviewerPreviewed = @"BSInlinePreviewerPreviewed";
+#import "BSIPEReplacer.h"
 
 
 @interface BSInlinePreviewer(Private)
@@ -42,99 +41,13 @@ static NSString *const BSInlinePreviewerPreviewed = @"BSInlinePreviewerPreviewed
 	return self;
 }
 
-- (id)keyOfObject:(id)obj
-{
-	return [NSString stringWithFormat:@"%p", obj];
-}
-- (void)insertImage:(NSDictionary *)attr
-{
-	NSTextView *tv = [attr objectForKey:@"View"];
-	NSRange range = NSRangeFromString([attr objectForKey:@"Range"]);
-	id newInsertion = [attr objectForKey:@"Image"];
-	NSUInteger offset = [[attr objectForKey:@"Offset"] unsignedIntegerValue];
-	range.location += offset;
-	
-	NSTextStorage *ts = [tv textStorage];
-	[ts beginEditing];
-	{
-		[ts addAttribute:BSInlinePreviewerPreviewed
-				   value:[NSNumber numberWithBool:YES]
-				   range:range];
-		
-		[ts insertAttributedString:newInsertion atIndex:range.location];
-	}
-	[ts endEditing];
-}
 - (void)viewerDidEndFinishing:(id)no
 {
-	NSLog(@"CMRThreadViewerDidChangeThreadNotification %@", no);
 	id threadViewer = [no object];
-	NSTextView *tv = [[threadViewer textView] retain];
-	@synchronized(tasking) {
-		id check = [tasking objectForKey:[self keyOfObject:tv]];
-		if(check) return;
-		[tasking setObject:tv forKey:[self keyOfObject:tv]];
-	}
-	
-	dispatch_async(dispatch_get_global_queue(0,0), ^{
-		NSUInteger i = 0;
-		while([[tv textStorage] length] == 0) {
-			i++;
-			if(i > NSUIntegerMax - 5) {
-				NSLog(@"Abort");
-				return;
-			}
-		}
-		sleep(1);
-		NSTextStorage *ts = [[tv textStorage] copy];
-		
-		NSMutableArray *links = [NSMutableArray array];
-		
-		[ts enumerateAttribute:NSLinkAttributeName
-					   inRange:NSMakeRange(0, [ts length])
-					   options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
-					usingBlock:^(id value, NSRange range, BOOL *stop) {
-						NSURL *url = [NSURL URLWithString:value];
-						if([self validateLink:url]) {
-							[links addObject:[NSDictionary dictionaryWithObjectsAndKeys:url, @"Link",
-											  NSStringFromRange(range), @"Range", nil]];
-						}
-					}];
-		
-		__block NSUInteger offset = 0;
-		NSUInteger count = [links count];
-		dispatch_apply(count, dispatch_get_global_queue(0,0), ^(size_t index){
-			id dict = [links objectAtIndex:index];
-			NSRange range = NSRangeFromString([dict objectForKey:@"Range"]);
-			if([ts attribute:BSInlinePreviewerPreviewed atIndex:range.location longestEffectiveRange:NULL inRange:range]) {
-				return;
-			}
-			// download image.
-			self.totalDownloads = self.remainder = 1;
-			NSImage *image = [self downloadImageURL:[dict objectForKey:@"Link"]];
-			self.remainder  = 0;
-			if(!image) return;
-			
-			id newInsertion = [self attachmentAttributedStringWithImage:image];
-			
-			
-			NSDictionary *attr = [[NSDictionary alloc] initWithObjectsAndKeys:
-								  newInsertion, @"Image",
-								  [dict objectForKey:@"Range"], @"Range",
-								  tv, @"View",
-								  [NSNumber numberWithUnsignedInteger:offset], @"Offset",
-								  nil];
-			[self performSelectorOnMainThread:@selector(insertImage:) withObject:attr waitUntilDone:NO];
-			offset += [newInsertion length];
-			[attr release];
-		});
-		[ts release];
-		[tv release];
-		@synchronized(tasking) {
-			[tasking removeObjectForKey:[self keyOfObject:tv]];
-		}
-//		NSLog(@"ts \n%@", ts);
-	});
+	NSTextView *tv = [threadViewer textView];
+	BSIPEReplacer *replacer = [BSIPEReplacer replaserWithTextView:tv];
+	replacer.owner = self;
+	replacer.textView = tv;
 }
 
 

--- /dev/null
+++ b/Ex/BSIPEReplacer.h
@@ -0,0 +1,26 @@
+//
+//  BSIPEReplacer.h
+//  BSInlinePreviewer
+//
+//  Created by 堀 昌樹 on 12/05/18.
+//  Copyright (c) 2012年 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "BSInlinePreviewerEx.h"
+
+@interface BSIPEReplacer : NSObject
+{
+	NSLock *lock;
+	NSTextView *_textView;
+	BSInlinePreviewerEx *_owner;
+	
+	BOOL _newStorage;
+	NSUInteger _selfAwaking;
+}
+@property (retain) NSTextView *textView;
+@property (assign) BSInlinePreviewerEx *owner;
+
++ (id)replaserWithTextView:(NSTextView *)tv;
+@end

--- /dev/null
+++ b/Ex/BSIPEReplacer.m
@@ -0,0 +1,196 @@
+//
+//  BSIPEReplacer.m
+//  BSInlinePreviewer
+//
+//  Created by 堀 昌樹 on 12/05/18.
+//  Copyright (c) 2012年 __MyCompanyName__. All rights reserved.
+//
+
+#import "BSIPEReplacer.h"
+
+@interface BSIPEReplacer ()
+@property BOOL newStorage;
+
+@property NSUInteger selfAwaking;
+
+@end
+
+@implementation BSIPEReplacer
+@synthesize textView = _textView;
+@synthesize owner = _owner;
+
+@synthesize newStorage = _newStorage;
+@synthesize selfAwaking = _selfAwaking;
+
+
+static NSMutableDictionary *instances = nil;
+id keyForTextView(NSTextView *view)
+{
+	return [NSString stringWithFormat:@"%p", view];
+}
++ (id)replaserWithTextView:(NSTextView *)tv
+{
+	if(!instances) {
+		instances = [[NSMutableDictionary alloc] init];
+	}
+	id result = nil;
+	@synchronized(self) {
+		result = [instances objectForKey:keyForTextView(tv)];
+		[result retain];
+	}
+	if(result) return [result autorelease];
+	
+	result = [[[self alloc] init] autorelease];
+	@synchronized(self) {
+		[instances setObject:result forKey:keyForTextView(tv)];
+	}
+	return result;
+}
+
+- (void)setTextView:(NSTextView *)textView
+{
+	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+	[nc removeObserver:self name:nil object:nil];
+	
+	@synchronized(self) {
+		[_textView release];
+		_textView = [textView retain];
+	}
+	if(textView) {
+		[nc addObserver:self
+			   selector:@selector(textDidChange:)
+				   name:NSTextStorageDidProcessEditingNotification
+				 object:[_textView textStorage]];
+		[nc addObserver:self
+			   selector:@selector(windowWillClose:)
+				   name:NSWindowWillCloseNotification
+				 object:[_textView window]];
+	}
+	[self textDidChange:nil];
+}
+- (NSTextView *)textView
+{
+	id result = nil;
+	@synchronized(self) {
+		result = [_textView retain];
+	}
+	return [result autorelease];
+}
+- (id)init
+{
+	self = [super init];
+	if(self) {
+		lock = [[NSLock alloc] init];
+	}
+	return self;
+}
+- (void)dealloc
+{
+	[_textView release];
+	[lock release];
+	
+	[super dealloc];
+}
+
+NSRange fixRange(NSRange range, NSTextStorage *ts)
+{
+	NSRange fixedRange = {0,0};
+	NSRange searchRange = NSMakeRange(MAX(0, range.location - 20), range.length + 20);
+	searchRange = NSIntersectionRange(searchRange, NSMakeRange(0, [ts length]));
+	[ts attribute:NSLinkAttributeName atIndex:range.location longestEffectiveRange:&fixedRange inRange:searchRange];
+	return fixedRange;
+}
+- (void)insertImage:(NSDictionary *)attr
+{
+	NSTextView *tv = [attr objectForKey:@"View"];
+	NSRange range = NSRangeFromString([attr objectForKey:@"Range"]);
+	id newInsertion = [attr objectForKey:@"Image"];
+	NSUInteger offset = [[attr objectForKey:@"Offset"] unsignedIntegerValue];
+	range.location += offset;
+	
+	NSTextStorage *ts = [tv textStorage];
+	range = fixRange(range, ts);
+	[ts beginEditing];
+	{
+		[ts addAttribute:BSInlinePreviewerPreviewed
+				   value:[NSNumber numberWithBool:YES]
+				   range:range];
+		
+		[ts insertAttributedString:newInsertion atIndex:range.location];
+		self.selfAwaking++;
+	}
+	[ts endEditing];
+}
+- (void)textDidChange:(NSNotification *)no
+{
+	NSUInteger length = [[self.textView textStorage] length];
+	if(length == 0) {
+		self.newStorage = YES;
+		self.selfAwaking = 0;
+		return;
+	}
+	if(self.selfAwaking > 0) {
+		self.selfAwaking--;
+		return;
+	}
+	
+	NSTextStorage *ts = [[self.textView textStorage] copy];
+	dispatch_async(dispatch_get_global_queue(0,0), ^{
+		
+		[lock lock];
+		
+		
+		NSMutableArray *links = [NSMutableArray array];
+		
+		[ts enumerateAttribute:NSLinkAttributeName
+					   inRange:NSMakeRange(0, [ts length])
+					   options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
+					usingBlock:^(id value, NSRange range, BOOL *stop) {
+						NSURL *url = [NSURL URLWithString:value];
+						if([self.owner validateLink:url]) {
+							[links addObject:[NSDictionary dictionaryWithObjectsAndKeys:url, @"Link",
+											  NSStringFromRange(range), @"Range", nil]];
+						}
+					}];
+		
+		__block NSUInteger offset = 0;
+		NSUInteger count = [links count];
+		dispatch_apply(count, dispatch_get_global_queue(0,0), ^(size_t index){
+			if(!self.textView) return;
+			
+			id dict = [links objectAtIndex:index];
+			NSRange range = NSRangeFromString([dict objectForKey:@"Range"]);
+			if([ts attribute:BSInlinePreviewerPreviewed atIndex:range.location longestEffectiveRange:NULL inRange:range]) {
+				return;
+			}
+			// download image.
+			NSImage *image = [self.owner downloadImageURL:[dict objectForKey:@"Link"]];
+			if(!image) return;
+			
+			id newInsertion = [self.owner attachmentAttributedStringWithImage:image];
+			
+			
+			NSDictionary *attr = [[NSDictionary alloc] initWithObjectsAndKeys:
+								  newInsertion, @"Image",
+								  [dict objectForKey:@"Range"], @"Range",
+								  self.textView, @"View",
+								  [NSNumber numberWithUnsignedInteger:offset], @"Offset",
+								  nil];
+			[self performSelectorOnMainThread:@selector(insertImage:) withObject:attr waitUntilDone:NO];
+			offset += [newInsertion length];
+			[attr release];
+		});
+		[ts release];
+		//		NSLog(@"ts \n%@", ts);
+		
+		[lock unlock];
+	});
+}
+
+- (void)windowWillClose:(NSNotification *)notification
+{
+	[[self retain] autorelease];
+	[instances removeObjectForKey:keyForTextView(_textView)];
+	self.textView = nil;
+}
+@end