Media Galleries API Picasa: Put INI indexing step into sandboxed utility process.

chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc

Index: chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc
diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a47efa24aad58bd5083af4115dc3f4b8d592f053
--- /dev/null
+++ b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.cc
@@ -0,0 +1,144 @@
+// 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/safe_picasa_albums_indexer.h"
+
+#include "base/file_util.h"
+#include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
+#include "chrome/common/chrome_utility_messages.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/child_process_data.h"
+#include "content/public/browser/utility_process_host.h"
+
+using chrome::MediaFileSystemBackend;
+using content::BrowserThread;
+using content::UtilityProcessHost;
+
+namespace picasa {
+
+namespace {
+
+// Picasa INI files are named "picasa.ini" on Picasa for Windows before version
+// 71.18. Later versions and Picasa for Mac uses ".picasa.ini".
+// See: https://support.google.com/picasa/answer/11257?hl=en
+const char kPicasaINIFilename[]       = ".picasa.ini";
+const char kPicasaINIFilenameLegacy[] = "picasa.ini";
+
+// Arbitrarily chosen to be a decent size but not block thread too much.
+const int kPicasaINIReadBatchSize = 10;
+
+}

[vandebo (ex-Chrome), 2013/07/10 19:54:03]

}  // namesapce

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

Done.

+
+SafePicasaAlbumsIndexer::SafePicasaAlbumsIndexer(
+    const AlbumMap& albums,
+    const AlbumMap& folders,
+    const ParserCallback& callback)
+    : callback_(callback),
+      parser_state_(INITIAL_STATE),
+      weak_factory_(this) {
+  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  DCHECK(!callback_.is_null());
+
+  for (AlbumMap::const_iterator it = albums.begin(); it != albums.end(); ++it) {

[vandebo (ex-Chrome), 2013/07/10 19:54:03]

nit: you may omit {}'s here.

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

Done.

+    album_uids_.insert(it->second.uid);
+  }
+
+  for (AlbumMap::const_iterator it = folders.begin(); it != folders.end();
+       ++it) {
+    folders_queue_.push(it->second.path);
+  }
+}
+
+void SafePicasaAlbumsIndexer::Start() {
+  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  DCHECK_EQ(INITIAL_STATE, parser_state_);
+
+  parser_state_ = STARTED_READING_INI_FILES_STATE;
+
+  ProcessFoldersBatch();
+}
+
+SafePicasaAlbumsIndexer::~SafePicasaAlbumsIndexer() {
+}
+
+void SafePicasaAlbumsIndexer::ProcessFoldersBatch() {
+  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  DCHECK_EQ(STARTED_READING_INI_FILES_STATE, parser_state_);
+
+  for (int i = 0; i < kPicasaINIReadBatchSize && !folders_queue_.empty(); ++i) {
+    base::FilePath folder_path = folders_queue_.front();
+    folders_queue_.pop();
+
+    FolderINIContents folder_ini;
+    folder_ini.folder_path = folder_path;
+
+    // See kPicasaINIFilename declaration for details.
+    if (file_util::ReadFileToString(
+            folder_path.AppendASCII(kPicasaINIFilename),
+            &folder_ini.ini_contents) ||
+        file_util::ReadFileToString(
+            folder_path.AppendASCII(kPicasaINIFilenameLegacy),
+            &folder_ini.ini_contents)) {
+      folders_inis_.push_back(folder_ini);

[vandebo (ex-Chrome), 2013/07/10 19:54:03]

It might make sense to push first to minimize the number of times the content
gets copied.

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

folder_inis_ is a vector. Are you suggesting pre-allocating the memory to avoid
the copies? The actual string data itself is in the heap somewhere anyways, so I
think the copies are actually cheap.

[vandebo (ex-Chrome), 2013/07/11 16:20:50]

If copying a std::string was truly cheap, we wouldn't use const ref's to
std::string args.

[tommycli, 2013/07/11 17:24:13]

Done.

+    }
+  }
+
+  // If queue of folders to process not empty, post self onto task runner again.
+  if (!folders_queue_.empty()) {
+    MediaFileSystemBackend::MediaTaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(&SafePicasaAlbumsIndexer::ProcessFoldersBatch,
+                   weak_factory_.GetWeakPtr()));
+  } else {
+    parser_state_ = FINISHED_READING_INI_FILES_STATE;
+    BrowserThread::PostTask(
+        BrowserThread::IO,
+        FROM_HERE,
+        base::Bind(&SafePicasaAlbumsIndexer::StartWorkOnIOThread, this));
+  }
+}
+
+void SafePicasaAlbumsIndexer::StartWorkOnIOThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_EQ(FINISHED_READING_INI_FILES_STATE, parser_state_);
+
+  std::vector<picasa::FolderINIContents> folder_inis;
+
+  UtilityProcessHost* host =
+      UtilityProcessHost::Create(this, base::MessageLoopProxy::current());
+  host->EnableZygote();
+  host->Send(new ChromeUtilityMsg_IndexPicasaAlbumsContents(album_uids_,
+                                                            folder_inis));

[vandebo (ex-Chrome), 2013/07/10 19:54:03]

Don't you want to send folders_inis_ ?

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

Yep! thanks.

+  parser_state_ = STARTED_PARSING_STATE;
+}
+
+void SafePicasaAlbumsIndexer::OnIndexPicasaAlbumsContentsFinished(
+    const AlbumImagesMap& albums_images) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  if (parser_state_ != STARTED_PARSING_STATE)
+    return;
+
+  MediaFileSystemBackend::MediaTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(callback_, albums_images));
+  parser_state_ = FINISHED_PARSING_STATE;
+}
+
+void SafePicasaAlbumsIndexer::OnProcessCrashed(int exit_code) {
+  OnIndexPicasaAlbumsContentsFinished(AlbumImagesMap());
+}
+
+bool SafePicasaAlbumsIndexer::OnMessageReceived(
+    const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(SafePicasaAlbumsIndexer, message)
+    IPC_MESSAGE_HANDLER(
+        ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished,
+        OnIndexPicasaAlbumsContentsFinished)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+}  // namespace picasa