Changeset 1165 for branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

Timestamp:

02/23/10 16:51:22 (2 years ago)

Author:

gbooker

Message:

Better handle files without extensions and preserve the lookup name better.
Fixes #283

Files:

• branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m (modified) (3 diffs)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -286 +286 @@
                 SapphireShowChooser *chooser = [[SapphireShowChooser alloc] initWithScene:[delegate chooserScene]];
                 [chooser setShows:shows];
-                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];          
+                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                 [chooser setListTitle:BRLocalizedString(@"Select Show Title", @"Prompt the user for showname with a file")];
                 /*And display prompt*/
@@ -593 +593 @@
                 return ImportStateNotUpdated;
         //      NSArray *pathComponents = [path pathComponents];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+
         NSString *fileName = [path lastPathComponent];
         
@@ -704 +708 @@
         {
                 BOOL nfoPathIsDir = NO;
-                NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"];
+                NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"];
                 NSString *showPath = nil;
                 if([[NSFileManager defaultManager] fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] && !nfoPathIsDir)