Remove getCurrentDirectoryURL and getCurrentDirPath from directory_model.js

chrome/browser/resources/file_manager/foreground/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.
 
 'use strict';
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
@@ skipping 1921 matching lines @@
    * @private
    */
   FileManager.prototype.focusCurrentList_ = function() {
     if (this.listType_ == FileManager.ListType.DETAIL)
       this.table_.focus();
     else  // this.listType_ == FileManager.ListType.THUMBNAIL)
       this.grid_.focus();
   };
 
   /**
-   * Return full path of the current directory or null.
-   * @return {?string} The full path of the current directory.
-   */
-  FileManager.prototype.getCurrentDirectory = function() {
-    return this.directoryModel_ && this.directoryModel_.getCurrentDirPath();
-  };
-
-  /**
-   * Return URL of the current directory or null.
-   * @return {string} URL representing the current directory.
-   */
-  FileManager.prototype.getCurrentDirectoryURL = function() {
-    return this.directoryModel_ &&
-           this.directoryModel_.getCurrentDirectoryURL();
-  };
-
-  /**
    * Return DirectoryEntry of the current directory or null.
    * @return {DirectoryEntry} DirectoryEntry of the current directory. Returns
    *     null if the directory model is not ready or the current directory is
    *     not set.
    */
   FileManager.prototype.getCurrentDirectoryEntry = function() {
     return this.directoryModel_ && this.directoryModel_.getCurrentDirEntry();
   };
 
   /**
@@ skipping 230 matching lines @@
   };
 
   /**
    * Update the window title.
    * @private
    */
   FileManager.prototype.updateTitle_ = function() {
     if (this.dialogType != DialogType.FULL_PAGE)
       return;
 
-    var path = this.getCurrentDirectory();
+    // TODO(mtomasz): Use VolumeInfo.root instead.
+    var path = this.getCurrentDirectoryEntry().fullPath;
     var rootPath = PathUtil.getRootPath(path);
     this.document_.title = PathUtil.getRootLabel(rootPath) +
                            path.substring(rootPath.length);
   };
 
   /**
    * Update the gear menu.
    * @private
    */
   FileManager.prototype.updateGearMenu_ = function() {
@@ skipping 44 matching lines @@
 
   /**
    * Update the UI when the current directory changes.
    *
    * @param {Event} event The directory-changed event.
    * @private
    */
   FileManager.prototype.onDirectoryChanged_ = function(event) {
     this.selectionHandler_.onFileSelectionChanged();
     this.ui_.searchBox.clear();
-    util.updateAppState(this.getCurrentDirectory());
+    // TODO(mtomasz): Use Entry.toURL() instead of fullPath.
+    util.updateAppState(
+        this.getCurrentDirectoryEntry() &&
+        this.getCurrentDirectoryEntry().fullPath);
 
     // If the current directory is moved from the device's volume, do not
     // automatically close the window on device removal.
     if (event.previousDirEntry &&
         PathUtil.getRootPath(event.previousDirEntry.fullPath) !=
             PathUtil.getRootPath(event.newDirEntry.fullPath))
       this.closeOnUnmount_ = false;
 
     if (this.commandHandler)
       this.commandHandler.updateAvailability();
@@ skipping 201 matching lines @@
                   newName);
             } else {
               message = strf('ERROR_RENAMING', entry.name,
                              util.getFileErrorString(err.code));
             }
 
             this.alert.show(message);
           }.bind(this));
     };
 
-    // TODO(haruki): this.getCurrentDirectoryURL() might not return the actual
+    // TODO(haruki): this.getCurrentDirectoryEntry() might not return the actual
     // parent if the directory content is a search result. Fix it to do proper
     // validation.
