Commit: a5834c348c167ec8d93cd079dad2ed11fc4d76c9 - BooksExporter (git)

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

Commit MetaInfo

• Revision: a5834c348c167ec8d93cd079dad2ed11fc4d76c9 (tree)
• Time: 2011-03-01 23:43:02
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[Mod] 登録データをCoreDataで保存するようにした。

Change Summary

• modified: BEApplicationDelegate.h
• modified: BEApplicationDelegate.m
• modified: BEBookInformation.h
• modified: BEBookInformation.m
• modified: BEMainWindowController.m
• add: BooksExporter.xcdatamodel/elements
• add: BooksExporter.xcdatamodel/layout
• modified: BooksExporter.xcodeproj/project.pbxproj
• modified: English.lproj/BEMainWindow.xib

Incremental Difference

--- a/BEApplicationDelegate.h
+++ b/BEApplicationDelegate.h
@@ -12,7 +12,13 @@
 
 @interface BEApplicationDelegate : NSObject
 {
+	NSPersistentStoreCoordinator *persistentStoreCoordinator;
+    NSManagedObjectModel *managedObjectModel;
+    NSManagedObjectContext *managedObjectContext;
+	
 	BEMainWindowController *mainWindowContoller;
 }
 
+- (NSManagedObjectContext *)managedObjectContext;
+
 @end

--- a/BEApplicationDelegate.m
+++ b/BEApplicationDelegate.m
@@ -10,6 +10,168 @@
 
 
 @implementation BEApplicationDelegate
