Files.app: Fix the number of remaining files and processed bytes.

chrome/browser/resources/file_manager/background/js/file_operation_manager.js

Index: chrome/browser/resources/file_manager/background/js/file_operation_manager.js
diff --git a/chrome/browser/resources/file_manager/background/js/file_operation_manager.js b/chrome/browser/resources/file_manager/background/js/file_operation_manager.js
index 16bd4a0ef2821259f78013adb011948ac72a0f0a..818b7a996378f1f41d0cae9f1cdad304dddf8381 100644
--- a/chrome/browser/resources/file_manager/background/js/file_operation_manager.js
+++ b/chrome/browser/resources/file_manager/background/js/file_operation_manager.js
@@ -412,6 +412,13 @@ FileOperationManager.Task = function(
   this.processedBytes = 0;
 
   /**
+   * Index of the progressing entry in sourceEntries.
+   * @type {number}
+   * @private
+   */
+  this.processingSourceIndex_ = 0;
+
+  /**
    * Set to true when cancel is requested.
    * @private {boolean}
    */
@@ -439,15 +446,6 @@ FileOperationManager.Task.prototype.initialize = function(callback) {
 };
 
 /**
- * Updates copy progress status for the entry.
- *
- * @param {number} size Number of bytes that has been copied since last update.
- */
-FileOperationManager.Task.prototype.updateFileCopyProgress = function(size) {
-  this.completedBytes += size;
-};
-
-/**
  * Requests cancellation of this task.
  * When the cancellation is done, it is notified via callbacks of run().
  */
@@ -480,44 +478,36 @@ FileOperationManager.Task.prototype.run = function(
  * @return {object} Status object.
  */
 FileOperationManager.Task.prototype.getStatus = function() {
-  var numRemainingItems = this.countRemainingItems();
+  var processingEntry = this.sourceEntries[this.processingSourceIndex_];
   return {
     operationType: this.operationType,

[yoshiki, 2014/02/03 09:51:03]

nit: 4 space indent

[hirono, 2014/02/03 10:40:18]

It seems that we shuold use 2 space indenet for object literals.
http://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml#Array_a...

-    numRemainingItems: numRemainingItems,
+    numRemainingItems: this.sourceEntries.length - this.processingSourceIndex_,
     totalBytes: this.totalBytes,
     processedBytes: this.processedBytes,
-    processingEntry: this.getSingleEntry()
+    processingEntryName: processingEntry ? processingEntry.name : ''
   };
 };
 
 /**
- * Counts the number of remaining items.
- * @return {number} Number of remaining items.
+ * Obtains the number of total processed bytes.
+ * @return {number} Number of total processed bytes.
+ * @private
  */
-FileOperationManager.Task.prototype.countRemainingItems = function() {
-  var count = 0;
-  for (var i = 0; i < this.processingEntries.length; i++) {
-    for (var entryURL in this.processingEntries[i]) {
-      count++;
+FileOperationManager.Task.prototype.calcProcessedBytes_ = function() {
+  var bytes = 0;
+  for (var i = 0; i < this.processingSourceIndex_; i++) {
+    var processedEntries = this.processingEntries[i];
+    for (var name in processedEntries) {
+      bytes += processedEntries[name].size;
     }
   }
-  return count;
-};
-
-/**
- * Obtains the single processing entry. If there are multiple processing
- * entries, it returns null.
- * @return {Entry} First entry.
- */
-FileOperationManager.Task.prototype.getSingleEntry = function() {
-  if (this.countRemainingItems() !== 1)
-    return null;
-  for (var i = 0; i < this.processingEntries.length; i++) {
-    var entryMap = this.processingEntries[i];
-    for (var name in entryMap)
-      return entryMap[name];
+  var processingEntries = this.processingEntries[this.processingSourceIndex_];

[yoshiki, 2014/02/03 09:51:03]

Can't you combine L504-510 into the loop at L498?

[hirono, 2014/02/03 10:40:18]

Done.

+  if (processingEntries) {
+    for (var name in processingEntries) {
+      bytes += processingEntries[name].processedBytes;
+    }
   }
-  return null;
+  return bytes;
 };
 
 /**
@@ -653,12 +643,10 @@ FileOperationManager.CopyTask.prototype.run = function(
               var sourceEntryURL = sourceEntry.toURL();
               var processedEntry =
                   this.processingEntries[index][sourceEntryURL];
-              if (processedEntry) {
-                this.processedBytes +=
-                    processedEntry.size - processedEntry.processedBytes;
-                progressCallback();
-                delete this.processingEntries[index][sourceEntryURL];
-              }
+
+              // Update current source index.
+              this.processingSourceIndex_ = index + 1;
+              this.processedBytes = this.calcProcessedBytes_();
 
               // The destination entry may be null, if the copied file got
               // deleted just after copying.
@@ -814,9 +802,9 @@ FileOperationManager.MoveTask.prototype.run = function(
         FileOperationManager.MoveTask.processEntry_(
             entry, this.targetDirEntry, entryChangedCallback,
             function() {
-              // Erase the processing entry.
-              this.processingEntries[index] = {};
-              this.processedBytes++;
+              // Update current source index.
+              this.processingSourceIndex_ = index + 1;
+              this.processedBytes = this.calcProcessedBytes_();
               callback();
             }.bind(this),
             errorCallback);