[Linux, Media Gallery] Fix MTPRecursiveDeviceObjectEnumerator to recursively enumerate all the medi…

chrome/browser/media_gallery/linux/mtp_recursive_device_object_enumerator.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/media_gallery/linux/mtp_recursive_device_object_enumerator.h"
 
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/media_gallery/linux/mtp_device_object_enumerator.h"
 #include "chrome/browser/media_gallery/linux/mtp_read_directory_worker.h"
 
 namespace chrome {
 
 MTPRecursiveDeviceObjectEnumerator::MTPRecursiveDeviceObjectEnumerator(
     const std::string& handle,
     base::SequencedTaskRunner* task_runner,
     const std::vector<MtpFileEntry>& entries,
     base::WaitableEvent* task_completed_event,
     base::WaitableEvent* shutdown_event)
     : device_handle_(handle),
       media_task_runner_(task_runner),
-      file_entries_(entries),
-      file_entry_iter_(file_entries_.begin()),
       on_task_completed_event_(task_completed_event),
       on_shutdown_event_(shutdown_event) {
   DCHECK(on_task_completed_event_);
   DCHECK(on_shutdown_event_);
+  DCHECK(!entries.empty());
   current_enumerator_.reset(new MTPDeviceObjectEnumerator(entries));
 }
 
 MTPRecursiveDeviceObjectEnumerator::~MTPRecursiveDeviceObjectEnumerator() {
 }
 
 FilePath MTPRecursiveDeviceObjectEnumerator::Next() {
   if (on_shutdown_event_->IsSignaled()) {
     // Process is in shut down mode.
     return FilePath();
   }
 
-  FilePath path = current_enumerator_->Next();
-  if (!path.empty())
-    return path;
+  MTPDeviceObjectEnumerator* enumerator =
+      static_cast<MTPDeviceObjectEnumerator*>(current_enumerator_.get());
+  if (!enumerator) {

[Lei Zhang, 2013/01/12 00:08:36]

I fail to see how this helps. How does |enumerator| ever become NULL?

[kmadhusu, 2013/01/12 01:03:53]

Removed this check and modified code to handle the failure gracefully using an
explicit empty enumerator.

+    // This should not ever be null. If it happens this function is not used
+    // correctly.
+    // Correct usage:
+    //   while (!enumerator->Next().empty()) {
+    //     // doSomething();
+    //   }
+    return FilePath();
+  }
 
-  // We reached the end.
-  if (file_entry_iter_ == file_entries_.end())
-    return FilePath();
+  if (!enumerator->HasMoreEntries())
+      UpdateEnumeratorToTraverseSubdirectory();
 
-  // Enumerate subdirectories of the next media file entry.
-  MtpFileEntry next_file_entry = *file_entry_iter_;
-  ++file_entry_iter_;
-
-  // Create a MTPReadDirectoryWorker object to enumerate sub directories.
-  scoped_refptr<MTPReadDirectoryWorker> worker(new MTPReadDirectoryWorker(
-      device_handle_, next_file_entry.item_id(), media_task_runner_,
-      on_task_completed_event_, on_shutdown_event_));
-  worker->Run();
-  if (!worker->get_file_entries().empty()) {
-    current_enumerator_.reset(
-        new MTPDeviceObjectEnumerator(worker->get_file_entries()));
-  } else {
-    current_enumerator_.reset(
-        new fileapi::FileSystemFileUtil::EmptyFileEnumerator());
+  if (IsDirectory()) {
+    // If the current entry is a directory, add it to
+    // |untraversed_directory_entry_ids_| to scan after scanning this directory.
+    DirectoryEntryId dir_entry_id;
+    if (static_cast<MTPDeviceObjectEnumerator*>(
+            current_enumerator_.get())->GetEntryId(&dir_entry_id))
+      untraversed_directory_entry_ids_.push(dir_entry_id);
   }
   return current_enumerator_->Next();
 }
 
 int64 MTPRecursiveDeviceObjectEnumerator::Size() {
   return current_enumerator_->Size();
 }
 
 bool MTPRecursiveDeviceObjectEnumerator::IsDirectory() {
   return current_enumerator_->IsDirectory();
 }
 
 base::Time MTPRecursiveDeviceObjectEnumerator::LastModifiedTime() {
   return current_enumerator_->LastModifiedTime();
 }
 
+void MTPRecursiveDeviceObjectEnumerator::
+UpdateEnumeratorToTraverseSubdirectory() {
+  while (!untraversed_directory_entry_ids_.empty()) {
+    // Create a MTPReadDirectoryWorker object to enumerate sub directories.
+    DirectoryEntryId dir_entry_id = untraversed_directory_entry_ids_.front();
+    untraversed_directory_entry_ids_.pop();
+    scoped_refptr<MTPReadDirectoryWorker> worker(new MTPReadDirectoryWorker(
+        device_handle_, dir_entry_id, media_task_runner_,
+        on_task_completed_event_, on_shutdown_event_));
+    worker->Run();
+    if (!worker->get_file_entries().empty()) {
+      current_enumerator_.reset(
+          new MTPDeviceObjectEnumerator(worker->get_file_entries()));
+      return;
+    }
+  }
+
+  // Reached the end. Traversed all the sub directories.
+  current_enumerator_.reset(
+      new fileapi::FileSystemFileUtil::EmptyFileEnumerator());
+}
+
 }  // namespace chrome