Prettify Mac names, rewrite getDisplayPath API call to focus on $HOME

base/mac/foundation_util.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/mac/foundation_util.h"
+#include "base/mac/mac_util.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_logging.h"
 #include "base/sys_string_conversions.h"
 
@@ skipping 105 matching lines @@
 }
 
 bool GetLocalDirectory(NSSearchPathDirectory directory, FilePath* result) {
   return GetSearchPathDirectory(directory, NSLocalDomainMask, result);
 }
 
 bool GetUserDirectory(NSSearchPathDirectory directory, FilePath* result) {
   return GetSearchPathDirectory(directory, NSUserDomainMask, result);
 }
 
+std::string GetDisplayBaseName(const FilePath& path) {
+  FSRef ref;
+  if (!FSRefFromPath(path.value(), &ref))

[Nico, 2012/09/04 14:09:37]

Can you use a CFURL instead of a FSRef?

[thorogood, 2012/09/06 00:16:53]

It seems like I could, e.g.: [NSURL fileURLWithPath:path_string];

Is there a reason that would be preferred?

[Nico, 2012/09/06 00:22:28]

FSRef is a very old type, and NSURL is what Apple seems to be advocating these
days. Since it's the same amount of code, I'd opt for the one less likely to
disappear in the medium future :-)

[thorogood, 2012/09/06 04:42:37]

Turns out it's now reasonably more verbose, both the create method and now since
I've got to own the object (whereas FSRef was just an opaque struct. Done
anyway, let me know what you think.

An alternative I see is I could probably write a NSURLFromPath method, which at
least makes this a bit easier to do (I've just copied my version from
native_library_mac.mm:32).

+    return path.BaseName().value();
+
+  CFStringRef str;
+  if (LSCopyDisplayNameForRef(&ref, &str) != noErr)
+    return path.BaseName().value();
+
+  std::string result(base::SysCFStringRefToUTF8(str));
+  NSObjectRelease((void *) str);

[Nico, 2012/09/04 14:09:37]

CFRelease

[thorogood, 2012/09/06 00:16:53]

Done.

+  return result;
+}
+
 FilePath GetUserLibraryPath() {
   FilePath user_library_path;
   if (!GetUserDirectory(NSLibraryDirectory, &user_library_path)) {
     DLOG(WARNING) << "Could not get user library path";
   }
   return user_library_path;
 }
 
 // Takes a path to an (executable) binary and tries to provide the path to an
 // application bundle containing it. It takes the outermost bundle that it can
@@ skipping 247 matching lines @@
         CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey));
   }
   o << "Code: " << CFErrorGetCode(err)
     << " Domain: " << CFErrorGetDomain(err)
     << " Desc: " << desc.get();
   if(errorDesc) {
     o << "(" << errorDesc << ")";
   }
   return o;
 }