[filemanager] Content metadata moved to the cache.

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 16 matching lines @@
   this.butterTimer_ = null;
   this.currentButter_ = null;
   this.butterLastShowTime_ = 0;
 
   this.watchedDirectoryUrl_ = null;
   this.filesystemObserverId_ = null;
   this.gdataObserverId_ = null;
 
   this.commands_ = {};
 
-  this.thumbnailUrlCache_ = {};
-
   this.document_ = dialogDom.ownerDocument;
   this.dialogType_ = this.params_.type || FileManager.DialogType.FULL_PAGE;
 
   metrics.recordEnum('Create', this.dialogType_,
       [FileManager.DialogType.SELECT_FOLDER,
       FileManager.DialogType.SELECT_SAVEAS_FILE,
       FileManager.DialogType.SELECT_OPEN_FILE,
       FileManager.DialogType.SELECT_OPEN_MULTI_FILE,
       FileManager.DialogType.FULL_PAGE]);
 
@@ skipping 261 matching lines @@
   };
 
   /**
    * Continue initializing the file manager after resolving roots.
    */
   FileManager.prototype.init_ = function() {
     metrics.startInterval('Load.DOM');
     this.initCommands_();
 
     this.metadataCache_ = MetadataCache.createFull();
+    // PyAuto tests monitor this state by polling this variable
+    this.__defineGetter__('workerInitialized_', function() {
+       return this.metadataCache_.isInitialized();
+    }.bind(this));
 
     this.shortDateFormatter_ =
       this.locale_.createDateTimeFormat({'dateType': 'medium'});
 
     this.collator_ = this.locale_.createCollator({
       'numeric': true, 'ignoreCase': true, 'ignoreAccents': true});
 
     // Optional list of file types.
     this.fileTypes_ = this.params_.typeList;
 
@@ skipping 80 matching lines @@
         'modificationTime';
     var sortDirection =
         window.localStorage['sort-direction-' + this.dialogType_] || 'desc';
     this.directoryModel_.sortFileList(sortField, sortDirection);
 
     this.refocus();
 
     this.metadataProvider_ =
         new MetadataProvider(this.filesystem_.root.toURL());
 
-    // PyAuto tests monitor this state by polling this variable
-    this.__defineGetter__('workerInitialized_', function() {
-       return self.getMetadataProvider().isInitialized();
-    });
-
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE)
       this.initDataTransferOperations_();
 
     this.table_.endBatchUpdates();
     this.grid_.endBatchUpdates();
 
     metrics.recordInterval('Load.DOM');
     metrics.recordInterval('Load.Total');
   };
 
@@ skipping 1232 matching lines @@
    * @return {HTMLDivElement} Thumbnal box.
    */
   FileManager.prototype.renderThumbnailBox_ = function(entry, fill,
                                                        opt_imageLoadCallback) {
     var box = this.document_.createElement('div');
     box.className = 'img-container';
     var img = this.document_.createElement('img');
     var self = this;
 
     function onThumbnailURL(iconType, url, transform) {
-      self.thumbnailUrlCache_[entry.fullPath] = {
-        iconType: iconType,
-        url: url,
-        transform: transform
-      };
       img.onload = function() {
         self.centerImage_(img.style, img.width, img.height, fill);
         if (opt_imageLoadCallback)
           opt_imageLoadCallback(img, transform);
         box.appendChild(img);
       };
       img.onerror = function() {
         // Use the default icon if we could not fetch the correct one.
         img.src = FileType.getPreviewArt(iconType);
         transform = null;
         util.applyTransform(box, transform);
       };
       img.src = url;
       util.applyTransform(box, transform);
     }
 
-    // TODO(dgozman): move to new metadata cache.
-    var cached = this.thumbnailUrlCache_[entry.fullPath];
-    if (cached)
-      onThumbnailURL(cached.iconType, cached.url, cached.transform);
-    else
-      this.getThumbnailURL(entry, onThumbnailURL);
+    this.getThumbnailURL(entry, onThumbnailURL);
 
     return box;
   };
 
   FileManager.prototype.decorateThumbnail_ = function(li, entry) {
     li.className = 'thumbnail-item';
 
     if (this.showCheckboxes_)
       li.appendChild(this.renderSelectionCheckbox_(entry));
 
@@ skipping 638 matching lines @@
             '/' + DirectoryModel.GDATA_DIRECTORY;
   };
 
   FileManager.prototype.isStartingOnGData_ = function() {
     var path = this.getPathFromUrlOrParams_();
     return path &&
         FileManager.isGDataEnabled() &&
         DirectoryModel.getRootType(path) == DirectoryModel.RootType.GDATA;
   };
 
