Media Galleries API Picasa: Windows Custom Database Locations

chrome/browser/media_galleries/fileapi/picasa_finder.cc

 // Copyright 2013 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 "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "content/public/browser/browser_thread.h"
 
+#if defined(OS_WIN)
+#include "base/win/registry.h"
+#endif
+
 namespace picasa {
 
+#if defined(OS_WIN)
+const wchar_t kPicasaRegistryPath[] =

[Greg Billock, 2013/10/01 20:50:35]

Can you just move this to a local const inside the method?

[tommycli, 2013/10/01 22:07:22]

Tests use this.

+    L"Software\\Google\\Picasa\\Picasa2\\Preferences";
+const wchar_t kPicasaRegistryAppDataKey[] = L"AppLocalDataPath";
+#endif
+
 namespace {
 
+#if defined(OS_WIN)
+base::FilePath GetCustomPicasaRoot() {
+  base::win::RegKey key;
+  if (key.Open(HKEY_CURRENT_USER, kPicasaRegistryPath, KEY_READ) !=
+          ERROR_SUCCESS ||
+      !key.Valid()) {
+    return base::FilePath();
+  }
+
+  std::wstring value;

[Greg Billock, 2013/10/01 20:50:35]

Can we use string16 here?

[tommycli, 2013/10/01 22:07:22]

Done. Yes, that's better !

+  if (key.ReadValue(kPicasaRegistryAppDataKey, &value) != ERROR_SUCCESS)
+    return base::FilePath();
+  if (value.empty())
+    return base::FilePath();
+
+  return base::FilePath(value);
+}
+
+base::FilePath GetPicasaDatabasePath() {
+  base::FilePath path = GetCustomPicasaRoot();
+  if (path.empty() && !PathService::Get(base::DIR_LOCAL_APP_DATA, &path))
+    return base::FilePath();
+
+  return path.AppendASCII("Google").AppendASCII("Picasa2").AppendASCII(
+        kPicasaDatabaseDirName);
+}
+#elif defined (OS_MACOSX)
+base::FilePath GetPicasaDatabasePath() {
+  // TODO(tommycli): Support Picasa Mac's custom path.
+  base::FilePath path;
+  if (!PathService::Get(base::DIR_APP_DATA, &path))
+    return base::FilePath();
+
+  // On Mac, the database is in "Picasa3", not "Picasa2".
+  return path.AppendASCII("Google").AppendASCII("Picasa3").AppendASCII(
+        kPicasaDatabaseDirName);
+}
+#else
+base::FilePath GetPicasaDatabasePath() {
+  return base::FilePath();
+}
+#endif
+
 // Returns path of Picasa's DB3 database directory. May only be called on
 // threads that allow for disk IO, like the FILE thread or MediaTaskRunner.
 base::FilePath FindPicasaDatabaseOnFileThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
-  base::FilePath path;
-
-#if defined(OS_WIN)
-  // TODO(tommycli): Check registry for alternative path.
-  if (!PathService::Get(base::DIR_LOCAL_APP_DATA, &path))
-    return base::FilePath();
-#elif defined(OS_MACOSX)
-  // TODO(tommycli): Check Mac Preferences for alternative path.
-  if (!PathService::Get(base::DIR_APP_DATA, &path))
-    return base::FilePath();
-#else
-  return base::FilePath();
-#endif
-
-  path = path.AppendASCII("Google").AppendASCII("Picasa2").AppendASCII(
-      kPicasaDatabaseDirName);
+  base::FilePath path = GetPicasaDatabasePath();

[Greg Billock, 2013/10/01 20:50:35]

Can we split the platforms here, so like

base::FilePath path;
#if defined(OS_WIN)
path = GetPicasaDatabasePathWin();
#elif defined(OS_MACOSX)
path = GetPicasaDatabasePathMac();
#endif

return path;

Then we can either split out the impl into separate ifdef chunks without other
#elif and duplicate names.

[tommycli, 2013/10/01 22:07:22]

Done.

 
   // Verify actual existence
   if (!base::DirectoryExists(path))
     path.clear();
 
   return path;
 }
 
 void FinishOnOriginalThread(const DeviceIDCallback& callback,
                             const base::FilePath& database_path) {
   std::string device_id;
   if (!database_path.empty()) {
     device_id = StorageInfo::MakeDeviceId(StorageInfo::PICASA,
                                           database_path.AsUTF8Unsafe());
   }
   callback.Run(device_id);
 }
 
 }  // namespace
 
 void FindPicasaDatabase(const DeviceIDCallback& callback) {
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&FindPicasaDatabaseOnFileThread),
       base::Bind(&FinishOnOriginalThread, callback));
 }
 
 }  // namespace picasa