修复 clearQueue Bug

tencentyun · Apr 11, 2019 · a8e6f08 · a8e6f08
1 parent 1e00556
commit a8e6f08
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 37 deletions.
diff --git a/demo/queue/index.html b/demo/queue/index.html
@@ -14,6 +14,7 @@
     <h1>COS 上传队列</h1>
     <div id="app">
         <form id="form">
+            <div class="float-right">共{{total}}个文件</div>
             <input type="file" value="选择上传文件" multiple @change="selectedFile">
         </form>
         <table class="file-list">
@@ -62,4 +63,4 @@ <h1>COS 上传队列</h1>
 <script src="./index.js"></script>
 
 </body>
-</html>
+</html>
diff --git a/demo/queue/index.js b/demo/queue/index.js
@@ -32,13 +32,15 @@ new Vue({
             FileParallelLimit: 5,
             ChunkParallelLimit: 16,
             ChunkMbSize: 2,
-            list: []
+            list: [],
+            total: 0,
         };
     },
     created: function () {
         var self = this;
         cos.on('list-update', function (data) {
             self.list = data.list;
+            self.total = data.list.length;
         });
     },
     methods: {
@@ -72,4 +74,4 @@ new Vue({
             cos.cancelTask(task.id);
         },
     },
-});
+});
diff --git a/demo/queue/style.css b/demo/queue/style.css
@@ -14,6 +14,10 @@ a {
     color: #0071ff;
 }
 
+.float-right {
+    float: right;
+}
+
 .page {
     width: 960px;
     margin: 0 auto;

diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -1983,7 +1983,7 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.13';
+COS.version = '0.5.14';
 
 module.exports = COS;
 
@@ -3716,19 +3716,21 @@ var initTask = function (cos) {
     };
 
     var clearQueue = function () {
-        if (queue.length > cos.options.UploadQueueSize) {
-            var i;
-            for (i = 0; i < queue.length && queue.length > cos.options.UploadQueueSize && // 大于队列才处理
-            i < nextUploadIndex; // 小于当前操作的 index 才处理
-            i++) {
-                var isActive = queue[i].state === 'waiting' || queue[i].state === 'checking' || queue[i].state === 'uploading';
-                if (!queue[i] || !isActive) {
-                    tasks[queue[i].id] && delete tasks[queue[i].id];
-                    queue.splice(i, 1);
-                    nextUploadIndex--;
-                }
+        if (queue.length <= cos.options.UploadQueueSize) return;
+        for (var i = 0; i < nextUploadIndex && // 小于当前操作的 index 才清理
+        i < queue.length && // 大于队列才清理
+        queue.length > cos.options.UploadQueueSize // 如果还太多，才继续清理
+        ;) {
+            var isActive = queue[i].state === 'waiting' || queue[i].state === 'checking' || queue[i].state === 'uploading';
+            if (!queue[i] || !isActive) {
+                tasks[queue[i].id] && delete tasks[queue[i].id];
+                queue.splice(i, 1);
+                nextUploadIndex--;
+            } else {
+                i++;
             }
         }
+        emitListUpdate();
     };
 
     var startNextTask = function () {
@@ -3779,7 +3781,7 @@ var initTask = function (cos) {
             }
             task.state = switchToState;
             cos.emit('inner-kill-task', { TaskId: id, toState: switchToState });
-            emitListUpdate();
+            emitListUpdate(true);
             if (running) {
                 uploadingFileCount--;
                 startNextTask(cos);
@@ -3800,7 +3802,7 @@ var initTask = function (cos) {
         util.each(taskList, function (task) {
             cos._addTask(task.api, task.params, task.callback, true);
         });
-        emitListUpdate();
+        emitListUpdate(true);
     };
 
     var isTaskReadyWarning = true;

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cos-js-sdk-v5",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "description": "JavaScript SDK for [腾讯云对象存储](https://cloud.tencent.com/product/cos)",
   "main": "index.js",
   "scripts": {

diff --git a/src/cos.js b/src/cos.js
@@ -58,6 +58,6 @@ base.init(COS, task);
 advance.init(COS, task);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.5.13';
+COS.version = '0.5.14';
 
 module.exports = COS;
diff --git a/src/task.js b/src/task.js
@@ -45,21 +45,22 @@ var initTask = function (cos) {
     };
 
     var clearQueue = function () {
-        if (queue.length > cos.options.UploadQueueSize) {
-            var i;
-            for (i = 0;
-                 i < queue.length &&
-                 queue.length > cos.options.UploadQueueSize && // 大于队列才处理
-                 i < nextUploadIndex; // 小于当前操作的 index 才处理
-                 i++) {
-                var isActive = queue[i].state === 'waiting' || queue[i].state === 'checking' || queue[i].state === 'uploading';
-                if (!queue[i] || !isActive) {
-                    tasks[queue[i].id] && (delete tasks[queue[i].id]);
-                    queue.splice(i, 1);
-                    nextUploadIndex--;
-                }
+        if (queue.length <= cos.options.UploadQueueSize) return;
+        for (var i = 0;
+             i < nextUploadIndex && // 小于当前操作的 index 才清理
+             i < queue.length && // 大于队列才清理
+             queue.length > cos.options.UploadQueueSize // 如果还太多，才继续清理
+            ;) {
+            var isActive = queue[i].state === 'waiting' || queue[i].state === 'checking' || queue[i].state === 'uploading';
+            if (!queue[i] || !isActive) {
+                tasks[queue[i].id] && (delete tasks[queue[i].id]);
+                queue.splice(i, 1);
+                nextUploadIndex--;
+            } else {
+                i++;
             }
         }
+        emitListUpdate();
     };
 
     var startNextTask = function () {
@@ -113,7 +114,7 @@ var initTask = function (cos) {
             }
             task.state = switchToState;
             cos.emit('inner-kill-task', {TaskId: id, toState: switchToState});
-            emitListUpdate();
+            emitListUpdate(true);
             if (running) {
                 uploadingFileCount--;
                 startNextTask(cos);
@@ -134,7 +135,7 @@ var initTask = function (cos) {
         util.each(taskList, function (task) {
             cos._addTask(task.api, task.params, task.callback, true);
         });
-        emitListUpdate();
+        emitListUpdate(true);
     };
 
     var isTaskReadyWarning = true;
@@ -216,10 +217,10 @@ var initTask = function (cos) {
         return util.map(queue, formatTask);
     };
     cos.cancelTask = function (id) {
-        killTask(id, 'canceled')
+        killTask(id, 'canceled');
     };
     cos.pauseTask = function (id) {
-        killTask(id, 'paused')
+        killTask(id, 'paused');
     };
     cos.restartTask = function (id) {
         var task = tasks[id];