Files.app: Provide detailed change information on onDirectoryChanged event

chrome/browser/chromeos/drive/sync/entry_revert_performer.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/chromeos/drive/sync/entry_revert_performer.h"
 
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 namespace {
 
 FileError FinishRevert(ResourceMetadata* metadata,
                        const std::string& local_id,
                        google_apis::GDataErrorCode status,
                        scoped_ptr<google_apis::FileResource> file_resource,
-                       std::set<base::FilePath>* changed_directories) {
+                       FileChange* changed_files) {
   ResourceEntry entry;
   std::string parent_resource_id;
   FileError error = GDataToFileError(status);
   switch (error) {
     case FILE_ERROR_OK:
       if (!ConvertFileResourceToResourceEntry(*file_resource, &entry,
                                               &parent_resource_id))
         return FILE_ERROR_NOT_A_FILE;
       break;
 
     case FILE_ERROR_NOT_FOUND:
       entry.set_deleted(true);
       break;
 
     default:
       return error;
   }
 
   base::FilePath original_path;
   error = metadata->GetFilePath(local_id, &original_path);
   if (error != FILE_ERROR_OK)
     return error;
 
   if (entry.deleted()) {
     error = metadata->RemoveEntry(local_id);
     if (error != FILE_ERROR_OK)
       return error;
 
-    changed_directories->insert(original_path.DirName());
+    changed_files->Update(original_path,
+                          FileChange::FILE_TYPE_FILE,

[kinaba, 2014/06/23 05:37:43]

File type may be FILE or DIRECTORY here.

[yoshiki, 2014/06/24 02:02:22]

Done.

+                          FileChange::DELETE);
   } else {
     error = ChangeListProcessor::SetParentLocalIdOfEntry(metadata, &entry,
                                                          parent_resource_id);
     if (error != FILE_ERROR_OK)
       return error;
 
     entry.set_local_id(local_id);
     error = metadata->RefreshEntry(entry);
     if (error != FILE_ERROR_OK)
       return error;
 
-    base::FilePath new_parent_path;
-    error = metadata->GetFilePath(entry.parent_local_id(), &new_parent_path);
+    base::FilePath new_path;
+    error = metadata->GetFilePath(local_id, &new_path);
     if (error != FILE_ERROR_OK)
       return error;
-    changed_directories->insert(new_parent_path);
-    changed_directories->insert(original_path.DirName());
+
+    changed_files->Update(original_path,
+                          FileChange::FILE_TYPE_FILE,

[kinaba, 2014/06/23 05:37:43]

ditto

[yoshiki, 2014/06/24 02:02:22]

Done.

+                          FileChange::DELETE);
+    changed_files->Update(new_path,
+                          FileChange::FILE_TYPE_FILE,
+                          FileChange::ADD_OR_UPDATE);
   }
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 EntryRevertPerformer::EntryRevertPerformer(
     base::SequencedTaskRunner* blocking_task_runner,
     file_system::OperationObserver* observer,
     JobScheduler* scheduler,
@@ skipping 52 matching lines @@
 }
 
 void EntryRevertPerformer::RevertEntryAfterGetFileResource(
     const FileOperationCallback& callback,
     const std::string& local_id,
     google_apis::GDataErrorCode status,
     scoped_ptr<google_apis::FileResource> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  std::set<base::FilePath>* changed_directories = new std::set<base::FilePath>;
+  FileChange* changed_files = new FileChange;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
-      base::Bind(&FinishRevert, metadata_, local_id, status,
-                 base::Passed(&entry), changed_directories),
+      base::Bind(&FinishRevert,
+                 metadata_,
+                 local_id,
+                 status,
+                 base::Passed(&entry),
+                 changed_files),
       base::Bind(&EntryRevertPerformer::RevertEntryAfterFinishRevert,
-                 weak_ptr_factory_.GetWeakPtr(), callback,
-                 base::Owned(changed_directories)));
+                 weak_ptr_factory_.GetWeakPtr(),
+                 callback,
+                 base::Owned(changed_files)));
 }
 
 void EntryRevertPerformer::RevertEntryAfterFinishRevert(
     const FileOperationCallback& callback,
-    const std::set<base::FilePath>* changed_directories,
+    const FileChange* changed_files,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  for (std::set<base::FilePath>::const_iterator it =
-           changed_directories->begin(); it != changed_directories->end(); ++it)
-    observer_->OnDirectoryChangedByOperation(*it);
+  observer_->OnDirectoryChangedByOperation(*changed_files);
 
   callback.Run(error);
 }
 
 }  // namespace internal
 }  // namespace drive