提交: 2c9e3d3950c1bccb67fb54038344c2cf49739714 - KakuriNoMiya (git)

BathyScapheの中身をぐちゃぐちゃに

Commit MetaInfo

• 修订版: 2c9e3d3950c1bccb67fb54038344c2cf49739714 (tree)
• 时间: 2012-07-21 21:49:10
• 作者: masakih <masakih@b61f...>
• Commiter: masakih

Log Message

change smartboard and favorite updating mechanism.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/bathyscaphe/bathyscaphe/trunk@1447 b61fe662-1e22-0410-9ebe-d5d0f6be7d5c

更改概述

• modified: application/BathyScaphe.xcodeproj/project.pbxproj
• modified: application/source/bbs/BoardListItem/FavoritesBoardListItem.h
• modified: application/source/bbs/BoardListItem/FavoritesBoardListItem.m
• modified: application/source/browser/BSDBThreadList.m
• add: application/source/browser/BSSmartBoardUpdateTask.h
• add: application/source/browser/BSSmartBoardUpdateTask.m
• modified: changelog.txt

差异

--- a/application/BathyScaphe.xcodeproj/project.pbxproj
+++ b/application/BathyScaphe.xcodeproj/project.pbxproj
@@ -400,6 +400,8 @@
 		F426B080119831AA00E169D4 /* BSWhereClauseCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = F426B07E119831AA00E169D4 /* BSWhereClauseCreator.h */; };
 		F437FD671199AF3B00D078FB /* SmartBoardItemEditor.xib in Resources */ = {isa = PBXBuildFile; fileRef = F437FD651199AF3B00D078FB /* SmartBoardItemEditor.xib */; };
 		F440D7330C315929000458FF /* DatabaseManager-Notifications.m in Sources */ = {isa = PBXBuildFile; fileRef = F440D7310C315929000458FF /* DatabaseManager-Notifications.m */; };
+		F4458B3615A876580096B358 /* BSSmartBoardUpdateTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F4458B3415A876580096B358 /* BSSmartBoardUpdateTask.h */; };
+		F4458B3715A876580096B358 /* BSSmartBoardUpdateTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F4458B3515A876580096B358 /* BSSmartBoardUpdateTask.m */; };
 		F44A24D711964AE900C60F2D /* XspfMLabelField.h in Headers */ = {isa = PBXBuildFile; fileRef = F44A24C611964AE900C60F2D /* XspfMLabelField.h */; };
 		F44A24D811964AE900C60F2D /* XspfMLabelField.m in Sources */ = {isa = PBXBuildFile; fileRef = F44A24C711964AE900C60F2D /* XspfMLabelField.m */; };
 		F44A24D911964AE900C60F2D /* XspfMRule_NSExpressionFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = F44A24C811964AE900C60F2D /* XspfMRule_NSExpressionFunctions.m */; };
@@ -723,7 +725,6 @@
 		F4FEF9E40AFF89A00099853B /* BSDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F41308B10A8E279300740620 /* BSDownloadTask.m */; };
 		F4FEF9E50AFF89A10099853B /* BSThreadsListOPTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F41308B90A8E27A400740620 /* BSThreadsListOPTask.m */; };
 		F4FEF9E60AFF89A30099853B /* BSThreadListUpdateTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F411498409DABFD500DDF200 /* BSThreadListUpdateTask.h */; };
-		F4FEF9E90AFF89A60099853B /* BSBoardListItemHEADCheckTask.m in Sources */ = {isa = PBXBuildFile; fileRef = F486FC640A8F69EA00D44828 /* BSBoardListItemHEADCheckTask.m */; };
 		F4FEF9EA0AFF89A80099853B /* DatabaseManager-DatabaseAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = F47A66D70AFF808D00EB5137 /* DatabaseManager-DatabaseAccess.m */; };
 		F4FEF9EB0AFF89A80099853B /* BoardListItem.m in Sources */ = {isa = PBXBuildFile; fileRef = F47A66C60AFF807100EB5137 /* BoardListItem.m */; };
 		F4FEF9EC0AFF89A90099853B /* BSBoardListItemHEADCheckTask.h in Headers */ = {isa = PBXBuildFile; fileRef = F486FC630A8F69EA00D44828 /* BSBoardListItemHEADCheckTask.h */; };
