Gallery: Update metadata in GalleryItem when saving items.

ui/file_manager/gallery/js/gallery_item.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.
 
 /**
  * Object representing an image item (a photo).
  *
  * @param {!FileEntry} entry Image entry.
  * @param {!EntryLocation} locationInfo Entry location information.
  * @param {!Object} metadata Metadata for the entry.
@@ skipping 94 matching lines @@
         function(metadata) {
           if (metadata[0])
             fulfill(metadata[0]);
           else
             reject('Failed to load metadata.');
         });
   }.bind(this));
 };
 
 /**
- * Sets the metadata.
- * @param {!Object} metadata New metadata.
- */
-Gallery.Item.prototype.setMetadata = function(metadata) {
-  this.metadata_ = Object.preventExtensions(metadata);
-};
-
-/**
  * @return {string} File name.
  */
 Gallery.Item.prototype.getFileName = function() {
   return this.entry_.name;
 };
 
 /**
  * @return {boolean} True if this image has not been created in this session.
  */
 Gallery.Item.prototype.isOriginal = function() { return this.original_; };
@@ skipping 91 matching lines @@
         callback.bind(null, name + ext));
   }
 
   tryNext(10);
 };
 
 /**
  * Writes the new item content to either the existing or a new file.
  *
  * @param {!VolumeManager} volumeManager Volume manager instance.
- * @param {string} fallbackDir Fallback directory in case the current directory
- *     is read only.
+ * @param {DirectoryEntry} fallbackDir Fallback directory in case the current
+ *     directory is read only.
  * @param {boolean} overwrite Whether to overwrite the image to the item or not.
  * @param {!HTMLCanvasElement} canvas Source canvas.
- * @param {!ImageEncoder.MetadataEncoder} metadataEncoder MetadataEncoder.
  * @param {function(boolean)=} opt_callback Callback accepting true for success.
  */
 Gallery.Item.prototype.saveToFile = function(
-    volumeManager, fallbackDir, overwrite, canvas, metadataEncoder,
-    opt_callback) {
+    volumeManager, fallbackDir, overwrite, canvas, opt_callback) {
   ImageUtil.metrics.startInterval(ImageUtil.getMetricName('SaveTime'));
 
   var name = this.getFileName();
 
-  var onSuccess = function(entry, locationInfo) {
+  var onSuccess = function(entry) {
+    var locationInfo = volumeManager.getLocationInfo(entry);
+    if (!locationInfo) {
+      // Reuse old location info if it fails to obtain location info.
+      locationInfo = this.locationInfo_;
+    }
     ImageUtil.metrics.recordEnum(ImageUtil.getMetricName('SaveResult'), 1, 2);
     ImageUtil.metrics.recordInterval(ImageUtil.getMetricName('SaveTime'));
 
     this.entry_ = entry;
     this.locationInfo_ = locationInfo;
 
-    this.metadataCache_.clear([this.entry_], 'fetchedMedia');
-    if (opt_callback)
-      opt_callback(true);
+    // Updates the metadata.
+    this.metadataCache_.clear([this.entry_], '*');
+    this.metadataCache_.getLatest(
+        [this.entry_],
+        Gallery.METADATA_TYPE,
+        function(metadataList) {
+          if (metadataList.length === 1) {
+            this.metadata_ = metadataList[0];
+            if (opt_callback)
+              opt_callback(true);
+          } else {
+            if (opt_callback)
+              opt_callback(false);
+          }
+        }.bind(this));
   }.bind(this);
 
   var onError = function(error) {
     console.error('Error saving from gallery', name, error);
     ImageUtil.metrics.recordEnum(ImageUtil.getMetricName('SaveResult'), 0, 2);
     if (opt_callback)
       opt_callback(false);
   };
 
   var doSave = function(newFile, fileEntry) {
     fileEntry.createWriter(function(fileWriter) {
-      function writeContent() {
+      var writeContent = function() {
         fileWriter.onwriteend = onSuccess.bind(null, fileEntry);
+        // TODO(hirono): Remove the quality 1 for thumbanils. The code path is
+        // no longer used.
+        var metadataEncoder = ImageEncoder.encodeMetadata(
+            this.metadata_, canvas, 1 /* quality */);
         // Contrary to what one might think 1.0 is not a good default. Opening
         // and saving an typical photo taken with consumer camera increases its
         // file size by 50-100%. Experiments show that 0.9 is much better. It
         // shrinks some photos a bit, keeps others about the same size, but does
         // not visibly lower the quality.
         fileWriter.write(ImageEncoder.getBlob(canvas, metadataEncoder, 0.9));
-      }
+      }.bind(this);
       fileWriter.onerror = function(error) {
         onError(error);
         // Disable all callbacks on the first error.
         fileWriter.onerror = null;
         fileWriter.onwriteend = null;
       };
       if (newFile) {
         writeContent();
       } else {
         fileWriter.onwriteend = writeContent;
         fileWriter.truncate(0);
       }
-    }, onError);
-  };
+    }.bind(this), onError);
+  }.bind(this);
 
   var getFile = function(dir, newFile) {
     dir.getFile(name, {create: newFile, exclusive: newFile},
         function(fileEntry) {
-          var locationInfo = volumeManager.getLocationInfo(fileEntry);
-          // If the volume is gone, then abort the saving operation.
-          if (!locationInfo) {
-            onError('NotFound');
-            return;
-          }
           doSave(newFile, fileEntry);
         }.bind(this), onError);
   }.bind(this);
 
   var checkExistence = function(dir) {
     dir.getFile(name, {create: false, exclusive: false},
         getFile.bind(null, dir, false /* existing file */),
         getFile.bind(null, dir, true /* create new file */));
   };
 
@@ skipping 45 matching lines @@
         return Promise.reject(str('GALLERY_FILE_EXISTS'));
       }, function() {
         return new Promise(
             this.entry_.moveTo.bind(this.entry_, parentDirectory, newFileName));
       }.bind(this));
     }.bind(this));
   }.bind(this)).then(function(entry) {
     this.entry_ = entry;
   }.bind(this));
 };