Commit: 80c6b52bc2ab171a491b8d7aeb5d62e5838efce3 - BSInlinePreviewer (git)

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

Commit MetaInfo

• Revision: 80c6b52bc2ab171a491b8d7aeb5d62e5838efce3 (tree)
• Time: 2012-05-18 23:16:01
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Mod] NSCacheを使用するようにした

merge from extended

Change Summary

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

Incremental Difference

--- a/BSInlinePreviewer.h
+++ b/BSInlinePreviewer.h
@@ -45,3 +45,5 @@
 - (id)previewAttributes;
 	
 @end
+
+extern NSString *const BSInlinePreviewerPreviewed;

--- a/BSInlinePreviewer.m
+++ b/BSInlinePreviewer.m
@@ -29,7 +29,7 @@
 
 @implementation BSInlinePreviewer
 
-static NSString *const BSInlinePreviewerPreviewed = @"BSInlinePreviewerPreviewed";
+NSString *const BSInlinePreviewerPreviewed = @"BSInlinePreviewerPreviewed";
 const NSUInteger alreadyPreviewed = NSNotFound - 1;
 
 @synthesize totalDownloads, remainder;
@@ -43,6 +43,7 @@ const NSUInteger alreadyPreviewed = NSNotFound - 1;
 		[self setPreferences:prefs];
 		cache = [[NSCache alloc] init];
 		[cache setName:@"BSInlinePreviewer"];
+		[cache setCountLimit:100];
 	}
 	
 	return self;
@@ -441,7 +442,7 @@ const NSUInteger alreadyPreviewed = NSNotFound - 1;
 - (NSImage *)downloadImageURL:(NSURL *)imageURL
 {
 	NSImage *cachedImage = [cache objectForKey:[self cacheKeyForURL:imageURL]];
-	if(cachedImage) return [self fitImage:cachedImage toSize:[self previewSize]];;
+	if(cachedImage) return cachedImage;
 	
 	NSURLRequest *req;
 	
@@ -457,24 +458,27 @@ const NSUInteger alreadyPreviewed = NSNotFound - 1;
 												  error:&err];
 	if(err) {
 		NSLog(@"Fail download. reason(%@)", [err localizedDescription]);
-		return [self notFoundImage];
+		goto notFound;
 	}
 	if(res) {
 		if(![[res MIMEType] hasPrefix:@"image/"]) {
 			NSLog(@"Fail download. reason(target type is %@)", [res MIMEType]);
-			return [self notFoundImage];
+			goto notFound;
 		}
 	}
 	
 	NSImage *image = [[[NSImage alloc] initWithData:imageData] autorelease];
 	if(!image) {
 		NSLog(@"Can not create image.");
-		return [self notFoundImage];
+		goto notFound;
 	}
 	
-	[cache setObject:image forKey:[self cacheKeyForURL:imageURL]];
-	
-	return [self fitImage:image toSize:[self previewSize]];
+	cachedImage = [self fitImage:image toSize:[self previewSize]];
+	[cache setObject:cachedImage forKey:[self cacheKeyForURL:imageURL]];
+	return cachedImage;
+notFound:
+	[cache setObject:[self notFoundImage] forKey:[self cacheKeyForURL:imageURL]];
+	return [self notFoundImage];
 }
 
 @end