+/**
+ Returns the support folder for the application, used to store the Core Data
+ store file.  This code uses a folder named "XspfManager" for
+ the content, either in the NSApplicationSupportDirectory location or (if the
+ former cannot be found), the system's temporary directory.
+ */
+
+- (NSString *)applicationSupportFolder
+{
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+	NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory();
+	return [basePath stringByAppendingPathComponent:@"BooksExporter"];
+}
+
+/**
+ Creates, retains, and returns the managed object model for the application 
+ by merging all of the models found in the application bundle.
+ */
+
+- (NSManagedObjectModel *)managedObjectModel
+{
+	if(managedObjectModel != nil) {
+		return managedObjectModel;
+	}
+	
+	managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
+	//	HMLog(HMLogLevelDebug, @"ManagedObjectModel -> %@", managedObjectModel);
+	return managedObjectModel;
+}
+
+- (NSURL *)storeURL
+{
+	NSFileManager *fileManager;
+	NSString *applicationSupportFolder = nil;
+	NSURL *url;
+	
+	fileManager = [NSFileManager defaultManager];
+	applicationSupportFolder = [self applicationSupportFolder];
+	if(![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL]) {
+		[fileManager createDirectoryAtPath:applicationSupportFolder attributes:nil];
+	}
+	
+	url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"BooksExporter.qdb"]];
+	
+	return url;
+}
+
+/**
+ Returns the persistent store coordinator for the application.  This 
+ implementation will create and return a coordinator, having added the 
+ store for the application to it.  (The folder for the store is created, 
+ if necessary.)
+ */
+
+- (NSPersistentStoreCoordinator *)persistentStoreCoordinator
+{
+	if(persistentStoreCoordinator != nil) {
+		return persistentStoreCoordinator;
+	}
+	
+	NSError *error;
+    
+	NSURL *url = [self storeURL];
+	
+	persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: [self managedObjectModel]];
+	if(!persistentStoreCoordinator) {
+		NSLog(@"Could not create store coordinator");
+		exit(-1);
+	}
+	
+	NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
+							 [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
+							 nil];
+	
+	if(![persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:url options:options error:&error]){
+		[[NSApplication sharedApplication] presentError:error];
+		NSLog(@"Error -> %@", error);// localizedDescription]);
+	}
+	
+	return persistentStoreCoordinator;
+}
+
+
+/**
+ Returns the managed object context for the application (which is already
+ bound to the persistent store coordinator for the application.) 
+ */
+
+- (NSManagedObjectContext *)managedObjectContext
+{
+	if(managedObjectContext != nil) {
+		return managedObjectContext;
+	}
+	
+	NSPersistentStoreCoordinator *coordinator = [self persistentStoreCoordinator];
+	if(coordinator != nil) {
+		managedObjectContext = [[NSManagedObjectContext alloc] init];
+		[managedObjectContext setPersistentStoreCoordinator: coordinator];
+	}
+	
+	return managedObjectContext;
+}
+
+
+/**
+ Performs the save action for the application, which is to send the save:
+ message to the application's managed object context.  Any encountered errors
+ are presented to the user.
+ */
+
+- (IBAction)saveAction:(id)sender
+{
+	NSError *error = nil;
+	if(![[self managedObjectContext] save:&error]) {
+		[[NSApplication sharedApplication] presentError:error];
+	}
+}
+
+
+/**
+ Implementation of the applicationShouldTerminate: method, used here to
+ handle the saving of changes in the application managed object context
+ before the application terminates.
+ */
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+	NSError *error;
+	NSUInteger reply = NSTerminateNow;
+	
+	if(managedObjectContext != nil) {
+		if([managedObjectContext commitEditing]) {
+			if([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
+				
+                // This error handling simply presents error information in a panel with an 
+                // "Ok" button, which does not include any attempt at error recovery (meaning, 
+                // attempting to fix the error.)  As a result, this implementation will 
+                // present the information to the user and then follow up with a panel asking 
+                // if the user wishes to "Quit Anyway", without saving the changes.
+				
+                // Typically, this process should be altered to include application-specific 
+                // recovery steps.  
+				
+				BOOL errorResult = [[NSApplication sharedApplication] presentError:error];
+				
+				if(errorResult == YES) {
+					reply = NSTerminateCancel;
+				} else {
+					
+					NSInteger alertReturn = NSRunAlertPanel(nil, @"Could not save changes while quitting. Quit anyway?" , @"Quit anyway", @"Cancel", nil);
+					if(alertReturn == NSAlertAlternateReturn) {
+						reply = NSTerminateCancel;	
+					}
+				}
+			}
+		} else {
+			reply = NSTerminateCancel;
+		}
+	}
+	
+	return reply;
+}
 
 - (void)applicationDidFinishLaunching:(id)notification
 {

--- a/BEBookInformation.h
+++ b/BEBookInformation.h
@@ -9,24 +9,24 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface BEBookInformation : NSObject
+@interface BEBookInformation : NSManagedObject
 {
-	NSString *isbn;
-	NSString *category;
-	NSDate *registerDate;
-	NSArray *tags;
-	NSString *review;
-	NSNumber *rating;
-	NSNumber *status;
-	NSDate *readDate;
-	
-	NSString *title;
-	NSString *asin;
-	NSString *amazonISBN;
-	NSString *author;
-	NSString *manufacturer;
-	NSDate *publicationDate;
-	
+//	NSString *isbn;
+//	NSString *category;
+//	NSDate *registerDate;
+//	NSArray *tags;
+//	NSString *review;
+//	NSNumber *rating;
+//	NSNumber *status;
+//	NSDate *readDate;
+//	
+//	NSString *title;
+//	NSString *asin;
+//	NSString *amazonISBN;
+//	NSString *author;
+//	NSString *manufacturer;
+//	NSDate *publicationDate;
+//	
 	BOOL exported;
 }
 

--- a/BEBookInformation.m
+++ b/BEBookInformation.m
@@ -10,34 +10,65 @@
 
 
 @implementation BEBookInformation
-@synthesize isbn;
-@synthesize category;
-@synthesize registerDate;
-@synthesize tags;
-@synthesize review;
-@synthesize rating;
-@synthesize status;
-@synthesize readDate;
-
-@synthesize title;
-@synthesize asin;
-@synthesize amazonISBN;
-@synthesize author;
-@synthesize manufacturer;
-@synthesize publicationDate;
-
-@synthesize exported;
+@dynamic isbn;
+@dynamic category;
+@dynamic registerDate;
+@dynamic tags;
+@dynamic review;
+@dynamic rating;
+@dynamic status;
+@dynamic readDate;
+
+@dynamic title;
+@dynamic asin;
+@dynamic amazonISBN;
+@dynamic author;
+@dynamic manufacturer;
+@dynamic publicationDate;
+
+@dynamic exported;
+
+- (BOOL)primitiveExported
+{
+	return exported;
+}
+- (void)setPrimitiveExported:(BOOL)flag
+{
+	exported = flag;
+}
+- (BOOL)exported
+{
+	BOOL val;
+	[self willAccessValueForKey:@"exported"];
+	val = exported;
+	[self didChangeValueForKey:@"exported"];
+	return val;
+}
+- (void)setExported:(BOOL)flag
+{
+	[self willChangeValueForKey:@"exported"];
+	exported = flag;
+	[self didChangeValueForKey:@"exported"];
+}
 
 - (NSDate *)registerDate
 {
+	[self willAccessValueForKey:@"registerDate"];
+	NSDate *registerDate = [self primitiveValueForKey:@"registerDate"];
+	[self didAccessValueForKey:@"registerDate"];
 	if(registerDate) return registerDate;
 	registerDate = [[NSDate dateWithTimeIntervalSinceNow:0.0] retain];
+	[self setPrimitiveValue:registerDate forKey:@"registerDate"];
 	return registerDate;
 }
 - (NSDate *)readDate
 {
+	[self willAccessValueForKey:@"readDate"];
+	NSDate *readDate = [self primitiveValueForKey:@"readDate"];
+	[self didAccessValueForKey:@"readDate"];
 	if(readDate) return readDate;
 	readDate = [[NSDate dateWithTimeIntervalSinceNow:0.0] retain];
+	[self setPrimitiveValue:readDate forKey:@"readDate"];
 	return readDate;
 }
 
@@ -48,7 +79,8 @@
 		[formatter setDateFormat:@"yyyy-MM-dd"];
 		date = [formatter dateFromString:date];
 	}
