Changeset 1179 for trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

Timestamp:

02/25/10 17:31:35 (2 years ago)

Author:

gbooker

Message:

Merged changes from the branch back to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (14 diffs)

trunk/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)
                         {
@@ -324 +324 @@
 {
         /*Check modified date*/
-        NSDictionary *props = [[NSFileManager defaultManager] fileAttributesAtPath:self.path traverseLink:YES];
+        NSString *path = nil;
+        NSFileManager *fm = [NSFileManager defaultManager];
+        if([self fileContainerTypeValue] == FILE_CONTAINER_TYPE_VIDEO_TS)
+        {
+                NSString *vtsPath = [self.path stringByAppendingPathComponent:@"VIDEO_TS"];
+                NSEnumerator *fileEnum = [[fm directoryContentsAtPath:vtsPath] objectEnumerator];
+                NSString *file;
+                while((file = [fileEnum nextObject]) != nil)
+                {
+                        NSString *lowerFile = [file lowercaseString];
+                        if([lowerFile hasSuffix:@".ifo"] && ![[lowerFile lastPathComponent] isEqualToString:@"video_ts.ifo"])
+                        {
+                                path = [vtsPath stringByAppendingPathComponent:file];
+                                break;
+                        }
+                }
+        }
+        else
+                path = self.path;
+        NSDictionary *props = [fm fileAttributesAtPath:path traverseLink:YES];
         int modTime = [[props objectForKey:NSFileModificationDate] timeIntervalSince1970];
         
@@ -352 +371 @@
         
         //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];
@@ -410 +429 @@
                 NSMutableDictionary *fileMeta = [NSMutableDictionary dictionary];
                 NSString *path = [file path];
+                NSString *modifiedPath = path;
+                NSFileManager *fm = [NSFileManager defaultManager];
                 
-                NSDictionary *props = [[NSFileManager defaultManager] fileAttributesAtPath:path traverseLink:YES];
+                if([file fileContainerTypeValue] == FILE_CONTAINER_TYPE_VIDEO_TS)
+                {
+                        NSString *vtsPath = [[file path] stringByAppendingPathComponent:@"VIDEO_TS"];
+                        NSEnumerator *fileEnum = [[fm directoryContentsAtPath:vtsPath] objectEnumerator];
+                        NSString *file;
+                        while((file = [fileEnum nextObject]) != nil)
+                        {
+                                NSString *lowerFile = [file lowercaseString];
+                                if([lowerFile hasSuffix:@".ifo"] && ![[lowerFile lastPathComponent] isEqualToString:@"video_ts.ifo"])
+                                {
+                                        modifiedPath = [vtsPath stringByAppendingPathComponent:file];
+                                        break;
+                                }
+                        }
+                }
+                NSDictionary *props = [fm fileAttributesAtPath:modifiedPath traverseLink:YES];
                 int modTime = [[props objectForKey:NSFileModificationDate] timeIntervalSince1970];
                 /*Set modified, size, and version*/
@@ -511 +547 @@
                 {
                         SapphireVideoTsParser *dvd = [[SapphireVideoTsParser alloc] initWithPath:path];
-                        
-                        [fileMeta setObject:[dvd videoFormatsString ] forKey:META_FILE_VIDEO_DESC_KEY];
-                        [fileMeta setObject:[dvd audioFormatsString ] forKey:META_FILE_AUDIO_DESC_KEY];
-                        [fileMeta setObject:[dvd subtitlesString    ] forKey:META_FILE_SUBTITLES_KEY ];
-                        [fileMeta setObject:[dvd mainFeatureDuration] forKey:META_FILE_DURATION_KEY  ];
-                        [fileMeta setObject:[dvd totalSize          ] forKey:META_FILE_SIZE_KEY      ];
+                        id description = [dvd videoFormatsString];
+                        if(description)
+                                [fileMeta setObject:description forKey:META_FILE_VIDEO_DESC_KEY];
+                        description = [dvd audioFormatsString];
+                        if(description)
+                                [fileMeta setObject:description forKey:META_FILE_AUDIO_DESC_KEY];
+                        description = [dvd mainFeatureDuration];
+                        if(description)
+                                [fileMeta setObject:description forKey:META_FILE_DURATION_KEY];
+                        description = [dvd totalSize];
+                        if(description)
+                                [fileMeta setObject:description forKey:META_FILE_SIZE_KEY];
+                        description = [dvd subtitlesString];
+                        if(description)
+                                [fileMeta setObject:description forKey:META_FILE_SUBTITLES_KEY ];
                         
                         [dvd release];
@@ -591 +636 @@
 {
         NSManagedObjectContext *moc = [self managedObjectContext];
-        NSString *lowerFileName = [[self.path lastPathComponent] lowercaseString];
+        NSString *lowerFileName = [[self fileName] lowercaseString];
 
         SapphireEpisode *ep = self.tvEpisode;
@@ -613 +658 @@
         else
                 lookupName = lowerFileName;
-        SapphireMovieTranslation *movieTran = [SapphireMovieTranslation movieTranslationWithName:[lookupName stringByDeletingPathExtension] inContext:moc];
+        SapphireMovieTranslation *movieTran = [SapphireMovieTranslation movieTranslationWithName:lookupName inContext:moc];
         if(movieTran != nil)
         {
@@ -651 +696 @@
 {
         /*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 +780 @@
         [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 +792 @@
                 if([fm fileExistsAtPath:secondaryPath])
                 {
-                        NSString *newSecondaryPath = [[newPath stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
+                        NSString *newSecondaryPath = [newExtlessPath stringByAppendingPathExtension:extension];
                         if(newParent != nil)
                         {
@@ -767 +813 @@
         if(coverArtPath != nil)
         {
-                NSString *newCoverArtPath = [[newPath stringByDeletingPathExtension] stringByAppendingPathExtension:[coverArtPath pathExtension]];
+                NSString *newCoverArtPath = [newExtlessPath stringByAppendingPathExtension:[coverArtPath pathExtension]];
                 if(newParent != nil)
                 {
@@ -800 +846 @@
                 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 +905 @@
 }
 
+- (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;
 {