Changeset 1165 for branches/PlayerFramework/SapphireFrappliance/Browser/SapphireMarkMenu.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/Browser/SapphireMarkMenu.m (modified) (3 diffs)

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:)]];