Gallery: Start to use new metadata model in Gallery.

ui/file_manager/gallery/js/gallery.js

 // Copyright 2014 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.
 
 /**
  * Overrided metadata worker's path.
  * @type {string}
  */
 ContentProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
 ContentMetadataProvider.WORKER_SCRIPT = '/js/metadata_worker.js';
@@ skipping 39 matching lines @@
   };
   this.container_ = queryRequiredElement(document, '.gallery');
   this.document_ = document;
   this.metadataCache_ = this.context_.metadataCache;
   this.volumeManager_ = volumeManager;
   /**
    * @private {!MetadataModel}
    * @const
    */
   this.metadataModel_ = MetadataModel.create(volumeManager);
+  /**
+   * @private {!ThumbnailModel}
+   * @const
+   */
+  this.thumbnailModel_ = new ThumbnailModel(this.metadataModel_);
   this.selectedEntry_ = null;
   this.metadataCacheObserverId_ = null;
   this.onExternallyUnmountedBound_ = this.onExternallyUnmounted_.bind(this);
   this.initialized_ = false;
 
   this.dataModel_ = new GalleryDataModel(
       this.context_.metadataCache,
       this.metadataModel_);
   var downloadVolumeInfo = this.volumeManager_.getCurrentProfileVolumeInfo(
       VolumeManagerCommon.VolumeType.DOWNLOADS);
@@ skipping 86 matching lines @@
                                     this.volumeManager_,
                                     this.toggleMode_.bind(this, undefined));
 
   this.slideMode_ = new SlideMode(this.container_,
                                   content,
                                   this.toolbar_,
                                   this.prompt_,
                                   this.errorBanner_,
                                   this.dataModel_,
                                   this.selectionModel_,
+                                  this.metadataModel_,
+                                  this.thumbnailModel_,
                                   this.context_,
                                   this.volumeManager_,
                                   this.toggleMode_.bind(this),
                                   str);
 
   this.slideMode_.addEventListener('image-displayed', function() {
     cr.dispatchSimpleEvent(this, 'image-displayed');
   }.bind(this));
   this.slideMode_.addEventListener('image-saved', function() {
     cr.dispatchSimpleEvent(this, 'image-saved');
@@ skipping 127 matching lines @@
  * Loads the content.
  *
  * @param {!Array.<!Entry>} entries Array of entries.
  * @param {!Array.<!Entry>} selectedEntries Array of selected entries.
  * @private
  */
 Gallery.prototype.loadInternal_ = function(entries, selectedEntries) {
   // Obtains max chank size.
   var maxChunkSize = 20;
   var volumeInfo = this.volumeManager_.getVolumeInfo(entries[0]);
-  if (volumeInfo &&
-      volumeInfo.volumeType === VolumeManagerCommon.VolumeType.MTP) {
-    maxChunkSize = 1;
+  if (volumeInfo) {
+    if (volumeInfo.volumeType === VolumeManagerCommon.VolumeType.MTP)
+      maxChunkSize = 1;
+    if (volumeInfo.isReadOnly)
+      this.context_.readonlyDirName = volumeInfo.label;
   }
-  if (volumeInfo.isReadOnly)
-    this.context_.readonlyDirName = volumeInfo.label;
 
   // Make loading list.
   var entrySet = {};
   for (var i = 0; i < entries.length; i++) {
     var entry = entries[i];
     entrySet[entry.toURL()] = {
       entry: entry,
       selected: false,
       index: i
     };
@@ skipping 25 matching lines @@
   }
 
   // Load entries.
   // Use the self variable capture-by-closure because it is faster than bind.
   var self = this;
   var loadChunk = function(firstChunk) {
     // Extract chunk.
     var chunk = loadingList.splice(0, maxChunkSize);
     if (!chunk.length)
       return;
-
-    return new Promise(function(fulfill) {
+    var entries = chunk.map(function(chunkItem) {
+      return chunkItem.entry;
+    });
+    var oldMetadataPromise = new Promise(function(fulfill) {
       // Obtains metadata for chunk.
-      var entries = chunk.map(function(chunkItem) {
-        return chunkItem.entry;
-      });
       self.metadataCache_.get(entries, Gallery.METADATA_TYPE, fulfill);
     }).then(function(metadataList) {
       if (chunk.length !== metadataList.length)
         return Promise.reject('Failed to load metadata.');
-
+      return metadataList;
+    });
+    var metadataPromise = self.metadataModel_.get(
+        entries, ['imageWidth', 'imageHeight', 'size']);
+    return Promise.all([oldMetadataPromise, metadataPromise]).then(
+        function(metadataList) {

[yawano, 2015/03/03 04:14:50]

very small nit: We uses metadataList in this function with different meaning
(for different type of variable). How about to use metadataLists here?

[hirono, 2015/03/04 05:07:04]

Done.

       // Remove all the previous items if it's the first chunk.
       // Do it here because prevent a flicker between removing all the items
       // and adding new ones.
       if (firstChunk) {
         self.dataModel_.splice(0, self.dataModel_.length);
         self.updateThumbnails_();  // Remove the caches.
       }
 
       // Add items to the model.
       var items = [];
       chunk.forEach(function(chunkItem, index) {
         var locationInfo = self.volumeManager_.getLocationInfo(chunkItem.entry);
         if (!locationInfo)  // Skip the item, since gone.
           return;
-        var clonedMetadata = MetadataCache.cloneMetadata(metadataList[index]);
+        var clonedMetadata =
+            MetadataCache.cloneMetadata(metadataList[0][index]);
         items.push(new Gallery.Item(
             chunkItem.entry,
             locationInfo,
             clonedMetadata,
+            metadataList[1][index],
             self.metadataCache_,
             self.metadataModel_,
             /* original */ true));
       });
       self.dataModel_.push.apply(self.dataModel_, items);
 
       // Apply the selection.
       var selectionUpdated = false;
       for (var i = 0; i < chunk.length; i++) {
         if (!chunk[i].selected)
@@ skipping 574 matching lines @@
 initializePromise.then(reload);
 
 /**
  * Enteres the debug mode.
  */
 window.debugMe = function() {
   initializePromise.then(function() {
     gallery.debugMe();
   });
 };