-[IMBObject path] serves very little purpose now, so remove it.

iMediaSandboxing · Apr 28, 2012 · f161689 · f161689
1 parent 08f6105
commit f161689
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 15 deletions.
diff --git a/IMBApertureAudioParser.m b/IMBApertureAudioParser.m
@@ -119,7 +119,7 @@ - (void) loadMetadataForObject:(IMBObject*)inObject
 
 	NSMutableDictionary* metadata = [NSMutableDictionary dictionaryWithDictionary:inObject.preliminaryMetadata];
 
-	[metadata setObject:[inObject path] forKey:@"path"];
+	[metadata setObject:[audioURL path] forKey:@"path"];
 	[metadata addEntriesFromDictionary:[NSURL imb_metadataFromAudioAtURL:audioURL]];
 
 	NSString* description = [self metadataDescriptionForMetadata:metadata];

diff --git a/IMBApertureVideoParser.m b/IMBApertureVideoParser.m
@@ -119,7 +119,7 @@ - (void) loadMetadataForObject:(IMBObject*)inObject
 
 	NSMutableDictionary* metadata = [NSMutableDictionary dictionaryWithDictionary:inObject.preliminaryMetadata];
 
-	[metadata setObject:[inObject path] forKey:@"path"];
+	[metadata setObject:[videoURL path] forKey:@"path"];
 	[metadata addEntriesFromDictionary:[NSURL imb_metadataFromVideoAtURL:videoURL]];
 
 	NSString* description = [self metadataDescriptionForMetadata:metadata];

diff --git a/IMBLightroom3VideoParser.m b/IMBLightroom3VideoParser.m
@@ -132,7 +132,7 @@ - (NSDictionary*) metadataForObject:(IMBObject*)inObject error:(NSError**)outErr
 	if (videoURL)
 	{
 		metadata = [NSMutableDictionary dictionaryWithDictionary:inObject.preliminaryMetadata];
-		[metadata setObject:[inObject path] forKey:@"path"];
+		[metadata setObject:[videoURL path] forKey:@"path"];
 		[metadata addEntriesFromDictionary:[NSURL imb_metadataFromVideoAtURL:videoURL]];
 	}
 

diff --git a/IMBLightroom4VideoParser.m b/IMBLightroom4VideoParser.m
@@ -130,7 +130,7 @@ - (NSDictionary*) metadataForObject:(IMBObject*)inObject error:(NSError**)outErr
 	if (videoURL)
 	{
 		metadata = [NSMutableDictionary dictionaryWithDictionary:inObject.preliminaryMetadata];
-		[metadata setObject:[inObject path] forKey:@"path"];
+		[metadata setObject:[videoURL path] forKey:@"path"];
 		[metadata addEntriesFromDictionary:[NSURL imb_metadataFromVideoAtURL:videoURL]];
 	}
 

diff --git a/IMBMovieFolderParser.m b/IMBMovieFolderParser.m
@@ -84,7 +84,7 @@ - (id) thumbnailForObject:(IMBObject*)inObject error:(NSError**)outError
 - (NSDictionary*) metadataForObject:(IMBObject*)inObject error:(NSError**)outError
 {
 	NSMutableDictionary* metadata = [NSMutableDictionary dictionary];
-	NSString* path = inObject.path;
+	NSString* path = [[inObject URL] path];
 	MDItemRef item = MDItemCreate(NULL,(CFStringRef)path);
 
 	if (item)

diff --git a/IMBObject.h b/IMBObject.h
@@ -136,7 +136,6 @@ extern NSString* kIMBObjectPasteboardType;
 
 // Convenience accessors for the file...
 
-- (NSString*) path;											// Converts self.location to a path
 - (NSURL*) URL;												// Converts self.location to a url
 - (NSString*) type;											// Returns UTI of file if possible
 - (BOOL) isLocalFile;										// Is this object a local file

diff --git a/IMBObject.m b/IMBObject.m
@@ -320,14 +320,6 @@ - (id) copyWithZone:(NSZone*)inZone
 #pragma mark Helpers
 
 
-// Convert location to path...
-
-- (NSString*) path
-{
-	return [_location path];
-}
-
-
 // Convert location to url...
 
 - (NSURL*) URL
@@ -356,7 +348,7 @@ - (BOOL) isLocalFile
 - (NSString*) type
 {
 	NSString* uti = nil;
-	NSString* path = [self path];
+	NSString* path = [[self URL] path];
 	NSString* extension = [path pathExtension];
 
 	if ([self isLocalFile])