-  FileManager.prototype.getMetadataProvider = function() {
-    return this.metadataProvider_;
-  };
-
   /**
    * Callback called when tasks for selected files are determined.
    * @param {Object} selection Selection is passed here, since this.selection
    *     can change before tasks were found, and we should be accurate.
    * @param {Array.<Task>} tasksList The tasks list.
    */
   FileManager.prototype.onTasksFound_ = function(selection, tasksList) {
     this.taskItems_.clear();
 
     var defaultTask = null;
@@ skipping 508 matching lines @@
       var context = {
         // We show the root label in readonly warning (e.g. archive name).
         readonlyDirName:
             readonly ?
                 (self.isOnGData() ?
                     self.getRootLabel_(
                         DirectoryModel.getRootPath(currentDir.fullPath)) :
                     self.directoryModel_.getRootName()) :
                 null,
         saveDirEntry: readonly ? downloadsDir : currentDir,
-        metadataProvider: self.getMetadataProvider(),
+        metadataProvider: self.metadataProvider_,
         getShareActions: self.getShareActions_.bind(self),
         onNameChange: function(name) {
           self.document_.title = gallerySelection = name;
           self.updateLocation_(true /*replace*/, dirPath + '/' + name);
         },
         onClose: function() {
           if (singleSelection)
             self.directoryModel_.selectEntry(gallerySelection);
           history.back(1);
         },
@@ skipping 144 matching lines @@
     currentWidth = Math.min(currentWidth,
                             containerWidth - pathWidth - collapsedWidth);
     bc.lastChild.style.width = (currentWidth - lastCrumbSeparatorWidth) + 'px';
   };
 
   FileManager.prototype.getThumbnailURL = function(entry, callback) {
     if (!entry)
       return;
 
     var iconType = FileType.getIcon(entry);
+    var metadataCache = this.metadataCache_;
 
     function returnStockIcon() {
-      callback(iconType, FileType.getPreviewArt(iconType));
+      callback(iconType, FileType.getPreviewArt(iconType), '');
     }
 
-    var self = this;
-    this.getMetadataProvider().fetch(entry.toURL(), function(metadata) {
-      if (metadata.thumbnailURL) {
-        callback(iconType, metadata.thumbnailURL,
-                 metadata.thumbnailTransform);
+    function tryUsingImageUrl() {
+      metadataCache.get(entry, 'filesystem|media', function(metadata) {
+        if (FileType.canUseImageUrlForPreview(
+                metadata.media.width,
+                metadata.media.height,
+                metadata.filesystem.size)) {
+          callback(iconType, entry.toURL(), metadata.media.imageTransform);
+        } else {
+          returnStockIcon();
+        }
+      });
+    }
+
+    metadataCache.get(entry, 'thumbnail', function(thumbnail) {
+      if (thumbnail) {
+        callback(iconType, thumbnail.url, thumbnail.transform);
       } else if (iconType == 'image') {
-        self.metadataCache_.get(entry, 'filesystem', function(filesystem) {
-          if (FileType.canUseImageUrlForPreview(metadata, filesystem.size)) {
-            callback(iconType, entry.toURL(), metadata.imageTransform);
-          } else {
-            returnStockIcon();
-          }
-        });
+        tryUsingImageUrl();
       } else {
         returnStockIcon();
       }
     });
   };
 
   FileManager.prototype.focusCurrentList_ = function() {
     if (this.listType_ == FileManager.ListType.DETAIL)
       this.table_.focus();
     else  // this.listType_ == FileManager.ListType.THUMBNAIL)
@@ skipping 166 matching lines @@
       if (this.selection &&
           this.selection.totalCount == 1 &&
           this.selection.entries[0].isFile &&
           this.filenameInput_.value != this.selection.entries[0].name) {
         this.filenameInput_.value = this.selection.entries[0].name;
       }
     }
 
     this.updateOkButton_();
 
-    var newThumbnailUrlCache = {};
-    if (this.selection) {
-      var entries = this.selection.entries;
-      for (var i = 0; i < entries.length; i++) {
-        var path = entries[i].fullPath;
-        if (path in this.thumbnailUrlCache_)
-          newThumbnailUrlCache[path] = this.thumbnailUrlCache_[path];
-      }
-    }
-    this.thumbnailUrlCache_ = newThumbnailUrlCache;
-
     setTimeout(this.onSelectionChangeComplete_.bind(this, event), 0);
   };
 
   /**
    * Handle selection change related tasks that won't run properly during
    * the actual selection change event.
    */
   FileManager.prototype.onSelectionChangeComplete_ = function(event) {
     // Inform tests it's OK to click buttons now.
     chrome.test.sendMessage('selection-change-complete');
@@ skipping 1198 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);
   };
 })();