-    this.validateFileName_(this.getCurrentDirectoryURL(),
+    this.validateFileName_(this.getCurrentDirectoryEntry(),
                            newName,
                            validationDone.bind(this));
   };
 
   /**
    * @private
    */
   FileManager.prototype.cancelRename_ = function() {
     this.renameInput_.currentEntry = null;
 
@@ skipping 324 matching lines @@
    */
   FileManager.prototype.onListKeyDown_ = function(event) {
     if (event.srcElement.tagName == 'INPUT') {
       // Ignore keydown handler in the rename input box.
       return;
     }
 
     switch (util.getKeyModifiers(event) + event.keyCode) {
       case '8':  // Backspace => Up one directory.
         event.preventDefault();
-        var path = this.getCurrentDirectory();
+        // TODO(mtomasz): Use Entry.getParent() instead.
+        if (!this.getCurrentDirectoryEntry())
+          break;
+        var path = this.getCurrentDirectoryEntry().fullPath;
         if (path && !PathUtil.isRootPath(path)) {
           var path = path.replace(/\/[^\/]+$/, '');
           this.directoryModel_.changeDirectory(path);
         }
         break;
 
       case '13':  // Enter => Change directory or perform default action.
         // TODO(dgozman): move directory action to dispatchSelectionAction.
         var selection = this.getSelection();
         if (selection.totalCount == 1 &&
@@ skipping 270 matching lines @@
    */
   FileManager.prototype.onOk_ = function(event) {
     if (this.dialogType == DialogType.SELECT_SAVEAS_FILE) {
       // Save-as doesn't require a valid selection from the list, since
       // we're going to take the filename from the text input.
       var filename = this.filenameInput_.value;
       if (!filename)
         throw new Error('Missing filename!');
 
       var directory = this.getCurrentDirectoryEntry();
-      var currentDirUrl = directory.toURL();
-      if (currentDirUrl.charAt(currentDirUrl.length - 1) != '/')
-        currentDirUrl += '/';
-      this.validateFileName_(currentDirUrl, filename, function(isValid) {
+      this.validateFileName_(directory, filename, function(isValid) {
         if (!isValid)
           return;
 
         if (util.isFakeEntry(directory)) {
           // Can't save a file into a fake directory.
           return;
         }
 
         var selectFileAndClose = function() {
+          // TODO(mtomasz): Clean this up by avoiding constructing a URL
+          //                via string concatenation.
+          var currentDirUrl = directory.toURL();
+          if (currentDirUrl.charAt(currentDirUrl.length - 1) != '/')
+          currentDirUrl += '/';
           this.selectFilesAndClose_({
             urls: [currentDirUrl + encodeURIComponent(filename)],
             multiple: false,
             filterIndex: this.getSelectedFilterIndex_(filename)
           });
         }.bind(this);
 
         directory.getFile(
             filename, {create: false},
             function(entry) {
@@ skipping 21 matching lines @@
             }.bind(this));
       }.bind(this));
       return;
     }
 
     var files = [];
     var selectedIndexes = this.currentList_.selectionModel.selectedIndexes;
 
     if (DialogType.isFolderDialog(this.dialogType) &&
         selectedIndexes.length == 0) {
-      var url = this.getCurrentDirectoryURL();
+      var url = this.getCurrentDirectoryEntry().toURL();
       var singleSelection = {
         urls: [url],
         multiple: false,
         filterIndex: this.getSelectedFilterIndex_()
       };
       this.selectFilesAndClose_(singleSelection);
       return;
     }
 
     // All other dialog types require at least one selected list item.
@@ skipping 48 matching lines @@
   /**
    * Verifies the user entered name for file or folder to be created or
    * renamed to. Name restrictions must correspond to File API restrictions
    * (see DOMFilePath::isValidPath). Curernt WebKit implementation is
    * out of date (spec is
    * http://dev.w3.org/2009/dap/file-system/file-dir-sys.html, 8.3) and going to
    * be fixed. Shows message box if the name is invalid.
    *
    * It also verifies if the name length is in the limit of the filesystem.
    *
-   * @param {string} parentUrl The URL of the parent directory entry.
+   * @param {DirectoryEntry} parentEntry The URL of the parent directory entry.
    * @param {string} name New file or folder name.
    * @param {function} onDone Function to invoke when user closes the
    *    warning box or immediatelly if file name is correct. If the name was
    *    valid it is passed true, and false otherwise.
    * @private
    */
-  FileManager.prototype.validateFileName_ = function(parentUrl, name, onDone) {
+  FileManager.prototype.validateFileName_ = function(
+      parentEntry, name, onDone) {
     var msg;
     var testResult = /[\/\\\<\>\:\?\*\"\|]/.exec(name);
     if (testResult) {
       msg = strf('ERROR_INVALID_CHARACTER', testResult[0]);
     } else if (/^\s*$/i.test(name)) {
       msg = str('ERROR_WHITESPACE_NAME');
     } else if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i.test(name)) {
       msg = str('ERROR_RESERVED_NAME');
     } else if (this.fileFilter_.isFilterHiddenOn() && name[0] == '.') {
       msg = str('ERROR_HIDDEN_NAME');
     }
 
     if (msg) {
       this.alert.show(msg, function() {
         onDone(false);
       });
       return;
     }
 
     var self = this;
     chrome.fileBrowserPrivate.validatePathNameLength(
-        parentUrl, name, function(valid) {
+        parentEntry.toURL(), name, function(valid) {
           if (!valid) {
             self.alert.show(str('ERROR_LONG_NAME'),
                             function() { onDone(false); });
           } else {
             onDone(true);
           }
         });
   };
 
   /**
@@ skipping 346 matching lines @@
       callback(this.preferences_);
       return;
     }
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
   };
 })();