-	[publicationDate autorelease];
-	publicationDate = [date retain];
+	[self willChangeValueForKey:@"publicationDate"];
+	[self setPrimitiveValue:date forKey:@"publicationDate"];
+	[self didChangeValueForKey:@"publicationDate"];
 }
 @end

--- a/BEMainWindowController.m
+++ b/BEMainWindowController.m
@@ -24,6 +24,23 @@
 	return self;
 }
 
+- (NSManagedObjectContext *)managedObjectContext
+{
+	return [[NSApp delegate] managedObjectContext];
+}
+
+- (void)lookupBooks:(NSArray *)array
+{
+	[BEAmazonLookup setNameToBooks:array];
+}
+
+- (void)awakeFromNib
+{
+	[books bind:NSManagedObjectContextBinding
+	   toObject:self
+	withKeyPath:@"managedObjectContext"
+		options:nil];
+}
 - (void)openiSightContinous:(BOOL)flag
 {
 	NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
@@ -114,18 +131,22 @@
 
 #pragma mark-
 #pragma mark Delegate 
-- (void)iSightWillClose {
+- (void)iSightWillClose
+{
 	[[self window] makeKeyAndOrderFront:self];
 }
-- (void)gotBarcode:(NSString *)barcode {
-	
-	BEBookInformation *book = [[[BEBookInformation alloc] init] autorelease];
+- (void)gotBarcode:(NSString *)barcode
+{
+	BEBookInformation *book = [NSEntityDescription insertNewObjectForEntityForName:[books entityName]
+															inManagedObjectContext:[books managedObjectContext]];
 	book.isbn = barcode;
-	[books addObject:book];
-	
 	if([self autoLookUp]) {
-		[BEAmazonLookup setNameToBooks:[books selectedObjects]];
+		[BEAmazonLookup setNameToBooks:[NSArray arrayWithObject:book]];
 	}
+	[books performSelector:@selector(setSelectedObjects:)
+				withObject:[NSArray arrayWithObject:book]
+				afterDelay:0.0001];
+	[books prepareContent];
 }
 
 @end

Binary files /dev/null and b/BooksExporter.xcdatamodel/elements differ

Binary files /dev/null and b/BooksExporter.xcdatamodel/layout differ

--- a/BooksExporter.xcodeproj/project.pbxproj
+++ b/BooksExporter.xcodeproj/project.pbxproj
@@ -51,6 +51,7 @@
 		F44EED9A131BD15300CAA969 /* BEBooklogBooksExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F44EED99131BD15300CAA969 /* BEBooklogBooksExporter.m */; };
 		F44EEE2B131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F44EEE2A131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m */; };
 		F4CD1387131D2384007788DC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4CD1385131D2384007788DC /* MainMenu.xib */; };
