Changeset 611

Timestamp:

07/03/08 22:15:16 (6 months ago)

Author:

gbooker

Message:

Added field for manually added collections
Only display collections which are mounts, and the manually added ones

Files:

• branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireCollectionDirectory.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireCollectionDirectory.m (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireSubEpisode.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireSubEpisode.m (modified) (2 diffs)
• branches/CoreData/SapphireFrappliance/MetaData/Sapphire.xcdatamodel/elements (modified) (previous)
• branches/CoreData/SapphireFrappliance/MetaData/Sapphire.xcdatamodel/layout (modified) (previous)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.h (modified) (1 diff)
• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m (modified) (4 diffs)

branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireCollectionDirectory.h

@@ -32 +32 @@
-
-
+- (NSNumber*)manualCollection;
+- (void)setManualCollection:(NSNumber*)value_;
+
+- (BOOL)manualCollectionValue;
+- (void)setManualCollectionValue:(BOOL)value_;
+
+//- (BOOL)validateManualCollection:(id*)value_ error:(NSError**)error_;
+
+
+
-- (NSNumber*)isMount;
-- (void)setIsMount:(NSNumber*)value_;

branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireCollectionDirectory.m

@@ -66 +66 @@
-
-
+- (NSNumber*)manualCollection {
+        [self willAccessValueForKey:@"manualCollection"];
+        NSNumber *result = [self primitiveValueForKey:@"manualCollection"];
+        [self didAccessValueForKey:@"manualCollection"];
+        return result;
+}
+
+- (void)setManualCollection:(NSNumber*)value_ {
+        [self willChangeValueForKey:@"manualCollection"];
+        [self setPrimitiveValue:value_ forKey:@"manualCollection"];
+        [self didChangeValueForKey:@"manualCollection"];
+}
+
+
+
+- (BOOL)manualCollectionValue {
+        NSNumber *result = [self manualCollection];
+        return result ? [result boolValue] : 0;
+}
+
+- (void)setManualCollectionValue:(BOOL)value_ {
+        [self setManualCollection:[NSNumber numberWithBool:value_]];
+}
+
+
+
+
+
+
-- (NSNumber*)isMount {
-        [self willAccessValueForKey:@"isMount"];

branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireSubEpisode.h

@@ -39 +39 @@
-
-
+- (NSString*)episodeDescription;
+- (void)setEpisodeDescription:(NSString*)value_;
+
+//- (BOOL)validateEpisodeDescription:(id*)value_ error:(NSError**)error_;
+
+
+
-- (NSString*)episodeTitle;
-- (void)setEpisodeTitle:(NSString*)value_;
-
-//- (BOOL)validateEpisodeTitle:(id*)value_ error:(NSError**)error_;
-
-
-
-- (NSString*)episodeDescription;
-- (void)setEpisodeDescription:(NSString*)value_;
-
-//- (BOOL)validateEpisodeDescription:(id*)value_ error:(NSError**)error_;
-
-

branches/CoreData/SapphireFrappliance/MetaData/MOClasses/_SapphireSubEpisode.m

@@ -84 +84 @@
-
-
+- (NSString*)episodeDescription {
+        [self willAccessValueForKey:@"episodeDescription"];
+        NSString *result = [self primitiveValueForKey:@"episodeDescription"];
+        [self didAccessValueForKey:@"episodeDescription"];
+        return result;
+}
+
+- (void)setEpisodeDescription:(NSString*)value_ {
+        [self willChangeValueForKey:@"episodeDescription"];
+        [self setPrimitiveValue:value_ forKey:@"episodeDescription"];
+        [self didChangeValueForKey:@"episodeDescription"];
+}
+
+
+
+
+
+
-- (NSString*)episodeTitle {
-        [self willAccessValueForKey:@"episodeTitle"];
@@ -95 +113 @@
-        [self setPrimitiveValue:value_ forKey:@"episodeTitle"];
-        [self didChangeValueForKey:@"episodeTitle"];
-}
-
-
-
-
-
-
-- (NSString*)episodeDescription {
-        [self willAccessValueForKey:@"episodeDescription"];
-        NSString *result = [self primitiveValueForKey:@"episodeDescription"];
-        [self didAccessValueForKey:@"episodeDescription"];
-        return result;
-}
-
-- (void)setEpisodeDescription:(NSString*)value_ {
-        [self willChangeValueForKey:@"episodeDescription"];
-        [self setPrimitiveValue:value_ forKey:@"episodeDescription"];
-        [self didChangeValueForKey:@"episodeDescription"];
-}
-

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.h

@@ -2 +2 @@
-
-@interface SapphireCollectionDirectory : _SapphireCollectionDirectory {}
-
+manual:(BOOL)manual 
-+ (SapphireCollectionDirectory *)collectionAtPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
-+ (NSArray *)availableCollectionDirectoriesInContext:(NSManagedObjectContext *)moc;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m

@@ -11 +11 @@
-@implementation SapphireCollectionDirectory
-
-
+manual:(BOOL)manual 
-{
-        SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData createDirectoryWithPath:path inContext:moc];
@@ -24 +24 @@
-        ret = [NSEntityDescription insertNewObjectForEntityForName:MY_NAME inManagedObjectContext:moc];
-        
+        ret.manualCollectionValue = manual;
-        ret.isMountValue = isMount;
-        ret.skipValue = skip;
@@ -34 +35 @@
-+ (SapphireCollectionDirectory *)collectionAtPath:(NSString *)path inContext:(NSManagedObjectContext *)moc
-{
-
+manual:NO 
-}
-
@@ -62 +63 @@
-        NSString *mountPoint;
-        while((mountPoint = [mountEnum nextObject]) != nil)
-
+manual:NO 
-        
-isMount == NO) OR (directory.path IN %@
+hidden == NO) AND ((manualCollection == YES) OR (directory.path IN %@)
-        NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"directory.path" ascending:YES];
-        NSArray *ret = doSortedFetchRequest(MY_NAME, moc, predicate, sort);