Commit: e9e7cdedf9e5412fbce49efd2ba2a4a1ad8fdd63 - BooksExporter (git)

iSightを使ってBooklog,MediaMarkerインポート用CSVファイルを生成するアプリ

Commit MetaInfo

• Revision: e9e7cdedf9e5412fbce49efd2ba2a4a1ad8fdd63 (tree)
• Time: 2011-04-10 09:11:52
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Mod] 開くサイトをUserDefaultsに保存するようにした。

Change Summary

• modified: BEExporterAttribute.m
• modified: BEGeneralPreference.m
• modified: BEPreference.h
• modified: BEPreference.m
• modified: BERegisterSite.m

Incremental Difference

--- a/BEExporterAttribute.m
+++ b/BEExporterAttribute.m
@@ -37,10 +37,7 @@ static NSArray *attributes = nil;
 	while((aType = types[i++]) != NSUIntegerMax) {
 		//
 		BEExporterAttribute *attr = [[[BEExporterAttribute alloc] init] autorelease];
-		attr.type = aType;
-		// restore from UserDefaults
-#warning MUST IMPLEMENT
-		
+		attr.type = aType;		
 		if(!attr.site) {
 			attr.site = [[BERegisterSite sites] objectAtIndex:0];
 		}
@@ -100,4 +97,12 @@ static NSArray *attributes = nil;
 	[aCoder encodeBool:isOpenAfterExport forKey:@"BEExpoterIsOpenAfterExport"];
 	[aCoder encodeObject:site forKey:@"BEExporterSite"];
 }
+
+
+- (id)description
+{
+	return [NSString stringWithFormat:
+			@"Type->%d, open->%@, Site->%@",
+			type, isOpenAfterExport ? @"YES":@"NO", site];
+}
 @end

--- a/BEGeneralPreference.m
+++ b/BEGeneralPreference.m
@@ -12,6 +12,11 @@
 #import "BEExporterAttribute.h"
 
 
+@interface BEGeneralPreference (BEPrivate)
+- (void)restoreAttributes;
+- (void)setSelection:(id)newSelection;
+@end
+
 @implementation BEGeneralPreference
 
 - (id)init
@@ -20,12 +25,8 @@
 	if(self) {
 		[self setTitle:NSLocalizedString(@"General", @"General")];
 		sites = [[BERegisterSite sites] retain];
-		attributes = [[BEExporterAttribute attribtues] retain];
-		selection = [BEPreference preference].openSite;
-		if(!selection) {
-			selection = [attributes objectAtIndex:0];
-		}
-		[selection retain];
+		[self restoreAttributes];
+		[self setSelection:[attributes objectAtIndex:0]];
 	}
 	return self;
 }
@@ -33,18 +34,56 @@
 {
 	[sites release];
 	[attributes release];
-	[selection retain];
+	[self setSelection:nil];
 	[super dealloc];
 }
 
+- (void)restoreAttributes
+{
+	NSArray *stored = [BEPreference preference].attributes;
+	if(!stored) {
+		attributes = [[BEExporterAttribute attribtues] retain];
+		return;
+	}
+	
+	NSArray *origin = [BEExporterAttribute attribtues];
+	if([origin isEqual:stored]) {
+		attributes = [stored retain];
+		return;
+	}
+	
+	NSMutableArray *array = [stored mutableCopy];
+	for(id obj in origin) {
+		if(![array containsObject:obj]) {
+			[array addObject:obj];
+		}
+	}
+	attributes = [[NSArray alloc] initWithArray:array];
+}
+
+
 - (void)setSelection:(id)newSelection
 {
 	if(selection == newSelection) return;
+	
+	if(selection) {
+		[selection removeObserver:self forKeyPath:@"isOpenAfterExport"];
+		[selection removeObserver:self forKeyPath:@"site"];
+	}		
 	id temp = selection;
 	selection = [newSelection retain];
 	[temp release];
 	
-	[BEPreference preference].openSite = selection;
+	[selection addObserver:self forKeyPath:@"isOpenAfterExport" options:0 context:NULL];
+	[selection addObserver:self forKeyPath:@"site" options:0 context:NULL];
+}
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+	if(![keyPath isEqualToString:@"isOpenAfterExport"] && ![keyPath isEqualToString:@"site"]) {
+		return [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+	}
+	
+	[BEPreference preference].attributes = attributes;
 }
 
 - (NSString *)iconName

--- a/BEPreference.h
+++ b/BEPreference.h
@@ -12,13 +12,9 @@
 extern NSString *const BEOpenAfterExported;	// NSNumber of BOOL.
 extern NSString *const BEOpenSite;	// BERegisterSite.
 
-
-@class BERegisterSite;
-
 @interface BEPreference : NSObject
 
 + (BEPreference *)preference;
 
-@property (getter=isOpenAfterExport) BOOL openAfterExport;
-@property (nonatomic, retain) BERegisterSite *openSite;
+@property (nonatomic, retain) NSArray *attributes;
 @end

--- a/BEPreference.m
+++ b/BEPreference.m
@@ -12,7 +12,7 @@
 NSString *const BEOpenAfterExported = @"openAfterExported";
 NSString *const BEOpenSite = @"targetSite";
 
-
+static NSString *const BESiteOpenAttributes = @"SiteOpenAttributes";
 
 @implementation BEPreference
 static BEPreference *sharedInstance = nil;
@@ -36,25 +36,16 @@ static BEPreference *sharedInstance = nil;
 	[ud setObject:object forKey:key];
 }
 
-- (BOOL)isOpenAfterExport
-{
-	id val = [self objectForKey:BEOpenAfterExported];
-	return [val boolValue];
-}
-- (void)setOpenAfterExport:(BOOL)flag
+- (NSArray *)attributes
 {
-	[self setObject:[NSNumber numberWithBool:flag]
-			 forKey:BEOpenAfterExported];
-}
-
-- (BERegisterSite *)openSite
-{
-	id data = [self objectForKey:BEOpenSite];
+	NSData *data = [self objectForKey:BESiteOpenAttributes];
+	if(!data) return nil;
 	return [NSKeyedUnarchiver unarchiveObjectWithData:data];
 }
-- (void)setOpenSite:(BERegisterSite *)site
+- (void)setAttributes:(NSArray *)attributes
 {
-	id data = [NSKeyedArchiver archivedDataWithRootObject:site];
-	[self setObject:data forKey:BEOpenSite];
+	NSData *data = [NSKeyedArchiver archivedDataWithRootObject:attributes];
+	[self setObject:data forKey:BESiteOpenAttributes];
 }
+
 @end

--- a/BERegisterSite.m
+++ b/BERegisterSite.m
@@ -130,4 +130,11 @@ static NSArray *sSites = nil;
 	[aCoder encodeObject:account forKey:@"account"];
 }
 
+- (id)description
+{
+	return [NSString stringWithFormat:
+			@"Name->%@, Home->%@, Reg->%@, id->%@, ac->%@",
+			name, home, registerPage, needID, account];
+}
+
 @end