Changeset 1170

Timestamp:

02/24/2010 06:40:01 PM (2 years ago)

Author:

gbooker

Message:

Corrected some issues with video_ts importing

Location:

branches/PlayerFramework/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (2 diffs)
• MetaDataImporting/SapphireVideoTSParser.m (modified) (5 diffs)

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

@@ -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];
         
@@ -511 +530 @@
                 {
                         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];

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireVideoTSParser.m

@@ -24 +24 @@
 // Instead of declaring them in the header, we declare them here in a category that extends the class.
 
-@interface SapphireVideoTsParser (InternalMethods)
+@interface SapphireVideoTsParser ()
 
 /*!
@@ -76 +76 @@
 #define vts_VideoIsWidescreen(attrs)                 ( attrs[0] & 0x0c)
 
-#define vts_AudioIsDTS(attrs)                        ((attrs[0] & 0xe0) == 0x0c)
+#define vts_AudioIsDTS(attrs)                        ((attrs[0] & 0xe0) == 0xc0)
 #define vts_AudioIsSurround(attrs)                   ( attrs[0] & 0x02)
 #define vts_AudioIsCommentary(attrs)                 ( attrs[5] >    1)
@@ -100 +100 @@
 static NSString *languageFromEncodedChars( const char firstChar, const char secondChar )
 {
-        static NSLocale *currentLocale = nil;
+        NSLocale *currentLocale = [NSLocale currentLocale];
         const char       langCode[]    = { firstChar, secondChar, 0 };
         
-        if( currentLocale == nil )
-                currentLocale = [NSLocale currentLocale];
-
         return [currentLocale displayNameForKey:NSLocaleLanguageCode
                                                                           value:[NSString stringWithCString:langCode encoding:NSASCIIStringEncoding]];
@@ -319 +316 @@
                 audio = commaSeparatedStringFromCollection( audioList );
         }
-
-        if( audio == nil )
-                audio = BRLocalizedString( @"Not specified", @"No Audio information available for a DVD" );;
 }
 
@@ -355 +349 @@
                 subtitles = commaSeparatedStringFromCollection( subtitleList );
         }
-
-        if( subtitles == nil )
-                subtitles = BRLocalizedString( @"None", @"No Subtitle information available for a DVD" );
 }