+		F4CD141F131D2ADF007788DC /* BooksExporter.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = F4CD141E131D2ADF007788DC /* BooksExporter.xcdatamodel */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -191,6 +192,7 @@
 		F44EEE29131BF48A00CAA969 /* BEMediaMarkerBooksExporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BEMediaMarkerBooksExporter.h; sourceTree = "<group>"; };
 		F44EEE2A131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BEMediaMarkerBooksExporter.m; sourceTree = "<group>"; };
 		F4CD1386131D2384007788DC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		F4CD141E131D2ADF007788DC /* BooksExporter.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = BooksExporter.xcdatamodel; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -376,6 +378,7 @@
 		29B97314FDCFA39411CA2CEA /* BarcodeScanner */ = {
 			isa = PBXGroup;
 			children = (
+				F4CD141B131D2A7B007788DC /* Models */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
@@ -437,6 +440,14 @@
 			name = BarcodeScanner;
 			sourceTree = "<group>";
 		};
+		F4CD141B131D2A7B007788DC /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				F4CD141E131D2ADF007788DC /* BooksExporter.xcdatamodel */,
+			);
+			name = Models;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -571,6 +582,7 @@
 				F44EED8F131BD03300CAA969 /* BEBooksExporter.m in Sources */,
 				F44EED9A131BD15300CAA969 /* BEBooklogBooksExporter.m in Sources */,
 				F44EEE2B131BF48A00CAA969 /* BEMediaMarkerBooksExporter.m in Sources */,
+				F4CD141F131D2ADF007788DC /* BooksExporter.xcdatamodel in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/English.lproj/BEMainWindow.xib
+++ b/English.lproj/BEMainWindow.xib
@@ -11,7 +11,7 @@
 			<string key="NS.object.0">823</string>
 		</object>
 		<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-			<integer value="256"/>
+			<integer value="2"/>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -474,7 +474,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 127}, {4, 15}}</string>
 									<reference key="NSSuperview" ref="985328466"/>
-									<bool key="NSEnabled">YES</bool>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="985328466"/>
 									<string key="NSAction">_doScroller:</string>
@@ -498,7 +497,7 @@
 							<string key="NSFrame">{{-2, 306}, {700, 320}}</string>
 							<reference key="NSSuperview" ref="295446415"/>
 							<reference key="NSNextKeyView" ref="1064630001"/>
-							<int key="NSsFlags">690</int>
+							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="545356377"/>
 							<reference key="NSHScroller" ref="849447547"/>
 							<reference key="NSContentView" ref="1064630001"/>
@@ -1061,7 +1060,11 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				</array>
 				<string key="NSObjectClassName">BEBookInformation</string>
 				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAutomaticallyPreparesContent">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy">
+					<string key="NSEntityName">BEBookInformation</string>
+				</object>
+				<bool key="_NSIsUsingManagedProxy">YES</bool>
 				<bool key="NSAvoidsEmptySelection">YES</bool>
 				<bool key="NSPreservesSelection">YES</bool>
 				<bool key="NSSelectsInsertedObjects">YES</bool>
@@ -1387,26 +1390,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.title</string>
-						<reference key="source" ref="452505"/>
-						<reference key="destination" ref="1064620552"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="452505"/>
-							<reference key="NSDestination" ref="1064620552"/>
-							<string key="NSLabel">enabled: selection.title</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.title</string>
-							<object class="NSDictionary" key="NSOptions">
-								<string key="NS.key.0">NSValueTransformerName</string>
-								<string key="NS.object.0">NSIsNotNil</string>
-							</object>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">394</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">enabled: arrangedObjects.@count</string>
 						<reference key="source" ref="522098588"/>
 						<reference key="destination" ref="1064620552"/>
@@ -1437,6 +1420,26 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 					</object>
 					<int key="connectionID">400</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: selection.registerDate</string>
+						<reference key="source" ref="452505"/>
+						<reference key="destination" ref="1064620552"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="452505"/>
+							<reference key="NSDestination" ref="1064620552"/>
+							<string key="NSLabel">enabled: selection.registerDate</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">selection.registerDate</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSIsNotNil</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -2106,7 +2109,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA</b
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">400</int>
+			<int key="maxID">401</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">