File manager: support for zipping selected files.

chrome/browser/chromeos/extensions/file_browser_private_api.cc

Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index 764b1da03115014046403b867a45e222f271d304..31e9a971d4e421004ae6644577c6c52e0e031519 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/extensions/file_handler_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
+#include "chrome/browser/chromeos/extensions/zip_file_creator.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
@@ -82,6 +83,7 @@ using content::ChildProcessSecurityPolicy;
 using content::SiteInstance;
 using content::WebContents;
 using extensions::Extension;
+using extensions::ZipFileCreator;
 using file_handler_util::FileTaskExecutor;
 using google_apis::InstalledApp;
 
@@ -1923,6 +1925,7 @@ bool FileDialogStringsFunction::RunImpl() {
 
   SET_STRING(IDS_FILE_BROWSER, COPY_BUTTON_LABEL);
   SET_STRING(IDS_FILE_BROWSER, CUT_BUTTON_LABEL);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_SELECTION_BUTTON_LABEL);
 
   SET_STRING(IDS_FILE_BROWSER, OPEN_WITH_BUTTON_LABEL);
 
@@ -1943,6 +1946,12 @@ bool FileDialogStringsFunction::RunImpl() {
   SET_STRING(IDS_FILE_BROWSER, MOVE_TARGET_EXISTS_ERROR);
   SET_STRING(IDS_FILE_BROWSER, MOVE_FILESYSTEM_ERROR);
   SET_STRING(IDS_FILE_BROWSER, MOVE_UNEXPECTED_ERROR);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_FILE_NAME);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_ITEMS_REMAINING);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_CANCELLED);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_TARGET_EXISTS_ERROR);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_FILESYSTEM_ERROR);
+  SET_STRING(IDS_FILE_BROWSER, ZIP_UNEXPECTED_ERROR);
 
   SET_STRING(IDS_FILE_BROWSER, DELETED_MESSAGE_PLURAL);
   SET_STRING(IDS_FILE_BROWSER, DELETED_MESSAGE);
@@ -2896,3 +2905,102 @@ bool RequestDirectoryRefreshFunction::RunImpl() {
 
   return true;
 }
+
+ZipSelectionFunction::ZipSelectionFunction() {
+}
+
+ZipSelectionFunction::~ZipSelectionFunction() {
+}
+
+bool ZipSelectionFunction::RunImpl() {
+  if (args_->GetSize() < 3) {
+    return false;
+  }
+
+  // First param is the source directory URL.
+  std::string dir_url;
+  if (!args_->GetString(0, &dir_url) || dir_url.empty())
+    return false;
+
+  // Second param is the list of selected file URLs.
+  ListValue* selection_urls = NULL;
+  args_->GetList(1, &selection_urls);
+  if (!selection_urls || !selection_urls->GetSize())
+    return false;
+
+  // Third param is the name of the output zip file.
+  std::string dest_name;
+  if (!args_->GetString(2, &dest_name) || dest_name.empty())
+    return false;
+
+  UrlList file_urls;
+  size_t len = selection_urls->GetSize();
+  file_urls.reserve(len + 1);
+  file_urls.push_back(GURL(dir_url));
+  for (size_t i = 0; i < len; ++i) {
+    std::string file_url;
+    selection_urls->GetString(i, &file_url);
+    file_urls.push_back(GURL(file_url));
+  }
+
+  GetLocalPathsOnFileThreadAndRunCallbackOnUIThread(
+      file_urls,
+      base::Bind(&ZipSelectionFunction::GetLocalPathsResponseOnUIThread,
+                 this,
+                 dest_name));
+  return true;
+}
+
+void ZipSelectionFunction::GetLocalPathsResponseOnUIThread(
+    const std::string dest_name,
+    const SelectedFileInfoList& files) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (files.size() <= 1) {
+    NOTREACHED();
+    SendResponse(false);
+    return;
+  }
+
+  SelectedFileInfoList::const_iterator iter = files.begin();
+  FilePath src_dir = iter->file_path;
+
+  // Check if the dir path is under Drive cache directory.
+  // TODO(hshi): support create zip file on Drive (crbug.com/158690).
+  drive::DriveSystemService* system_service =
+      drive::DriveSystemServiceFactory::GetForProfile(profile_);
+  drive::DriveCache* cache = system_service ? system_service->cache() : NULL;
+  if (cache && cache->IsUnderDriveCacheDirectory(src_dir)) {
+    SendResponse(false);
+    return;
+  }
+
+  FilePath dest_file = src_dir.Append(dest_name);
+  std::vector<FilePath> src_relative_paths;
+  for (++iter; iter != files.end(); ++iter) {
+    const FilePath& file_path = iter->file_path;
+
+    // Obtain the relative path of |file_path| under |src_dir|.
+    // Only files under |src_dir| are added to the created zip file.
+    FilePath relative_path;
+    if (src_dir.AppendRelativePath(file_path, &relative_path))

[tbarzic, 2012/11/10 03:40:56]

I'd prefer it this failed in case there is a file that's not under |src_dir|
than silently ignore the file (as a user, I'd be surprised if a file I selected
is not successfully zipped file).

also, all the source files passed to the function should be relative to src_dir,
so |src_dir| not being |file_path| is an error in the extension code (so we
should let the extension know it's doing something wrong)

[hshi1, 2012/11/12 20:12:12]

Done.

+      src_relative_paths.push_back(relative_path);
+  }
+
+  zip_file_creator_ = new ZipFileCreator(this, src_dir, src_relative_paths,
+                                         dest_file);
+  if (!BrowserThread::PostTask(
+          BrowserThread::FILE, FROM_HERE,
+          base::Bind(&ZipFileCreator::Start, zip_file_creator_))) {
+    NOTREACHED();
+    SendResponse(false);
+    return;
+  }
+
+  // Keep the refcount until the zipping is complete on utility process.
+  AddRef();
+}
+
+void ZipSelectionFunction::OnZipDone(bool success) {
+  SendResponse(success);

[tbarzic, 2012/11/10 03:40:56]

how about

SetResult(new base::FundamentalValue(success));
SendResponse(true);


and add bool argument to zipSelection callback?

[hshi1, 2012/11/12 20:12:12]

Done.

+  Release();
+}