gdata: Add GetEntryInfoByPath() and ReadDirectoryByPath() to GDataDirectoryService

chrome/browser/chromeos/gdata/gdata_files.cc

 // 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 "chrome/browser/chromeos/gdata/gdata_files.h"
 
 #include <leveldb/db.h>
 #include <vector>
 
 #include "base/message_loop_proxy.h"
@@ skipping 659 matching lines @@
   return iter == resource_map_.end() ? NULL : iter->second;
 }
 
 void GDataDirectoryService::GetEntryByResourceIdAsync(
     const std::string& resource_id,
     const GetEntryByResourceIdCallback& callback) {
   GDataEntry* entry = GetEntryByResourceId(resource_id);
   callback.Run(entry);
 }
 
+void GDataDirectoryService::GetEntryInfoByPath(
+    const FilePath& path,
+    const GetEntryInfoCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  scoped_ptr<GDataEntryProto> entry_proto;
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+
+  GDataEntry* entry = FindEntryByPathSync(path);
+  if (entry) {
+    entry_proto.reset(new GDataEntryProto);
+    entry->ToProtoFull(entry_proto.get());
+    error = GDATA_FILE_OK;
+  } else {
+    error = GDATA_FILE_ERROR_NOT_FOUND;
+  }
+
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(callback, error, base::Passed(&entry_proto)));
+}
+
+void GDataDirectoryService::ReadDirectoryByPath(
+    const FilePath& path,
+    const ReadDirectoryCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
+  scoped_ptr<GDataEntryProtoVector> entries;
+  GDataFileError error = GDATA_FILE_ERROR_FAILED;
+
+  GDataEntry* entry = FindEntryByPathSync(path);
+  if (entry && entry->AsGDataDirectory()) {
+    GDataDirectory* directory = entry->AsGDataDirectory();

[achuithb, 2012/08/07 21:39:20]

nit: Is this temporary necessary?

[satorux1, 2012/08/07 22:57:05]

Good catch. no longer needed.

+    entries = directory->ToProtoVector();
+    error = GDATA_FILE_OK;
+  } else if (entry && !entry->AsGDataDirectory()) {
+    error = GDATA_FILE_ERROR_NOT_A_DIRECTORY;
+  } else {
+    error = GDATA_FILE_ERROR_NOT_FOUND;
+  }
+
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(callback, error, base::Passed(&entries)));
+}
+
 void GDataDirectoryService::RefreshFile(scoped_ptr<GDataFile> fresh_file) {
   DCHECK(fresh_file.get());
 
   // Need to get a reference here because Passed() could get evaluated first.
   const std::string& resource_id = fresh_file->resource_id();
   GetEntryByResourceIdAsync(
       resource_id,
       base::Bind(&GDataDirectoryService::RefreshFileInternal,
                  base::Passed(&fresh_file)));
 }
@@ skipping 327 matching lines @@
     file->ToProto(proto->add_child_files());
   }
   for (GDataDirectoryCollection::const_iterator iter =
        child_directories_.begin();
        iter != child_directories_.end(); ++iter) {
     GDataDirectory* dir = iter->second;
     dir->ToProto(proto->add_child_directories());
   }
 }
 
+scoped_ptr<GDataEntryProtoVector> GDataDirectory::ToProtoVector() const {
+  scoped_ptr<GDataEntryProtoVector> entries(new GDataEntryProtoVector);
+  for (GDataFileCollection::const_iterator iter = child_files().begin();
+       iter != child_files().end(); ++iter) {
+    GDataEntryProto proto;
+    iter->second->ToProto(&proto);
+    entries->push_back(proto);
+  }
+  for (GDataDirectoryCollection::const_iterator iter =
+           child_directories().begin();
+       iter != child_directories().end(); ++iter) {
+    GDataEntryProto proto;
+    // Convert to GDataEntry, as we don't want to include children in |proto|.
+    static_cast<const GDataEntry*>(iter->second)->ToProtoFull(&proto);
+    entries->push_back(proto);
+  }
+
+  return entries.Pass();
+}
+
 void GDataEntry::SerializeToString(std::string* serialized_proto) const {
   const GDataFile* file = AsGDataFileConst();
   const GDataDirectory* dir = AsGDataDirectoryConst();
 
   if (file) {
     GDataEntryProto entry_proto;
     file->ToProto(&entry_proto);
     const bool ok = entry_proto.SerializeToString(serialized_proto);
     DCHECK(ok);
   } else if (dir) {
@@ skipping 60 matching lines @@
     if (file->FromProto(entry_proto)) {
       entry.reset(file.release());
     } else {
       NOTREACHED() << "FromProto (file) failed";
     }
   }
   return entry.Pass();
 }
 
 }  // namespace gdata