Changeset 936

Timestamp:

10/15/2009 08:48:04 PM (2 years ago)

Author:

gbooker

Message:

Corrected import of show names from XML as well as added test case
Fixes #318

Location:

trunk/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireXMLData.m (modified) (1 diff)
• main_debug.m (modified) (4 diffs)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLData.m

@@ -128 +128 @@
                 
         NSString *strVal = [dict objectForKey:META_SHOW_NAME_KEY];
-        if(searchVal != nil)
-                self.searchShowName = (NSString *)strVal;
+        if(strVal != nil)
+                self.searchShowName = strVal;
         
         

trunk/SapphireFrappliance/main_debug.m

@@ -139 +139 @@
         NSManagedObjectContext *moc = [SapphireApplianceController newManagedObjectContextForFile:storeFile withOptions:nil];
         [SapphireMetaDataSupport setMainContext:moc];
+        SapphireXMLFileDataImporter *xmlImpr = [[SapphireXMLFileDataImporter alloc] init];
+        SapphireFileDataImporter *fileImp = [[SapphireFileDataImporter alloc] init];
+        SapphireTVShowImporter *tvImp = [[SapphireTVShowImporter alloc] initWithContext:moc];
+        SapphireMovieImporter *movImp = [[SapphireMovieImporter alloc] initWithContext:moc];
+        SapphireAllImporter *allImporter = [[SapphireAllImporter alloc] initWithImporters:[NSArray arrayWithObjects:xmlImpr,tvImp,movImp,fileImp,nil]];
+        [xmlImpr release];
+        [fileImp release];
+        [tvImp release];
+        [movImp release];
         
         //Debug code goes here:
@@ -191 +200 @@
                 SapphireFileMetaData *meta = [SapphireFileMetaData fileWithPath:path inContext:moc];
                 [meta clearMetaData];
-                SapphireXMLFileDataImporter *xmlImpr = [[SapphireXMLFileDataImporter alloc] init];
-                SapphireFileDataImporter *fileImp = [[SapphireFileDataImporter alloc] init];
-                SapphireTVShowImporter *tvImp = [[SapphireTVShowImporter alloc] initWithContext:moc];
-                SapphireMovieImporter *movImp = [[SapphireMovieImporter alloc] initWithContext:moc];
-                SapphireAllImporter *allImporter = [[SapphireAllImporter alloc] initWithImporters:[NSArray arrayWithObjects:xmlImpr,tvImp,movImp,fileImp,nil]];
-                [xmlImpr release];
-                [fileImp release];
-                [tvImp release];
-                [movImp release];
-                
                 [allImporter importMetaData:meta path:[meta path]];
                 
@@ -272 +271 @@
         }
 #endif
-#define TESTING_MOVIE_VIRTUAL_DIRS_IN_XML
+//#define TESTING_MOVIE_VIRTUAL_DIRS_IN_XML
 #ifdef TESTING_MOVIE_VIRTUAL_DIRS_IN_XML
         {
@@ -281 +280 @@
         }
 #endif
+#define TESTING_TV_IMPORT_THROUGH_XML
+#ifdef TESTING_TV_IMPORT_THROUGH_XML
+        {
+                SapphireFileMetaData *file = [SapphireFileMetaData createFileWithPath:@"/Users/gbooker/Movies/TVShowsTests/life on mars.avi" inContext:moc];
+                [allImporter importMetaData:file path:[file path]];
+        }
+#endif
+        [allImporter release];
         
         [moc release];