Migrate from URLs to Entries in the Files App's gallery.

chrome/browser/resources/file_manager/foreground/js/photo/slide_mode.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';
 
 /**
  * Slide mode displays a single image and has a set of controls to navigate
  * between the images and to edit an image.
  *
@@ skipping 270 matching lines @@
       this.savedSelection_ = null;
     else
       this.savedSelection_ = currentSelection;
 
     // Ensure valid single selection.
     // Note that the SlideMode object is not listening to selection change yet.
     this.select(Math.max(0, this.getSelectedIndex()));
     this.displayedIndex_ = this.getSelectedIndex();
 
     var selectedItem = this.getSelectedItem();
-    var selectedUrl = selectedItem.getUrl();
     // Show the selected item ASAP, then complete the initialization
     // (loading the ribbon thumbnails can take some time).
-    this.metadataCache_.get(selectedUrl, Gallery.METADATA_TYPE,
+    this.metadataCache_.get(selectedItem.getEntry(), Gallery.METADATA_TYPE,
         function(metadata) {
-          this.loadItem_(selectedUrl, metadata,
+          this.loadItem_(selectedItem.getEntry(), metadata,
               zoomFromRect && this.imageView_.createZoomEffect(zoomFromRect),
               displayCallback, loadDone);
         }.bind(this));
 
   }
 };
 
 /**
  * Leave the mode.
  * @param {Rect} zoomToRect Rectangle for zoom effect.
@@ skipping 163 matching lines @@
     this.sequenceLength_++;
   } else {
     // Reversed the direction. Reset the counter.
     this.sequenceDirection_ = step;
     this.sequenceLength_ = 1;
   }
 
   if (this.sequenceLength_ <= 1) {
     // We have just broke the sequence. Touch the current image so that it stays
     // in the cache longer.
-    this.imageView_.prefetch(this.imageView_.contentID_);
+    this.imageView_.prefetch(this.imageView_.contentEntry_);
   }
 
   this.displayedIndex_ = index;
 
   function shouldPrefetch(loadType, step, sequenceLength) {
     // Never prefetch when selecting out of sequence.
     if (Math.abs(step) != 1)
       return false;
 
     // Never prefetch after a video load (decoding the next image can freeze
     // the UI for a second or two).
     if (loadType == ImageView.LOAD_TYPE_VIDEO_FILE)
       return false;
 
     // Always prefetch if the previous load was from cache.
     if (loadType == ImageView.LOAD_TYPE_CACHED_FULL)
       return true;
 
     // Prefetch if we have been going in the same direction for long enough.
     return sequenceLength >= 3;
   }
 
   var selectedItem = this.getSelectedItem();
   this.currentUniqueKey_++;
   var selectedUniqueKey = this.currentUniqueKey_;
   var onMetadata = function(metadata) {
     // Discard, since another load has been invoked after this one.
     if (selectedUniqueKey != this.currentUniqueKey_) return;
-    this.loadItem_(selectedItem.getUrl(), metadata,
+    this.loadItem_(selectedItem.getEntry(), metadata,
         new ImageView.Effect.Slide(step, this.isSlideshowPlaying_()),
         function() {} /* no displayCallback */,
         function(loadType, delay) {
           // Discard, since another load has been invoked after this one.
           if (selectedUniqueKey != this.currentUniqueKey_) return;
           if (shouldPrefetch(loadType, step, this.sequenceLength_)) {
             this.requestPrefetch(step, delay);
           }
           if (this.isSlideshowPlaying_())
             this.scheduleNextSlide_();
         }.bind(this));
   }.bind(this);
   this.metadataCache_.get(
-      selectedItem.getUrl(), Gallery.METADATA_TYPE, onMetadata);
+      selectedItem.getEntry(), Gallery.METADATA_TYPE, onMetadata);
 };
 
 /**
  * Unload the current image.
  *
  * @param {Rect} zoomToRect Rectangle for zoom effect.
  * @private
  */
 SlideMode.prototype.unloadImage_ = function(zoomToRect) {
   this.imageView_.unload(zoomToRect);
@@ skipping 105 matching lines @@
  */
 SlideMode.prototype.selectLast = function() {
   this.select(this.getItemCount_() - 1);
 };
 
 // Loading/unloading
 
 /**
  * Load and display an item.
  *
- * @param {string} url Item url.
+ * @param {FileEntry} entry Item entry to be loaded.
  * @param {Object} metadata Item metadata.
  * @param {Object} effect Transition effect object.
  * @param {function} displayCallback Called when the image is displayed
  *     (which can happen before the image load due to caching).
  * @param {function} loadCallback Called when the image is fully loaded.
  * @private
  */
 SlideMode.prototype.loadItem_ = function(
-    url, metadata, effect, displayCallback, loadCallback) {
+    entry, metadata, effect, displayCallback, loadCallback) {
   this.selectedImageMetadata_ = MetadataCache.cloneMetadata(metadata);
 
   this.showSpinner_(true);
 
   var loadDone = function(loadType, delay, error) {
     var video = this.isShowingVideo_();
     ImageUtil.setAttribute(this.container_, 'video', video);
 
     this.showSpinner_(false);
     if (loadType == ImageView.LOAD_TYPE_ERROR) {
@@ skipping 23 matching lines @@
         return Math.round(number / (1000 * 1000));
       };
 
       ImageUtil.metrics.recordSmallCount(ImageUtil.getMetricName('Size.MB'),
           toMillions(metadata.filesystem.size));
 
       var canvas = this.imageView_.getCanvas();
       ImageUtil.metrics.recordSmallCount(ImageUtil.getMetricName('Size.MPix'),
           toMillions(canvas.width * canvas.height));
 
-      var extIndex = url.lastIndexOf('.');
-      var ext = extIndex < 0 ? '' : url.substr(extIndex + 1).toLowerCase();
+      var extIndex = entry.name.lastIndexOf('.');
+      var ext = extIndex < 0 ? '' :
+          entry.name.substr(extIndex + 1).toLowerCase();
       if (ext == 'jpeg') ext = 'jpg';
       ImageUtil.metrics.recordEnum(
           ImageUtil.getMetricName('FileType'), ext, ImageUtil.FILE_TYPES);
     }
 
     // Enable or disable buttons for editing and printing.
     if (video || error) {
       this.editButton_.setAttribute('disabled', '');
       this.printButton_.setAttribute('disabled', '');
     } else {
@@ skipping 18 matching lines @@
         }.bind(this));
 
     loadCallback(loadType, delay);
   }.bind(this);
 
   var displayDone = function() {
     cr.dispatchSimpleEvent(this, 'image-displayed');
     displayCallback();
   }.bind(this);
 
