Changeset 1288 for trunk

Timestamp:

06/23/10 14:20:40 (2 years ago)

Author:

gbooker

Message:

XML is a case where the cache doesn't hold the values, so fetch the real value in this case.
Make sure XML values do override movie values where appropriate.
Fixes #373

Location:

trunk/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireMovie.m (modified) (3 diffs)
• MetaData/SapphireMObjects/SapphireXMLData.m (modified) (1 diff)
• MetaDataImporting/SapphireXMLFileDataImporter.m (modified) (1 diff)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovie.m

@@ -302 +302 @@
                                         [mutRet addObject:cast];
                                 else
-                                        SapphireLog(SAPPHIRE_LOG_METADATA_STORE, SAPPHIRE_LOG_LEVEL_ERROR, @"Could not locate cast member %@ of movie %@", castName, self.title);
+                                        [mutRet addObject:[SapphireCast createCast:castName inContext:[self managedObjectContext]]];
                         }
                         [castByName release];
@@ -361 +361 @@
                                         [mutRet addObject:genre];
                                 else
-                                        SapphireLog(SAPPHIRE_LOG_METADATA_STORE, SAPPHIRE_LOG_LEVEL_ERROR, @"Could not locate genre %@ of movie %@", genreName, self.title);
+                                        [mutRet addObject:[SapphireGenre createGenre:genreName inContext:[self managedObjectContext]]];
                         }
                         [genreByName release];
@@ -529 +529 @@
 }
 
+- (NSString *)MPAARating
+{
+        overrideWithXMLForKey(NSString, MPAARating);
+        return super.MPAARating;
+}
+
+- (NSNumber *)imdbRating
+{
+        overrideWithXMLForKey(NSNumber, imdbRating);
+        return super.imdbRating;
+}
+
 - (BOOL)castMemberHasMajorRoleStatus:(SapphireCast *)cast
 {

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLData.m

@@ -188 +188 @@
                 self.releaseDate = releaseDate;
         
+        NSNumber *userRating = [dict objectForKey:META_SHOW_FAVORITE_RATING_KEY];
+        if(userRating != nil)
+                self.imdbRating = userRating;
+        
+        NSString *rating = [dict objectForKey:META_SHOW_RATING_KEY];
+        if(rating != nil)
+                self.MPAARating = rating;
+        
         
         NSArray *arrVal = [dict objectForKey:META_MOVIE_CAST_KEY];

trunk/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

@@ -87 +87 @@
                                                    nil] ;
         xmlMultiAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                                  @"Genres",                            GENRES_XML_QUERY,
-                                                  @"Cast",                              CAST_XML_QUERY,
-                                                  @"Producers" ,                        PRODUCERS_XML_QUERY,
-                                                  @"Directors",                 DIRECTORS_XML_QUERY,nil];
+                                                  META_MOVIE_GENRES_KEY,                        GENRES_XML_QUERY,
+                                                  META_MOVIE_CAST_KEY,                          CAST_XML_QUERY,
+                                                  @"Producers",                                         PRODUCERS_XML_QUERY,
+                                                  META_MOVIE_DIRECTOR_KEY,                      DIRECTORS_XML_QUERY,nil];
 }