[filemanager] Importing progress implemented.

chrome/browser/resources/file_manager/js/photo/photo_import.js

Index: chrome/browser/resources/file_manager/js/photo/photo_import.js
===================================================================
--- chrome/browser/resources/file_manager/js/photo/photo_import.js	(revision 157524)
+++ chrome/browser/resources/file_manager/js/photo/photo_import.js	(working copy)
@@ -21,11 +21,10 @@
   this.volumeManager_ = new VolumeManager();
   this.copyManager_ = FileCopyManagerWrapper.getInstance(this.filesystem_.root);
   this.mediaFilesList_ = null;
-  this.albums_ = null;
-  this.albumsDir_ = null;
+  this.destination_ = null;
 
   this.initDom_();
-  this.initAlbums_();
+  this.initDestination_();
   this.loadSource_(params.source);
 }
 
@@ -110,7 +109,6 @@
 
   this.grid_ = this.dom_.querySelector('grid');
   cr.ui.Grid.decorate(this.grid_);
-  this.onResize_();  // To set columns number.
   this.grid_.itemConstructor =
       GridItem.bind(null, this);
   this.fileList_ = new cr.ui.ArrayDataModel([]);
@@ -120,35 +118,25 @@
   this.grid_.addEventListener('keypress', this.onGridKeyPress_.bind(this));
   this.onPickedItemsChanged_();
 
-  this.selectAlbumDialog_ = new SelectAlbumDialog(this.dom_);
+  this.importingDialog_ = new ImportingDialog(this.dom_, this.copyManager_,
+      this.metadataCache_);
 };
 
 /**
- * One-time initialization of albums.
+ * One-time initialization of destination directory.
  * @private
  */
-PhotoImport.prototype.initAlbums_ = function() {
+PhotoImport.prototype.initDestination_ = function() {
   var onError = this.onError_.bind(
       this, loadTimeData.getString('PHOTO_IMPORT_GDATA_ERROR'));
 
-  var albums = [];
-
-  var onEntry = function(entry) {
-    if (entry != null) {
-      albums.push(entry);
-    } else {
-      this.albums_ = albums;
-    }
+  var onDirectory = function(dir) {
+    this.destination_ = dir;

[Vladislav Kaznacheev, 2012/09/19 12:29:52]

Not updating UI? Looks strange.

[dgozman, 2012/09/19 13:45:28]

Nice catch. Fixed.

   }.bind(this);
 
-  var onGData = function(gdata) {
-    this.albumsDir_ = gdata;
-    util.forEachDirEntry(gdata, onEntry);
-  }.bind(this);
-
   var onMounted = function() {
     var dir = PathUtil.join(RootDirectory.GDATA, PhotoImport.GDATA_PHOTOS_DIR);
-    util.getOrCreateDirectory(this.filesystem_.root, dir, onGData, onError);
+    util.getOrCreateDirectory(this.filesystem_.root, dir, onDirectory, onError);
   }.bind(this);
 
   if (this.volumeManager_.isMounted(RootDirectory.GDATA)) {
@@ -380,12 +368,13 @@
  * @private
  */
 PhotoImport.prototype.onResize_ = function() {
-  var columns =
-      Math.floor((this.dom_.clientWidth - 60) / PhotoImport.ITEM_WIDTH);
-  if (columns != this.grid_.columns) {
-    this.grid_.columns = columns;
-    this.fillGrid_();
-  }
+  var g = this.grid_;
+  g.startBatchUpdates();
+  setTimeout(function() {
+    g.columns = 0;
+    g.redraw();
+    g.endBatchUpdates();
+  }, 0);
 };
 
 /**
@@ -415,7 +404,7 @@
           count == 1 ?
               loadTimeData.getString('PHOTO_IMPORT_ONE_PICKED') :
               loadTimeData.getStringF('PHOTO_IMPORT_MANY_PICKED', count);
-  this.importButton_.disabled = count == 0 || this.albums_ == null;
+  this.importButton_.disabled = count == 0 || this.destination_ == null;
 };
 
 /**
@@ -425,90 +414,12 @@
  */
 PhotoImport.prototype.onImportClick_ = function(event) {
   var items = this.getPickedItems_();
-
-  var defaultTitle = loadTimeData.getString('PHOTO_IMPORT_NEW_ALBUM_NAME');
-  var group = items[0].group;
-  if (items.filter(function(i) { return i.group !== group }).length == 0)
-    defaultTitle = group.title;
-
-  // TODO: use albums instead.
-  var dialogAlbums = [];
-  for (var index = 0; index < this.albums_.length; index++) {
-    dialogAlbums.push({
-      name: this.albums_[index].name,
-      entry: this.albums_[index],
-      url: chrome.extension.getURL('../../images/filetype_large_audio.png')
-    });
-  }
-
-  this.selectAlbumDialog_.show(
-      items.length == 1 ?
-          loadTimeData.getString('PHOTO_IMPORT_SELECT_ALBUM_CAPTION') :
-          loadTimeData.getStringF('PHOTO_IMPORT_SELECT_ALBUM_CAPTION_PLURAL',
-                                  items.length),
-      dialogAlbums,
-      defaultTitle,
-      loadTimeData.getString('PHOTO_IMPORT_IMPORT_BUTTON'),
-      this.onAlbumSelected_.bind(this, items)
-  );
+  var entries = items.map(function(item) { return item.entry; });
+  var move = this.dom_.querySelector('#delete-after-checkbox').checked;
+  this.importingDialog_.show(entries, this.destination_, move);
 };
 
 /**
- * Called when album is selected.
- * @param {Array.<Object>} items List of items to import.
- * @param {Object} album Album description.
- * @private
- */
-PhotoImport.prototype.onAlbumSelected_ = function(items, album) {
-  var entries = items.map(function(i) { return i.entry });
-
-  if (album.create) {
-    var onError = this.onError_.bind(this,
-        loadTimeData.getString('PHOTO_IMPORT_IMPORTING_ERROR'));
-    this.createAlbum_(album.name,
-        this.startImport_.bind(this, entries),
-        onError);
-  } else {
-    this.startImport_(entries, album.entry);
-  }
-};
-
-/**
- * Starts importing process.
- * @param {Array.<FileEntry>} entries List of entries to import.
- * @param {DirectoryEntry} dir Where to import.
- * @private
- */
-PhotoImport.prototype.startImport_ = function(entries, dir) {
-  var files = entries.map(function(e) { return e.fullPath }).join('\n');
-  var operationInfo = {
-    isCut: false,
-    isOnGData: PathUtil.getRootType(entries[0].fullPath) == RootType.GDATA,
-    sourceDir: null,
-    directories: '',
-    files: files
-  };
-  this.copyManager_.paste(operationInfo, dir.fullPath, true);
-};
-
-/**
- * Creates a directory for an album.
- * @param {string} name Album name.
- * @param {function(DirectoryEntry)} onSuccess Success callback.
- * @param {function} onError Failure callback.
- * @private
- */
-PhotoImport.prototype.createAlbum_ = function(name, onSuccess, onError) {
-  var callback = function(entry) {
-    this.initAlbums_();
-    onSuccess(entry);
-  }.bind(this);
-
-  this.albumsDir_.getDirectory(name, { create: true, exclusive: true},
-      callback, onError);
-};
-
-/**
  * Item in the grid.
  * @param {PhotoImport} app Application instance.
  * @param {Entry} entry File entry.