Add gdata content search to file_manager

chrome/browser/resources/file_manager/js/file_manager.js

 // 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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 35 matching lines @@
       FileManager.DialogType.SELECT_OPEN_MULTI_FILE,
       FileManager.DialogType.FULL_PAGE]);
 
   // TODO(dgozman): This will be changed to LocaleInfo.
   this.locale_ = new v8Locale(navigator.language);
 
   this.initFileSystem_();
   this.initDom_();
   this.initDialogType_();
   this.dialogDom_.style.opacity = '1';
+
+  this.lastNonGDataSearchPath_ = null;
 }
 
 FileManager.prototype = {
   __proto__: cr.EventTarget.prototype
 };
 
 // Anonymous "namespace".
 (function() {
 
   // Private variables and helper functions.
@@ skipping 905 matching lines @@
       this.commands_[key].disabled = !this.canExecute_(key);
   };
 
   /**
    * @param {string} commandId Command identifier.
    * @return {boolean} True if the command can be executed for current
    *                   selection.
    */
   FileManager.prototype.canExecute_ = function(commandId) {
     var readonly = this.isOnReadonlyDirectory();
+    var shouldCreate = !util.isSpecialReadonlyDirectory(
+                            this.directoryModel_.getCurrentDirEntry().fullPath);
     switch (commandId) {
       case 'copy':
       case 'cut':
         return this.document_.queryCommandEnabled(commandId);
 
       case 'paste':
         return !!this.fileTransferController_ &&
-               this.fileTransferController_.queryPasteCommandEnabled();
+               this.fileTransferController_.queryPasteCommandEnabled() &&

[SeRya, 2012/05/04 10:26:17]

What about dropping files into the search results?

[tbarzic, 2012/05/05 00:56:06]

Done.

+               shouldCreate;
 
       case 'rename':
         return (// Initialized to the point where we have a current directory
                 !readonly &&
                 // Rename not in progress.
                 !this.isRenamingInProgress() &&
                 // Only one file selected.
                 this.selection &&
                 this.selection.totalCount == 1);
 
       case 'delete':
         return (// Initialized to the point where we have a current directory
                 !readonly &&
                 // Rename not in progress.
                 !this.isRenamingInProgress() &&
                 this.selection &&
                 this.selection.totalCount > 0);
 
       case 'newfolder':
         return !readonly &&
+               shouldCreate &&
                (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE ||
                 this.dialogType_ == FileManager.DialogType.FULL_PAGE);
 
       case 'unmount':
         return true;
 
       case 'format':
         var entry = this.directoryModel_.getCurrentRootDirEntry();
 
         return entry && DirectoryModel.getRootType(entry.fullPath) ==
@@ skipping 804 matching lines @@
    * Render filename label for grid and list view.
    * @param {Entry} entry The Entry object to render.
    * @return {HTMLDivElement} The label.
    */
   FileManager.prototype.renderFileNameLabel_ = function(entry) {
     // Filename need to be in a '.filename-label' container for correct
     // work of inplace renaming.
     var fileName = this.document_.createElement('div');
     fileName.className = 'filename-label';
 
+    // If the entry is gdata search result, we should calculate name to use
+    // instead of using |entry.name|.
+    var gdataSearchResult =
+        util.getFileAndDisplayNameForGDataSearchResult(entry.fullPath);
+    var displayName = gdataSearchResult ? gdataSearchResult.displayName :
+                                          entry.name;
+
     fileName.textContent =
         this.directoryModel_.getCurrentDirEntry().name == '' ?
-            this.getRootLabel_(entry.name) : entry.name;
+            this.getRootLabel_(displayName) : displayName;
     return fileName;
   };
 
   /**
    * Render the Size column of the detail table.
    *
    * @param {Entry} entry The Entry object to render.
    * @param {string} columnId The id of the column to be rendered.
    * @param {cr.ui.Table} table The table doing the rendering.
    */
@@ skipping 1017 matching lines @@
       div.textContent = i == 0 ? this.getRootLabel_(path) : pathName;
 
       path = path + '/';
       div.path = path;
 
       bc.appendChild(div);
 
       if (i == pathNames.length - 1) {
         div.classList.add('breadcrumb-last');
       } else {
-        div.addEventListener('click', this.onBreadcrumbClick_.bind(this));
+        // This is virtual, inaccessible directory.
+        if (path == util.GDATA_SEARCH_ROOT_PATH) {
+          div.classList.add('breadcrumb-last');

[SeRya, 2012/05/04 10:26:17]

breadcrumb-last in the middle of the path looks strange. May be it should be
renamed.

if (i == pathNames.length - 1 || path == util.GDATA_SEARCH_ROOT_PATH) {...} is
shorter.

[tbarzic, 2012/05/05 00:56:06]

Done

+        } else {
+          div.addEventListener('click', this.onBreadcrumbClick_.bind(this));
+        }
 
         var spacer = doc.createElement('div');
         spacer.className = 'separator';
         bc.appendChild(spacer);
       }
     }
     this.truncateBreadcrumbs_();
   };
 
   FileManager.prototype.isRenamingInProgress = function() {
@@ skipping 649 matching lines @@
   };
 
   FileManager.prototype.onRenameInputBlur_ = function(event) {
     if (this.isRenamingInProgress() && !this.renameInput_.validation_)
       this.commitRename_();
   };
 
   FileManager.prototype.commitRename_ = function() {
     var input = this.renameInput_;
     var entry = input.currentEntry;
-    var newName = input.value;
+    var newNameInput = input.value;
+
+    // If we are renaming gdata search result, we'll have to format newName we
+    // use in file system operations like: <resource_id>.<file_name>.
+    var searchResultName =
+        util.getFileAndDisplayNameForGDataSearchResult(entry.fullPath);
+
+    var newName =
+        searchResultName ? searchResultName.resourceId + '.' + newNameInput :
+                           newNameInput;
+    var oldName = searchResultName ? searchResultName.displayName : entry.name;
 
     if (newName == entry.name) {
       this.cancelRename_();
       return;
     }
 
     var nameNode = this.findListItemForNode_(this.renameInput_).
                    querySelector('.filename-label');
 
     input.validation_ = true;
     function validationDone() {
       input.validation_ = false;
       // Alert dialog restores focus unless the item removed from DOM.
       if (this.document_.activeElement != input)
         this.cancelRename_();
     }
 
-    if (!this.validateFileName_(newName, validationDone.bind(this)))
+    if (!this.validateFileName_(newNameInput, validationDone.bind(this)))
       return;
 
     function onError(err) {
       nameNode.textContent = entry.name;
       this.alert.show(strf('ERROR_RENAMING', entry.name,
                            util.getFileErrorMnemonic(err.code)));
     }
 
     this.cancelRename_();
     // Optimistically apply new name immediately to avoid flickering in
     // case of success.
-    nameNode.textContent = newName;
+    nameNode.textContent = newNameInput;
 
     this.directoryModel_.doesExist(newName, function(exists, isFile) {

[SeRya, 2012/05/04 10:26:17]

I'd suggest to isolate the UI from knowlage about name transformation. Let's
DirectoryModel handles it.

doesExist and renameEntry should add the resource_id if neccessary,
DirectoryModel should expose getDieplayName(entry) method.

[tbarzic, 2012/05/05 00:56:06]

Really good point, that's much cleaner :)

       if (!exists) {
         this.directoryModel_.renameEntry(entry, newName, onError.bind(this));
       } else {
-        nameNode.textContent = entry.name;
+        nameNode.textContent = oldName;
         var message = isFile ? 'FILE_ALREADY_EXISTS' :
                                'DIRECTORY_ALREADY_EXISTS';
-        this.alert.show(strf(message, newName));
+        this.alert.show(strf(message, newNameInput));
       }
     }.bind(this));
   };
 
   FileManager.prototype.cancelRename_ = function() {
     this.renameInput_.currentEntry = null;
 
     var parent = this.renameInput_.parentNode;
     if (parent) {
       parent.removeAttribute('renaming');
@@ skipping 663 matching lines @@
     if (oldValue) {
       event.target.removeAttribute('checked');
     } else {
       event.target.setAttribute('checked', 'checked');
     }
   };
 
   FileManager.prototype.onSearchBoxUpdate_ = function(event) {
     var searchString = this.dialogDom_.querySelector('#search-box').value;
     if (searchString) {
-      this.directoryModel_.addFilter(
-          'searchbox',
-          function(e) {
-            return e.name.substr(0, searchString.length) == searchString;
-          });
+      if (!this.isOnGData()) {

[SeRya, 2012/05/04 10:26:17]

I think this is too low level logic. It should be placed into the
DirectoryModel. Let's introduce DirectoryModel.prototype.search =
function(queryString)

[tbarzic, 2012/05/05 00:56:06]

Done.

+        this.directoryModel_.addFilter(
+            'searchbox',
+            function(e) {
+              return e.name.substr(0, searchString.length) == searchString;
+            });
+      } else {
+        // If current path is not under gdata search dir, remeber it, so we can
+        // navigate to it when we exit search mode.
+        var currentDirPath = this.directoryModel_.getCurrentDirEntry().fullPath;
+        if (currentDirPath.search(util.GDATA_SEARCH_ROOT_PATH) != 0)
+          this.lastNonGDataSearchPath_ = currentDirPath;
+
+        this.directoryModel_.changeDirectory(

[SeRya, 2012/05/04 10:26:17]

changeDirectory causes putting the new directory into the browser history. I
don't think it's a good idea to add one record per key press into the history.

[tbarzic, 2012/05/05 00:56:06]

Done.

+            util.createGDataSearchPath(searchString));
+      }
     } else {
-      this.directoryModel_.removeFilter('searchbox');
+      if (!this.isOnGData()) {
+        this.directoryModel_.removeFilter('searchbox');
+      } else {
+        // Go to last known non gdata search directory.
+        var newDirectory = this.lastNonGDataSearchPath_ ||
+                           '/' + DirectoryModel.GDATA_DIRECTORY;

[SeRya, 2012/05/04 10:26:17]

You set GData root even if search started in a subfolder.

[tbarzic, 2012/05/05 00:56:06]

are you sure? What am I missing?

+        this.lastNonGDataSearchPath_ = null;
+        this.directoryModel_.changeDirectory(newDirectory);
+      }
     }
   };
 
   FileManager.prototype.decorateSplitter = function(splitterElement) {
     var self = this;
 
     var Splitter = cr.ui.Splitter;
 
     var customSplitter = cr.ui.define('div');
 
@@ skipping 114 matching lines @@
 
     this.directoryModel_.addEventListener('scan-completed', maybeShowBanner);
     this.directoryModel_.addEventListener('rescan-completed', maybeShowBanner);
 
     var style = this.document_.createElement('link');
     style.rel = 'stylesheet';
     style.href = 'css/gdrive_welcome.css';
     this.document_.head.appendChild(style);
   };
 })();