Changeset 1165 for branches

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

Location:

branches/PlayerFramework/SapphireFrappliance

Files:

• Browser/SapphireMarkMenu.m (modified) (3 diffs)
• MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (11 diffs)
• MetaDataImporting/SapphireMovieImporter.m (modified) (14 diffs)
• MetaDataImporting/SapphireNfoImporter.m (modified) (1 diff)
• MetaDataImporting/SapphireTVShowImporter.m (modified) (3 diffs)
• MetaDataImporting/SapphireXMLFileDataImporter.m (modified) (1 diff)

branches/PlayerFramework/SapphireFrappliance/Browser/SapphireMarkMenu.m

@@ -289 +289 @@
                 
                 NSString *prettyName = [fileMeta prettyName];
-                if(prettyName != nil && [[[[fileMeta path] lastPathComponent] stringByDeletingPathExtension] caseInsensitiveCompare:prettyName] != NSOrderedSame)
+                if(prettyName != nil && [[fileMeta fileName] caseInsensitiveCompare:prettyName] != NSOrderedSame)
                 {
                         [marks insertObject:
@@ -469 +469 @@
                 NSString *savePath = [[joinList objectAtIndex:0] path];
                 BOOL hasmovExt = [[savePath pathExtension] isEqualToString:@"mov"];
-                NSString *base = [savePath stringByDeletingPathExtension];
+                NSString *base = [[joinList objectAtIndex:0] extensionlessPath];
                 if([[base lowercaseString] hasSuffix:@" part 1"])
                         base = [base substringToIndex:[base length] - 7];
@@ -750 +750 @@
                         {
                                 NSString *title = [NSString stringWithFormat:BRLocalizedString(@"Rename %@", @"Rename a file, directory, or collection, argument is path"), [fileMeta path]];
-                                NSString *oldName = [[[fileMeta path] lastPathComponent] stringByDeletingPathExtension];
+                                NSString *oldName = [fileMeta fileName];
                                 
                                 NSInvocation *invoke = [NSInvocation invocationWithMethodSignature:[fileMeta methodSignatureForSelector:@selector(rename:)]];

branches/PlayerFramework/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -191 +191 @@
 
 /*!
+ * @brief Return the filename, minus the path extension
+ */
+- (NSString *)fileName;
+
+/*!
+ * @brief Return the path, minus the path extension
+ */
+- (NSString *)extensionlessPath;
+
+/*!
  * @brief Get the overridden show name
  *

branches/PlayerFramework/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -231 +231 @@
                         self.fileClassValue = FILE_CLASS_TV_SHOW;
                         NSString *epCoverPath = [[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:[ep path]];
-                        NSString *oldBasePath = [[epCoverPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:[self.path lastPathComponent]];
-                        NSString *oldCoverPath = searchCoverArtExtForPath([oldBasePath stringByDeletingPathExtension]);
+                        NSString *oldBasePath = [[epCoverPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:[self fileName]];
+                        NSString *oldCoverPath = searchCoverArtExtForPath(oldBasePath);
                         if(oldCoverPath != nil)
                         {
@@ -251 +251 @@
                         self.fileClassValue = FILE_CLASS_MOVIE;
                         NSString *movieCoverPath = [movie coverArtPath];
-                        NSString *oldBasePath = [[[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:@"@MOVIES"] stringByAppendingPathComponent:[self.path lastPathComponent]];
-                        NSString *oldCoverPath = searchCoverArtExtForPath([oldBasePath stringByDeletingPathExtension]);
+                        NSString *oldBasePath = [[[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:@"@MOVIES"] stringByAppendingPathComponent:[self fileName]];
+                        NSString *oldCoverPath = searchCoverArtExtForPath(oldBasePath);
                         if(oldCoverPath != nil)
                         {
@@ -352 +352 @@
         
         //Check XML
-        NSString *xmlFilePath=[[self.path stringByDeletingPathExtension] stringByAppendingPathExtension:@"xml"];
+        NSString *xmlFilePath=[[self extensionlessPath] stringByAppendingPathExtension:@"xml"];
         SapphireXMLData *xml = self.xmlData;
         NSDictionary *xmlProps = [fm fileAttributesAtPath:xmlFilePath traverseLink:YES];
@@ -591 +591 @@
 {
         NSManagedObjectContext *moc = [self managedObjectContext];
-        NSString *lowerFileName = [[self.path lastPathComponent] lowercaseString];
+        NSString *lowerFileName = [[self fileName] lowercaseString];
 
         SapphireEpisode *ep = self.tvEpisode;
@@ -613 +613 @@
         else
                 lookupName = lowerFileName;
-        SapphireMovieTranslation *movieTran = [SapphireMovieTranslation movieTranslationWithName:[lookupName stringByDeletingPathExtension] inContext:moc];
+        SapphireMovieTranslation *movieTran = [SapphireMovieTranslation movieTranslationWithName:lookupName inContext:moc];
         if(movieTran != nil)
         {
@@ -651 +651 @@
 {
         /*Find cover art for the current file in the "Cover Art" dir */
-        NSString *subPath = [self path];
-        if([self fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
-                subPath = [subPath stringByDeletingPathExtension];
+        NSString *subPath = [self extensionlessPath];
         
         NSString *fileName = [subPath lastPathComponent];
@@ -737 +735 @@
         [SapphireMetaDataSupport save:[self managedObjectContext]];
         NSLog(@"Save done");
-        NSString *extLessPath = [oldPath stringByDeletingPathExtension];
+        NSString *extLessPath = [self extensionlessPath];
         NSEnumerator *secondaryExtEnum = [secondaryFiles objectEnumerator];
         NSString *extension;
+        NSString *newExtlessPath = newPath;
+        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+                newExtlessPath = [newExtlessPath stringByDeletingPathExtension];
         
         while((extension = [secondaryExtEnum nextObject]) != nil)
@@ -746 +747 @@
                 if([fm fileExistsAtPath:secondaryPath])
                 {
-                        NSString *newSecondaryPath = [[newPath stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
+                        NSString *newSecondaryPath = [newExtlessPath stringByAppendingPathExtension:extension];
                         if(newParent != nil)
                         {
@@ -767 +768 @@
         if(coverArtPath != nil)
         {
-                NSString *newCoverArtPath = [[newPath stringByDeletingPathExtension] stringByAppendingPathExtension:[coverArtPath pathExtension]];
+                NSString *newCoverArtPath = [newExtlessPath stringByAppendingPathExtension:[coverArtPath pathExtension]];
                 if(newParent != nil)
                 {
@@ -800 +801 @@
                 return BRLocalizedString(@"A File name should not contain any '/' characters", @"Error indicating that filenames cannot contain / characters");
         NSString *oldPath = [self path];
-        newFilename = [newFilename stringByAppendingPathExtension:[oldPath pathExtension]];
+        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+                newFilename = [newFilename stringByAppendingPathExtension:[oldPath pathExtension]];
         NSString *newPath = [[oldPath stringByDeletingLastPathComponent] stringByAppendingPathComponent:newFilename];
         if([oldPath isEqualToString:newPath])
@@ -858 +860 @@
 }
 
+- (NSString *)fileName
+{
+        NSString *ret = [self.path lastPathComponent];
+        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+                ret = [ret stringByDeletingPathExtension];
+        
+        return ret;
+}
+
+- (NSString *)extensionlessPath
+{
+        NSString *ret = self.path;
+        if(self.fileContainerTypeValue != FILE_CONTAINER_TYPE_VIDEO_TS)
+                ret = [ret stringByDeletingPathExtension];
+        
+        return ret;
+}
+
 - (NSMutableDictionary *)getDisplayedMetaDataInOrder:(NSArray * *)order;
 {

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -32 +32 @@
 #import "SapphireURLLoader.h"
 #import "SapphireScraper.h"
+#import "NSString-Extensions.h"
 
 @interface SapphireMovieImportStateData : SapphireImportStateData
@@ -157 +158 @@
                 SapphireFileMetaData *metaData = state->file;
                 NSManagedObjectContext *moc = [metaData managedObjectContext];
-                NSString *lookupName = [[state->lookupName lowercaseString] stringByDeletingPathExtension];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:lookupName inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                 [tran setIMDBLink:[[movies objectAtIndex:0] objectForKey:movieTranslationLinkKey]];
                 [self getMovieResultsForState:state translation:tran];
@@ -167 +167 @@
                 SapphireMovieChooser *chooser = [[SapphireMovieChooser alloc] initWithScene:[delegate chooserScene]];
                 [chooser setMovies:movies];
-                [chooser setFileName:state->lookupName];                
+                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                 [chooser setListTitle:BRLocalizedString(@"Select Movie Title", @"Prompt the user for title of movie")];
                 /*And display prompt*/
@@ -265 +265 @@
                 [infoIMDB setObject:movieTitle forKey:META_MOVIE_TITLE_KEY];
         
-        NSString *movieTranslationString = [[state->lookupName lowercaseString] stringByDeletingPathExtension];
         SapphireFileMetaData *metaData = state->file;
         NSManagedObjectContext *moc = [metaData managedObjectContext];
-        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:movieTranslationString inContext:moc];
+        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
         SapphireMovie *movie = [SapphireMovie movieWithDictionary:infoIMDB inContext:moc];
         if(movie == nil)
@@ -342 +341 @@
                 {
                         [posterChooser setPosters:previews];
-                        [posterChooser setFileName:state->lookupName];
+                        [posterChooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                         [posterChooser setFile:state->file];
                         [posterChooser setListTitle:BRLocalizedString(@"Select Movie Poster", @"Prompt the user for poster selection")];
@@ -430 +429 @@
                 return ImportStateNotUpdated;
         SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DEBUG, @"Going to movie import %@", path);
-        NSString *fileName = [path lastPathComponent];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+        
         /*choose between file or directory name for lookup */
         NSString *lookupName;
         if([[SapphireSettings sharedSettings] dirLookup])
-                lookupName = [[path stringByDeletingLastPathComponent] lastPathComponent];
-        else
-                lookupName = fileName;
+                lookupName = [[[path stringByDeletingLastPathComponent] lastPathComponent] lowercaseString];
+        else
+                lookupName = [[extLessPath lastPathComponent] lowercaseString];
         
         SapphireSiteMovieScraper *siteScraper = [[[SapphireSiteMovieScraper alloc] initWithMovieScraper:scraper delegate:self loader:[SapphireApplianceController urlLoader]] autorelease];
@@ -444 +446 @@
         NSString *movieDataLink = nil ;
         /*Check to see if we know this movie*/
-        NSString *movieTranslationString = [[lookupName lowercaseString] stringByDeletingPathExtension];
-        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DETAIL, @"Searching for movie %@", movieTranslationString);
+        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DETAIL, @"Searching for movie %@", state->lookupName);
         NSManagedObjectContext *moc = [metaData managedObjectContext];
-        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:movieTranslationString inContext:moc];
+        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
         int searchIMDBNumber = [metaData searchIMDBNumber];
         if(searchIMDBNumber > 0)
         {
                 if(!tran)
-                        tran = [SapphireMovieTranslation createMovieTranslationWithName:movieTranslationString inContext:moc];
+                        tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                 [tran setIMDBLink:[NSString stringWithFormat:@"/title/tt%08d", searchIMDBNumber]];
         }
@@ -458 +459 @@
         {
                 BOOL nfoPathIsDir = NO;
-                NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"];
+                NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"];
                 NSString *moviePath = nil;
                 if([[NSFileManager defaultManager] fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] && !nfoPathIsDir)
@@ -472 +473 @@
                         
                         /*Look for a year in the title*/
-                        NSString *searchStr = [lookupName stringByDeletingPathExtension];
-                        NSScanner *titleYearScanner = [NSScanner scannerWithString:searchStr];
+                        NSScanner *titleYearScanner = [NSScanner scannerWithString:state->lookupName];
                         NSString *normalTitle = nil;
                         int year = 0;
@@ -486 +486 @@
                         if(!success)
                         {
-                                normalTitle = searchStr;
+                                normalTitle = state->lookupName;
                         }
                         else
@@ -537 +537 @@
                 SapphireMovieChooser *movieChooser = (SapphireMovieChooser *)chooser;
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
-                NSString *filename = [[[movieChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:filename inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
                 if([tran IMDBLink])
                 {
@@ -548 +547 @@
         {
                 SapphirePosterChooser *posterChooser = (SapphirePosterChooser *)chooser;
-                NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:filename inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
                 if([[tran selectedPoster] link])
                 {
@@ -585 +583 @@
                         /*They selected a movie title, save the translation and write it*/
                         NSDictionary *movie = [[movieChooser movies] objectAtIndex:selection];
-                        NSString *filename = [[[movieChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:filename inContext:moc];
+                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                         /* Add IMDB Key */
                         [tran setIMDBLink:[movie objectForKey:movieTranslationLinkKey]];
@@ -605 +602 @@
                 else
                 {
-                        NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:filename inContext:moc];
+                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                         [tran setSelectedPosterIndexValue:selectedPoster];
                         [self saveMoviePosterAtURL:[[tran posterAtIndex:selectedPoster] link] forTranslation:tran];

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireNfoImporter.m

@@ -48 +48 @@
         /*Check for NFO file*/
         BOOL nfoPathIsDir = NO;
-        NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+        
+        NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"];
         if(![fm fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] || nfoPathIsDir)
                 return ImportStateNotUpdated;

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)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

@@ -99 +99 @@
         /*Check for XML file*/
         BOOL xmlPathIsDir = NO;
-        NSString *xmlFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"xml"];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+
+        NSString *xmlFilePath=[extLessPath stringByAppendingPathExtension:@"xml"];
         SapphireXMLData *xml = [metaData xmlData];
         if(![fm fileExistsAtPath:xmlFilePath isDirectory:&xmlPathIsDir] || xmlPathIsDir)