Gallery: Support RAW files in Gallery.

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 {!MetadataItem} metadataItem
@@ skipping 137 matching lines @@
  * @type {!RegExp}
  * @const
  */
 Gallery.Item.REGEXP_COPY_N =
     new RegExp('^(.+)' + Gallery.Item.COPY_SIGNATURE + ' \\((\\d+)\\)$');
 
 /**
  * Creates a name for an edited copy of the file.
  *
  * @param {!DirectoryEntry} dirEntry Entry.
+ * @param {string} newMimeType Mime type of new image.
  * @param {function(string)} callback Callback.
  * @private
  */
-Gallery.Item.prototype.createCopyName_ = function(dirEntry, callback) {
+Gallery.Item.prototype.createCopyName_ = function(
+    dirEntry, newMimeType, callback) {
   var name = this.getFileName();
 
   // If the item represents a file created during the current Gallery session
   // we reuse it for subsequent saves instead of creating multiple copies.
   if (!this.original_) {
     callback(name);
     return;
   }
 
-  var ext = '';
-  var index = name.lastIndexOf('.');
-  if (index != -1) {
-    ext = name.substr(index);
-    name = name.substr(0, index);
-  }
-
-  if (!ext.match(/jpe?g/i)) {
-    // Chrome can natively encode only two formats: JPEG and PNG.
-    // All non-JPEG images are saved in PNG, hence forcing the file extension.
-    ext = '.png';
-  }
+  var baseName = name.replace(/\.[^\.\/]+$/, '');
+  var ext = newMimeType === 'image/jpeg' ? '.jpg' : '.png';
 
   function tryNext(tries) {
     // All the names are used. Let's overwrite the last one.
     if (tries == 0) {
-      setTimeout(callback, 0, name + ext);
+      setTimeout(callback, 0, baseName + ext);
       return;
     }
 
     // If the file name contains the copy signature add/advance the sequential
     // number.
-    var matchN = Gallery.Item.REGEXP_COPY_N.exec(name);
-    var match0 = Gallery.Item.REGEXP_COPY_0.exec(name);
+    var matchN = Gallery.Item.REGEXP_COPY_N.exec(baseName);
+    var match0 = Gallery.Item.REGEXP_COPY_0.exec(baseName);
     if (matchN && matchN[1] && matchN[2]) {
       var copyNumber = parseInt(matchN[2], 10) + 1;
-      name = matchN[1] + Gallery.Item.COPY_SIGNATURE + ' (' + copyNumber + ')';
+      baseName = matchN[1] + Gallery.Item.COPY_SIGNATURE +
+          ' (' + copyNumber + ')';
     } else if (match0 && match0[1]) {
-      name = match0[1] + Gallery.Item.COPY_SIGNATURE + ' (1)';
+      baseName = match0[1] + Gallery.Item.COPY_SIGNATURE + ' (1)';
     } else {
-      name += Gallery.Item.COPY_SIGNATURE;
+      baseName += Gallery.Item.COPY_SIGNATURE;
     }
 
-    dirEntry.getFile(name + ext, {create: false, exclusive: false},
+    dirEntry.getFile(baseName + ext, {create: false, exclusive: false},
         tryNext.bind(null, tries - 1),
-        callback.bind(null, name + ext));
+        callback.bind(null, baseName + ext));
   }
 
   tryNext(10);
 };
 
 /**
  * Writes the new item content to either the existing or a new file.
  *
  * @param {!VolumeManager} volumeManager Volume manager instance.
  * @param {!MetadataModel} metadataModel
  * @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 {function(boolean)} callback Callback accepting true for success.
  */
 Gallery.Item.prototype.saveToFile = function(
     volumeManager, metadataModel, fallbackDir, overwrite, canvas, callback) {
   ImageUtil.metrics.startInterval(ImageUtil.getMetricName('SaveTime'));
 
   var name = this.getFileName();
+  var newMimeType = name.match(/\.jpe?g$/i) || FileType.isRaw(this.entry_) ?
+      'image/jpeg' : 'image/png';
 
   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'));
 
@@ skipping 25 matching lines @@
     var blob;
     var fileWriter;
 
     metadataModel.get(
         [fileEntry],
         ['mediaMimeType', 'contentMimeType', 'ifd', 'exifLittleEndian']
     ).then(function(metadataItems) {
       // Create the blob of new image.
       var metadataItem = metadataItems[0];
       metadataItem.modificationTime = new Date();
+      metadataItem.mediaMimeType = newMimeType;
       var metadataEncoder = ImageEncoder.encodeMetadata(
           metadataItem, canvas, /* quality for thumbnail*/ 0.8);
       // 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.
       blob = ImageEncoder.getBlob(canvas, metadataEncoder, 0.9);
-    }).then(function() {
+    }.bind(this)).then(function() {
       // Create writer.
       return new Promise(function(fullfill, reject) {
         fileEntry.createWriter(fullfill, reject);
       });
     }).then(function(writer) {
       fileWriter = writer;
 
       // Truncates the file to 0 byte if it overwrites.
       return new Promise(function(fulfill, reject) {
         if (!newFile) {
@@ skipping 29 matching lines @@
         }.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 */));
   };
 
   var saveToDir = function(dir) {
-    if (overwrite && !this.locationInfo_.isReadOnly) {
+    if (overwrite &&
+        !this.locationInfo_.isReadOnly &&
+        !FileType.isRaw(this.entry_)) {
       checkExistence(dir);
     } else {
-      this.createCopyName_(dir, function(copyName) {
+      this.createCopyName_(dir, newMimeType, function(copyName) {
         this.original_ = false;
         name = copyName;
         checkExistence(dir);
       }.bind(this));
     }
   }.bind(this);
 
   if (this.locationInfo_.isReadOnly) {
     saveToDir(fallbackDir);
   } else {
@@ skipping 30 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));
 };