@@ -1512,6 +1513,8 @@
 		F4369C0C0AFF7CFC005ABD68 /* libsqlite.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsqlite.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		F437FD661199AF3B00D078FB /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Japanese; path = Resources/Japanese.lproj/SmartBoardItemEditor.xib; sourceTree = "<group>"; };
 		F440D7310C315929000458FF /* DatabaseManager-Notifications.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "DatabaseManager-Notifications.m"; sourceTree = "<group>"; };
+		F4458B3415A876580096B358 /* BSSmartBoardUpdateTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BSSmartBoardUpdateTask.h; sourceTree = "<group>"; };
+		F4458B3515A876580096B358 /* BSSmartBoardUpdateTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BSSmartBoardUpdateTask.m; sourceTree = "<group>"; };
 		F44A24C611964AE900C60F2D /* XspfMLabelField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XspfMLabelField.h; sourceTree = "<group>"; };
 		F44A24C711964AE900C60F2D /* XspfMLabelField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XspfMLabelField.m; sourceTree = "<group>"; };
 		F44A24C811964AE900C60F2D /* XspfMRule_NSExpressionFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XspfMRule_NSExpressionFunctions.m; sourceTree = "<group>"; };
@@ -2221,6 +2224,8 @@
 				F41308B10A8E279300740620 /* BSDownloadTask.m */,
 				F411498409DABFD500DDF200 /* BSThreadListUpdateTask.h */,
 				F411498509DABFD500DDF200 /* BSThreadListUpdateTask.m */,
+				F4458B3415A876580096B358 /* BSSmartBoardUpdateTask.h */,
+				F4458B3515A876580096B358 /* BSSmartBoardUpdateTask.m */,
 				F324DC4804C698FA00A80005 /* CMRThreadsList.h */,
 				F324DC4A04C698FA00A80005 /* CMRThreadsList_p.h */,
 				F324DC4904C698FA00A80005 /* CMRThreadsList.m */,
@@ -3418,6 +3423,7 @@
 				8715AAA81477FB6A00135078 /* BSLastUpdatedHeaderCell.h in Headers */,
 				87F1EF001514E1C500B5FDEE /* BSThreadsListDataSource.h in Headers */,
 				F4C45F59154CDB9900D00D27 /* BSThreadListTask.h in Headers */,
+				F4458B3615A876580096B358 /* BSSmartBoardUpdateTask.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4007,7 +4013,6 @@
 				F473637B0AFF8758009B6189 /* BSAsciiArtDetector.m in Sources */,
 				F4FEF9E40AFF89A00099853B /* BSDownloadTask.m in Sources */,
 				F4FEF9E50AFF89A10099853B /* BSThreadsListOPTask.m in Sources */,
-				F4FEF9E90AFF89A60099853B /* BSBoardListItemHEADCheckTask.m in Sources */,
 				F4FEF9EA0AFF89A80099853B /* DatabaseManager-DatabaseAccess.m in Sources */,
 				F4FEF9EB0AFF89A80099853B /* BoardListItem.m in Sources */,
 				F4FEF9ED0AFF89AB0099853B /* FolderBoardListItem.m in Sources */,
@@ -4104,6 +4109,7 @@
 				87D119AC13D1D2B900D57AFC /* BSAppResetPanelController.m in Sources */,
 				8715AAA91477FB6A00135078 /* BSLastUpdatedHeaderCell.m in Sources */,
 				F4C45F5A154CDB9900D00D27 /* BSThreadListTask.m in Sources */,
