Changeset 1165 for branches/PlayerFramework/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

Timestamp:

02/23/2010 04:51:22 PM (2 years ago)

Author:

gbooker

Message:

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

Files:

• branches/PlayerFramework/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (11 diffs)

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;
 {