-  this.editor_.openSession(url, metadata, effect,
+  this.editor_.openSession(entry, metadata, effect,
       this.saveCurrentImage_.bind(this), displayDone, loadDone);
 };
 
 /**
  * Commit changes to the current item and reset all messages/indicators.
  *
  * @param {function} callback Callback.
  * @private
  */
 SlideMode.prototype.commitItem_ = function(callback) {
@@ skipping 21 matching lines @@
  * Request a prefetch for the next image.
  *
  * @param {number} direction -1 or 1.
  * @param {number} delay Delay in ms. Used to prevent the CPU-heavy image
  *   loading from disrupting the animation that might be still in progress.
  */
 SlideMode.prototype.requestPrefetch = function(direction, delay) {
   if (this.getItemCount_() <= 1) return;
 
   var index = this.getNextSelectedIndex_(direction);
-  var nextItemUrl = this.getItem(index).getUrl();
-  this.imageView_.prefetch(nextItemUrl, delay);
+  var nextItemEntry = this.getItem(index).getEntry();
+  this.imageView_.prefetch(nextItemEntry, delay);
 };
 
 // Event handlers.
 
 /**
  * Unload handler, to be called from the top frame.
  * @param {boolean} exiting True if the app is exiting.
  */
 SlideMode.prototype.onUnload = function(exiting) {
   if (this.isShowingVideo_() && this.mediaControls_.isPlaying()) {
@@ skipping 139 matching lines @@
 // Saving
 
 /**
  * Save the current image to a file.
  *
  * @param {function} callback Callback.
  * @private
  */
 SlideMode.prototype.saveCurrentImage_ = function(callback) {
   var item = this.getSelectedItem();
-  var oldUrl = item.getUrl();
+  var oldEntry = item.getEntry();
   var canvas = this.imageView_.getCanvas();
 
   this.showSpinner_(true);
   var metadataEncoder = ImageEncoder.encodeMetadata(
       this.selectedImageMetadata_.media, canvas, 1 /* quality */);
 
   this.selectedImageMetadata_ = ContentProvider.ConvertContentMetadata(
       metadataEncoder.getMetadata(), this.selectedImageMetadata_);
 
   item.saveToFile(
       this.context_.saveDirEntry,
       this.shouldOverwriteOriginal_(),
       canvas,
       metadataEncoder,
       function(success) {
         // TODO(kaznacheev): Implement write error handling.
         // Until then pretend that the save succeeded.
         this.showSpinner_(false);
         this.flashSavedLabel_();
 
         var e = new Event('content');

[hirono, 2013/12/09 06:53:50]

Please replace e with event.

[mtomasz, 2013/12/10 02:37:34]

Done.

         e.item = item;
-        e.oldUrl = oldUrl;
+        e.oldEntry = oldEntry;
         e.metadata = this.selectedImageMetadata_;
         this.dataModel_.dispatchEvent(e);
 
         // Allow changing the 'Overwrite original' setting only if the user
         // used Undo to restore the original image AND it is not a copy.
         // Otherwise lock the setting in its current state.
         var mayChangeOverwrite = !this.editor_.canUndo() && item.isOriginal();
         ImageUtil.setAttribute(this.options_, 'saved', !mayChangeOverwrite);
 
         if (this.imageView_.getContentRevision() == 1) {  // First edit.
           ImageUtil.metrics.recordUserAction(ImageUtil.getMetricName('Edit'));
         }
 
-        if (oldUrl != item.getUrl()) {
+        if (oldEntry.toURL() != item.getEntry().toURL()) {

[hirono, 2013/12/09 06:53:50]

Use util.isSameEntry.

[mtomasz, 2013/12/10 02:37:34]

Done.

           this.dataModel_.splice(
-              this.getSelectedIndex(), 0, new Gallery.Item(oldUrl));
+              this.getSelectedIndex(), 0, new Gallery.Item(oldEntry));
           // The ribbon will ignore the splice above and redraw after the
           // select call below (while being obscured by the Editor toolbar,
           // so there is no need for nice animation here).
           // SlideMode will ignore the selection change as the displayed item
           // index has not changed.
           this.select(++this.displayedIndex_);
         }
         callback();
         cr.dispatchSimpleEvent(this, 'image-saved');
       }.bind(this));
 };
 
 /**
- * Update caches when the selected item url has changed.
- *
+ * Update caches when the selected item has been renamed.
  * @param {Event} event Event.
  * @private
  */
 SlideMode.prototype.onContentChange_ = function(event) {
-  var newUrl = event.item.getUrl();
-  if (newUrl != event.oldUrl) {
-    this.imageView_.changeUrl(newUrl);
+  var newEntry = event.item.getEntry();
+  if (newEntry.toURL() != event.oldEntry.toURL()) {

[hirono, 2013/12/09 06:53:50]

ditto.

[mtomasz, 2013/12/10 02:37:34]

Done.

+    this.imageView_.changeEntry(newEntry);
   }
-  this.metadataCache_.clear(event.oldUrl, Gallery.METADATA_TYPE);
+  this.metadataCache_.clear(event.oldEntry, Gallery.METADATA_TYPE);
 };
 
 /**
  * Flash 'Saved' label briefly to indicate that the image has been saved.
  * @private
  */
 SlideMode.prototype.flashSavedLabel_ = function() {
   var setLabelHighlighted =
       ImageUtil.setAttribute.bind(null, this.savedLabel_, 'highlighted');
   setTimeout(setLabelHighlighted.bind(null, true), 0);
@@ skipping 328 matching lines @@
       done = true;
     }
   }.bind(this);
 };
 
 /**
  * If the user touched the image and moved the finger more than SWIPE_THRESHOLD
  * horizontally it's considered as a swipe gesture (change the current image).
  */
 SwipeOverlay.SWIPE_THRESHOLD = 100;