+				F4458B3715A876580096B358 /* BSSmartBoardUpdateTask.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/application/source/bbs/BoardListItem/FavoritesBoardListItem.h
+++ b/application/source/bbs/BoardListItem/FavoritesBoardListItem.h
@@ -13,7 +13,6 @@
 @interface FavoritesBoardListItem : AbstractDBBoardListItem
 {
 	id <SQLiteCursor> items;
-	BOOL dirty;
 }
 
 + (id) sharedInstance;

--- a/application/source/bbs/BoardListItem/FavoritesBoardListItem.m
+++ b/application/source/bbs/BoardListItem/FavoritesBoardListItem.m
@@ -12,19 +12,12 @@
 
 #import "DatabaseManager.h"
 #import "CMRBBSListTemplateKeys.h"
-#import "CMRFavoritesManager.h"
 #import <SGAppKit/NSImage-SGExtensions.h>
 
-@interface FavoritesBoardListItem (BSPrivate)
-- (void) favoritesManagerDidChange : (id) notification;
-- (void) setDirty : (BOOL) inDirty;
-- (BOOL) dirty;
-- (void) registerToNotificationCenter;
-@end
 
 @implementation FavoritesBoardListItem
 //APP_SINGLETON_FACTORY_METHOD_IMPLEMENTATION(sharedInstance) ;
-+ (id) sharedInstance
++ (id)sharedInstance
 {
 	static id _sharedInstance = nil;
 	
@@ -35,29 +28,28 @@
 	return _sharedInstance;
 }
 
-- (id) init
+- (id)init
 {
 	if (self = [super init]) {
-		[self registerToNotificationCenter];
 		NSString *query;
 	   	query = [NSString stringWithFormat:@"SELECT * FROM %@ INNER JOIN %@ USING(%@, %@)",
 			BoardThreadInfoViewName, FavoritesTableName, BoardIDColumn, ThreadIDColumn];
-		[self setQuery : query];
+		[self setQuery:query];
 	}
 
 	return self;
 }
 
-- (id) retain { return self; }
-- (oneway void) release {}
-- (NSUInteger) retainCount { return NSUIntegerMax; }
+- (id)retain { return self; }
+- (oneway void)release {}
+- (NSUInteger)retainCount { return NSUIntegerMax; }
 
 - (BOOL)isEqual:(id)other
 {
 	return (self == other);
 }
 
-- (NSImage *) icon
+- (NSImage *)icon
 {
 	return [NSImage imageAppNamed:[self iconBaseName]];
 }
@@ -67,78 +59,25 @@
     return @"FavoritesItem";
 }
 
-- (NSString *) name
+- (NSString *)name
 {
 	return CMXFavoritesDirectoryName;
 }
-- (void) setName : (NSString *) newName
+- (void)setName:(NSString *)newName
 {
 	//
 }
 
-- (id <SQLiteCursor>) cursorForThreadList
-{
-	if(!items || [self dirty]) {
-		items = [super cursorForThreadList];
-	}
-	
-	return items;
-}
-
-- (void) favoritesManagerDidChange : (id) notification
-{
-	UTILAssertNotificationObject(
-								 notification,
-								 [CMRFavoritesManager defaultManager]);
-	[self setDirty : YES];
-}
-- (void) setDirty : (BOOL) inDirty
-{
-	if((dirty && inDirty) || (!dirty && !inDirty)) return;
-	
-	dirty = inDirty;
-}
-- (BOOL) dirty
-{
-	return dirty;
-}
-
-#pragma mark## Notifications ##
-- (void) registerToNotificationCenter
-{
-	[[NSNotificationCenter defaultCenter]
-	     addObserver : self
-	        selector : @selector(favoritesManagerDidChange:)
-	            name : CMRFavoritesManagerDidLinkFavoritesNotification
-	          object : [CMRFavoritesManager defaultManager]];
-	[[NSNotificationCenter defaultCenter]
-	     addObserver : self
-	        selector : @selector(favoritesManagerDidChange:)
-	            name : CMRFavoritesManagerDidRemoveFavoritesNotification
-	          object : [CMRFavoritesManager defaultManager]];
-}
-- (void) removeFromNotificationCenter
-{
-	id nc = [NSNotificationCenter defaultCenter];
-	
-	[nc removeObserver : self
-				  name : CMRFavoritesManagerDidLinkFavoritesNotification
-				object : [CMRFavoritesManager defaultManager]];
-	[nc removeObserver : self
-				  name : CMRFavoritesManagerDidRemoveFavoritesNotification
-				object : [CMRFavoritesManager defaultManager]];
-}
-
 #pragma mark## CMRPropertyListCoding protocol ##
-//+ (id) objectWithPropertyListRepresentation : (id) rep
+//+ (id)objectWithPropertyListRepresentation:(id)rep
 //{
-//	return [[[self alloc] initWithPropertyListRepresentation : rep] autorelease];
+//	return [[[self alloc] initWithPropertyListRepresentation:rep] autorelease];
 //}
-- (id) propertyListRepresentation
+- (id)propertyListRepresentation
 {
 	return [self name];
 }
-- (id) initWithPropertyListRepresentation : (id) rep
+- (id)initWithPropertyListRepresentation:(id)rep
 {
 	[self release];
 	

--- a/application/source/browser/BSDBThreadList.m
+++ b/application/source/browser/BSDBThreadList.m
@@ -15,7 +15,8 @@
 #import "CMRThreadSignature.h"
 #import "BSThreadListUpdateTask.h"
 #import "BSThreadsListOPTask.h"
-#import "BSBoardListItemHEADCheckTask.h"
+//#import "BSBoardListItemHEADCheckTask.h"
+#import "BSSmartBoardUpdateTask.h"
 #import "BoardListItem.h"
 #import "DatabaseManager.h"
 #import "BSThreadListItem.h"
@@ -937,28 +938,16 @@ static NSString *labelNameForCode(NSUInteger num)
 	}
 	[mTaskLock unlock];
 	
+	Class dlTaskClass = Nil;
 	if ([self isFavorites] || [self isSmartItem]) {
-		if (forceDL) {
-            // 更新チェックの回数上限に達している場合ここでブロックする
-            NSError *error;
-            if (![[CMRFavoritesManager defaultManager] canHEADCheck:&error]) {
-                NSAlert *alert = [NSAlert alertWithError:error];
-                [alert runModal];
-                return;
-            }
-			[mTaskLock lock];
-			mTask = [[BSBoardListItemHEADCheckTask alloc] initWithThreadList:self];
-			[self pushIfCanExcute:mTask];
-			[mTaskLock unlock];
-		} else {
-			[self updateCursor];
-		}
+		dlTaskClass = [BSSmartBoardUpdateTask class];
 	} else {
-		[mTaskLock lock];
-		mTask = [[BSThreadsListOPTask alloc] initWithThreadList:self forceDownload:forceDL rebuild:flag];
-		[self pushIfCanExcute:mTask];
-		[mTaskLock unlock];
+		dlTaskClass = [BSThreadsListOPTask class];
 	}
+	[mTaskLock lock];
+	mTask = [[dlTaskClass alloc] initWithThreadList:self forceDownload:forceDL rebuild:flag];
+	[self pushIfCanExcute:mTask];
+	[mTaskLock unlock];
 }
 
 - (void)doLoadThreadsList:(CMRThreadLayout *)worker

--- /dev/null
+++ b/application/source/browser/BSSmartBoardUpdateTask.h
@@ -0,0 +1,29 @@
+//
+//  BSSmartBoardUpdateTask.h
+//  BathyScaphe
+//
+//  Created by 堀 昌樹 on 12/07/07.
+//  Copyright (c) 2012年 __MyCompanyName__. All rights reserved.
+//
+
+#import "BSThreadListTask.h"
+#import "BSDBThreadList.h"
+#import "BoardListItem.h"
+
+@interface BSSmartBoardUpdateTask : BSThreadListTask
+{
+	BSDBThreadList *_targetList;
+	BoardListItem *_item;
+	BOOL forceDL;
+	
+	id <SQLiteCursor> _targetThreads;
+	
+	NSMutableSet *_boards;
+	NSMutableDictionary *_updateData;
+}
+
+// rebuild flag is never use.
++ (id)taskWithThreadList:(BSDBThreadList *)list forceDownload:(BOOL)forceDL rebuild:(BOOL)flag;
+- (id)initWithThreadList:(BSDBThreadList *)list forceDownload:(BOOL)forceDL rebuild:(BOOL)flag;
+
+@end

--- /dev/null
+++ b/application/source/browser/BSSmartBoardUpdateTask.m
@@ -0,0 +1,295 @@
+//
+//  BSSmartBoardUpdateTask.m
+//  BathyScaphe
+//
+//  Created by 堀 昌樹 on 12/07/07.
+//  Copyright (c) 2012年 __MyCompanyName__. All rights reserved.
+//
+
+#import "BSSmartBoardUpdateTask.h"
+
+#import <CocoaOniguruma/OnigRegexp.h>
+
+#import "AppDefaults.h"
+#import "CMRFavoritesManager.h"
+#import "BoardManager.h"
+#import "CMRHostHandler.h"
+#import "CMXTextParser.h"
+#import "BSDownloadTask.h"
+#import "DatabaseManager.h"
+
+@interface BSSmartBoardUpdateTask ()
+@property (assign) BSDBThreadList *targetList;
+@property (retain) BoardListItem *item;
+@end
+
+@implementation BSSmartBoardUpdateTask
+@synthesize targetList = _targetList;
+@synthesize item = _item;
+
+
++ (id)taskWithThreadList:(BSDBThreadList *)list forceDownload:(BOOL)forceDL rebuild:(BOOL)flag
+{
+	return [[[[self class] alloc] initWithThreadList:list forceDownload:forceDL rebuild:flag] autorelease];
+}
+- (id)initWithThreadList:(BSDBThreadList *)list forceDownload:(BOOL)inForceDL rebuild:(BOOL)flag
+{
+	self = [super init];
+	if(self) {
+		forceDL = inForceDL;
+		_boards = [[NSMutableSet alloc] init];
+		_updateData = [[NSMutableDictionary alloc] init];
+		self.targetList = list;
+		self.item = [list boardListItem];
+		if(!([self.item type] & (BoardListFavoritesItem | BoardListSmartBoardItem))) {
+			[self autorelease];
+			return nil;
+		}
+		
+		[[NSNotificationCenter defaultCenter] addObserver:self
+												 selector:@selector(downloadFail:)
+													 name:BSDownloadTaskFailDownloadNotification
+												   object:nil];
+	}
+	return self;
+}
+
+- (void)dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	
+	[_boards release];
+	[_updateData release];
+	[_item release];
+	[_targetThreads release];
+	
+	[super dealloc];
+}
+
++ (OnigRegexp *)regex
+{
+	static OnigRegexp *sRegexp = nil;
+    if (!sRegexp) {
+        sRegexp = [OnigRegexp compile:[NSString stringWithFormat:@"(\\d+)[^,<>]*(?:<>|,).*\\s*(?:\\(|<>|%C)(\\d+)",0xFF08]];
+        [sRegexp retain];
+    }
+    return sRegexp;
+}
+- (OnigRegexp *)regex
+{
+	return [[self class] regex];
+}
+
+- (void)downloadFail:(NSNotification *)notification
+{
+	NSError *error = [[notification userInfo] objectForKey:BSDownloadTaskErrorObjectKey];
+	[NSApp presentError:error]; 
+}
+
+- (void)playFinishSoundIsUpdate:(BOOL)isUpDate
+{
+	NSSound *finishedSound_ = nil;
+	NSString *soundName_ = [CMRPref HEADCheckNewArrivedSound];
+	
+	if (isUpDate && ![soundName_ isEqualToString:@""]) {
+		finishedSound_ = [NSSound soundNamed:soundName_];
+	} else {
+		soundName_ = [CMRPref HEADCheckNoUpdateSound];
+		if (![soundName_ isEqualToString:@""]) {
+			finishedSound_ = [NSSound soundNamed:soundName_];
+        }
+	}
+	[finishedSound_ play];
+}
+
+
+
+- (void)collectTargetBoards
+{
+	_targetThreads = [[self.item cursorForThreadList] retain];
+	for(NSUInteger row = 0, rowCount = [_targetThreads rowCount]; row < rowCount; row++) {
+		if(self.isInterrupted) return;
+		
+		id boardName = [_targetThreads valueForColumn:BoardNameColumn atRow:row];
+		if(boardName && ![boardName isKindOfClass:[NSNull class]]) {
+			[_boards addObject:boardName];
+		}
+	}
+	
+	fprintf(stderr, "Board number are %ld\n", [_boards count]);
+//	NSLog(@"collected board names \n%@", _boards);
+}
+
+static BOOL isBoardLivedoor(NSURL *boardURL)
+{
+	const char *host = NULL;
+	CMRGetHostCStringFromBoardURL(boardURL, &host);
+	return host ? is_jbbs_livedoor(host) : NO;
+}
+- (void)collectUpdateInformation
+{
+	NSString *dlFormat = NSLocalizedString(@"Downloding subject.txt of %@", nil);
+	
+	dispatch_queue_t downloadQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
+	NSArray *boardNames = [_boards allObjects];
+	dispatch_apply([boardNames count], downloadQueue, ^(size_t index) {
+		if(self.isInterrupted) return;
+		
+		NSString *boardName = [boardNames objectAtIndex:index];
+		
+		self.message = [NSString stringWithFormat:dlFormat, boardName];
+		
+		NSURL *boardURL = [[BoardManager defaultManager] URLForBoardName:boardName];
+		if (!boardURL) {
+			NSLog(@"Can NOT create url from bbs named %@.",boardName);
+			return;
+		}
+		NSURL *subjectURL = [NSURL URLWithString:CMRAppSubjectTextFileName relativeToURL:boardURL];
+		NSArray *subjectLines = nil;
+		BSDownloadTask *dlTask = [[BSDownloadTask alloc] initWithURL:subjectURL];
+		{
+			[dlTask synchronousDownLoad];
+			NSData *subjectData = [dlTask receivedData];
+			if(!subjectData || [subjectData length] == 0) return;
+			
+			CMRHostHandler *handler = [CMRHostHandler hostHandlerForURL:boardURL];
+			if (!handler) {
+				NSLog(@"Can NOT create host handler from url %@.",boardURL);
+				return;
+			}
+			CFStringEncoding enc = [handler subjectEncoding];
+			NSString *subjectString = [CMXTextParser stringWithData:subjectData CFEncoding:enc];
+			subjectLines = [subjectString componentsSeparatedByNewline];
+		}
+		[dlTask release];
+		
+		BOOL isLivedoor = isBoardLivedoor(boardURL);
+		NSMutableArray *dats = [NSMutableArray array];
+		
+		if(self.isInterrupted) return;
+		
+		NSMutableDictionary *infos = [NSMutableDictionary dictionary];
+		for(NSString *line in subjectLines) {
+			if(self.isInterrupted) return;
+			
+			OnigResult *match = [[self regex] search:line];
+			NSString *datString = [match stringAt:1];
+			NSString *numString = [match stringAt:2];
+			if(!numString) continue;
+			
+			if(isLivedoor) {
+				if([dats containsObject:datString]) continue;
+				[dats addObject:datString];
+			}
+			
+			[infos setObject:numString forKey:datString];
+		}
+		@synchronized(_updateData) {
+			[_updateData setObject:infos forKey:boardName];
+		}
+	});
+//	if(self.isInterrupted) return;
+//	NSLog(@"Collected informations \n%@", _updateData);
+}
+
+static inline BOOL isNSNullOrNil(id obj)
+{
+	if(!obj) return YES;
+	if([obj isKindOfClass:[NSNull class]]) return YES;
+	return NO;
+}
+static inline id nilIfObjectIsNSNull(id obj)
+{
+	return (obj == [NSNull null]) ? nil : obj;
+}
+static inline BOOL isUpdatedThread(NSInteger readCount, NSString *numString, NSInteger currentCount)
+{
+	return (readCount != 0 && !isNSNullOrNil(numString) && currentCount < [numString integerValue]);
+}
+- (void)updateDB
+{
+    BOOL isUpdate = NO;
+	
+	SQLiteDB *db = [[DatabaseManager defaultManager] databaseForCurrentThread];
+	NSString *queryString = [NSString stringWithFormat:@"UPDATE OR IGNORE %@ SET %@ = ?, %@ = ? WHERE %@ = ? AND %@ = ?",
+							 ThreadInfoTableName,
+							 NumberOfAllColumn,
+							 ThreadStatusColumn,// ThreadUpdatedStatus,
+							 BoardIDColumn, ThreadIDColumn];
+	SQLiteReservedQuery *query = [[SQLiteReservedQuery alloc] initWithQuery:queryString usingSQLiteDB:db];
+	
+	[db beginTransaction];
+	for(NSUInteger index = 0, rowCount = [_targetThreads rowCount]; index < rowCount; index++) {
+		if(self.isInterrupted) {
+			[db rollbackTransaction];
+			return;
+		}
+		id<SQLiteRow> row = [_targetThreads rowAtIndex:index];
+		
+		NSInteger status = [nilIfObjectIsNSNull([row valueForColumn:ThreadStatusColumn]) integerValue];
+		BOOL isNew = (status & ThreadNewCreatedStatus) == ThreadNewCreatedStatus;
+		NSInteger readCount = [nilIfObjectIsNSNull([row valueForColumn:NumberOfReadColumn]) integerValue];
+		if(!isNew && readCount == 0) continue;
+		NSString *boardName = [row valueForColumn:BoardNameColumn];
+		if(isNSNullOrNil(boardName)) continue;
+		NSString *datString = [row valueForColumn:ThreadIDColumn];
+		if(isNSNullOrNil(datString)) continue;
+		NSString *boardID = [row valueForColumn:BoardIDColumn];
+		if(isNSNullOrNil(boardID)) continue;
+		NSInteger currentCount = [nilIfObjectIsNSNull([row valueForColumn:NumberOfAllColumn]) integerValue];
+		NSString *numString = nil;
+		
+		NSDictionary *infoForBoard = [_updateData objectForKey:boardName];
+		numString = [infoForBoard objectForKey:datString];		
+		if(isUpdatedThread(readCount, numString, currentCount)) {
+			[query cursorWithFormat:"siss", numString, ThreadUpdatedStatus, boardID, datString];
+			isUpdate = YES;
+		} else if(isNew) {
+			[query cursorWithFormat:"iiss", currentCount, ThreadNoCacheStatus, boardID, datString];
+//			isUpdate = YES;
+		}
+		
+	}
+	[db commitTransaction];
+	
+	[self playFinishSoundIsUpdate:isUpdate];
+}
+
+- (void)excute
+{
+	if(!forceDL) {
+		if(self.isInterrupted) return;
+		[self.targetList updateCursor];
+		return;
+	}
+	// 更新チェックの回数上限に達している場合ここでブロックする
+	NSError *error = nil;
+	if (![[CMRFavoritesManager defaultManager] canHEADCheck:&error]) {
+		NSAlert *alert = [NSAlert alertWithError:error];
+		[alert runModal];
+		return;
+	}
+	
+	NSLog(@"Begin update");
+	// Boardを収集
+	self.message = NSLocalizedString(@"Collecting Board informations.", nil);
+	[self collectTargetBoards];
+	if(self.isInterrupted) return;
+	
+	// 各Boardのsubject.txtを取得
+	self.message = NSLocalizedString(@"Download subject.txt.", nil);
+    [self collectUpdateInformation];
+	if(self.isInterrupted) return;
+	
+	// 各subject.txtからDBをupdate
+	self.message = NSLocalizedString(@"Update database.", nil);
+	[self updateDB];
+	
+	[[CMRFavoritesManager defaultManager] decrementHEADCheckCount];
+	
+	if(self.isInterrupted) return;
+	[self.targetList updateCursor];
+	NSLog(@"End update");
+}
+
+@end

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,17 @@
[phone] masakih <[e-mail]>
+	* application/BathyScaphe.xcodeproj/project.pbxproj:
+	* application/source/browser/BSSmartBoardUpdateTask.h:
+	* application/source/browser/BSSmartBoardUpdateTask.m:
+		[新規追加] お気に入り、スマート掲示板更新タスク。
+		subject.txtを使用し、対象スレッドのレス数を更新する。
+		対象スレッドの新着フラグをすべて外す。
+		更新回数制限をチェック。
+	* application/source/browser/BSDBThreadList.m:
+		BSSmartBoardUpdateTaskを使うようにした。
+		更新回数制限チェックはBSSmartBoardUpdateTaskにて行うようにした。
+	* application/source/bbs/BoardListItem/FavoritesBoardListItem.m:
+	* application/source/bbs/BoardListItem/FavoritesBoardListItem.h:
+		データのキャッシュを行わないようにした。
 ================================================= 2.2(v335) / Baby universe day / svn Tag : v220_FINAL
 2012-07-20 tsawada2 <[e-mail]>
 	* changelog.txt