From a3f6cb14ab0bbbc9c617e7caa273dd76b88fd2eb Mon Sep 17 00:00:00 2001
From: Slime7 <slime7@foxmail.com>
Date: Thu, 6 Dec 2018 11:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                  | 39 +++++++++++++++++++++++++++++++-----
 src/background.js            | 11 +++++-----
 src/components/Command.vue   | 13 ------------
 src/components/Result.vue    |  4 +++-
 src/store.js                 |  3 +++
 src/utils/KancolleRequest.js | 15 +++++++++-----
 6 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index cad8692..aabaa3a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,13 +20,18 @@
 
 <script>
 import { remote, ipcRenderer } from 'electron'; // eslint-disable-line
-import { mapMutations } from 'vuex';
+import { mapMutations, mapState } from 'vuex';
 import Command from './components/Command.vue';
 import RequestLine from './components/RequestLine.vue';
 import Result from './components/Result.vue';
 
 export default {
   name: 'app',
+
+  computed: {
+    ...mapState(['selected']),
+  },
+
   components: {
     Command,
     RequestLine,
@@ -41,13 +46,37 @@ export default {
     },
     onReqReply() {
       if (ipcRenderer) {
-        ipcRenderer.on('kancolle-command-ipc-reply', (event, requests) => {
-          const r = JSON.parse(JSON.stringify(requests));
-          this.setRequests(r);
+        ipcRenderer.on('kancolle-command-reply', (event, { requestIndex, requests }) => {
+          const requestsCopy = JSON.parse(JSON.stringify(requests));
+          if (requestsCopy.length === 0) {
+            this.selectEditingRequest(null);
+          }
+
+          if (typeof requestIndex === 'number') {
+            const [requestsComplated, requestsProgressing] = [[], []];
+            while (requestsCopy.length) {
+              if (requestsCopy[0].error || requestsCopy[0].response) {
+                requestsComplated.push(requestsCopy.shift());
+              } else {
+                requestsProgressing.push(requestsCopy.shift());
+              }
+            }
+            this.setRequests(requestsProgressing);
+            this.setLastRequests(requestsComplated);
+            if (requestsProgressing.length <= this.selected) {
+              this.selectEditingRequest(null);
+            }
+          } else {
+            this.setRequests(requestsCopy);
+          }
         });
       }
     },
-    ...mapMutations(['setRequests']),
+    ...mapMutations([
+      'selectEditingRequest',
+      'setRequests',
+      'setLastRequests',
+    ]),
   },
 
   mounted() {
diff --git a/src/background.js b/src/background.js
index c9753a6..c64471e 100644
--- a/src/background.js
+++ b/src/background.js
@@ -66,14 +66,15 @@ function createWindow() {
     reqInd,
     direction,
   }) => {
+    const reply = (requests, requestIndex) => {
+      event.sender.send('kancolle-command-reply', { requests, requestIndex });
+    };
     const init = (force) => {
       if (force || !kanmand) {
         kanmand = new KancolleRequest(reqData.gameLink);
+        kanmand.setStageEndCallback(reply);
       }
     };
-    const reply = (data) => {
-      event.sender.send('kancolle-command-ipc-reply', data);
-    };
 
     switch (type) {
       case 'start':
@@ -81,9 +82,7 @@ function createWindow() {
           console.log('请求列表为空');
           break;
         }
-        await kanmand.start(() => {
-          event.sender.send('kancolle-command-ipc-reply', kanmand.requestInfo().requests);
-        });
+        await kanmand.start();
         kanmand.clear();
         kanmand = null;
         break;
diff --git a/src/components/Command.vue b/src/components/Command.vue
index fcdb80b..ac2ca4b 100644
--- a/src/components/Command.vue
+++ b/src/components/Command.vue
@@ -60,17 +60,6 @@ export default {
         ({ route: this.gameRoute, data: this.gameData } = this.requests[this.selected]);
       }
     },
-    requests() {
-      if (this.requests.length === 0) {
-        this.selectEditingRequest(null);
-      }
-      this.requests.forEach((req) => {
-        if (req.error || req.response) {
-          this.pushLastRequests(JSON.parse(JSON.stringify(req)));
-          this.removeRequest(this.requests.indexOf(req));
-        }
-      });
-    },
   },
 
   methods: {
@@ -155,8 +144,6 @@ export default {
     },
     ...mapMutations([
       'selectEditingRequest',
-      'pushLastRequests',
-      'removeRequest',
       'clearLastRequests',
     ]),
   },
diff --git a/src/components/Result.vue b/src/components/Result.vue
index f46a7a3..f457908 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -6,7 +6,9 @@
           <div>
             {{
             lastRequests[resultIndex] ?
-            `${lastRequests[resultIndex].route.name}(${lastRequests[resultIndex].route.path})` : '-'
+            `${resultIndex + 1}.${lastRequests[resultIndex].route.name}
+            (${lastRequests[resultIndex].route.path})`
+            : '-'
             }}
           </div>
           <div>
diff --git a/src/store.js b/src/store.js
index 27ef8c7..5502fe9 100644
--- a/src/store.js
+++ b/src/store.js
@@ -33,6 +33,9 @@ export default new Vuex.Store({
     pushLastRequests(state, req) {
       state.lastRequests.push(req);
     },
+    setLastRequests(state, req) {
+      state.lastRequests = req;
+    },
     clearLastRequests(state) {
       state.lastRequests = [];
     },
diff --git a/src/utils/KancolleRequest.js b/src/utils/KancolleRequest.js
index 5ef72ad..09c2e43 100644
--- a/src/utils/KancolleRequest.js
+++ b/src/utils/KancolleRequest.js
@@ -48,6 +48,11 @@ export default class KancolleRequest {
     this.loading = 0;
     this.requests = [];
     this.requestIndex = 0;
+    this.stageEndCallback = null;
+  }
+
+  setStageEndCallback(stageEndCallback) {
+    this.stageEndCallback = stageEndCallback;
   }
 
   add(route, data) {
@@ -58,6 +63,7 @@ export default class KancolleRequest {
     this.requests = [];
     this.loading = 0;
     this.requestIndex = 0;
+    // this.stageEndCallback = null;
   }
 
   remove(reqInd) {
@@ -104,7 +110,7 @@ export default class KancolleRequest {
     };
   }
 
-  async start(stageEndCallback) {
+  async start() {
     this.loading += 1;
     try {
       const response = await this.connect();
@@ -121,10 +127,6 @@ export default class KancolleRequest {
       }
       await this.endTask(true);
     }
-
-    if (typeof stageEndCallback === 'function') {
-      stageEndCallback(this.requestIndex, this.requests);
-    }
   }
 
   async connect() {
@@ -188,6 +190,9 @@ export default class KancolleRequest {
       this.requests[this.requestIndex].api_error = true;
     }
 
+    if (typeof this.stageEndCallback === 'function') {
+      this.stageEndCallback(this.requests, this.requestIndex);
+    }
     this.requestIndex += 1;
     if (this.requestIndex < this.requests.length) {
       await this.start();