From 88c62e01ada1fc3ae8e557abf91ac5dfcd80cfa5 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 8 Nov 2019 21:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E8=BD=BD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md            |  1 +
 src/renderer/App.vue            |  2 +-
 src/renderer/views/Download.vue | 74 ++++++++++++++++++++++++++++-----
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index de6fba61..92d8fc6c 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,6 +1,7 @@
 ### 新增
 
 - 新增歌曲缓冲定时器，尝试用于解决网络正常但是歌曲缓冲过久的问题
+- 新增下载管理的任务状态分类
 
 ### 优化
 
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 8b42bf34..42a9319d 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -210,7 +210,7 @@ export default {
         return result
       }).then(result => {
         if (result.version === this.version.version) return
-        console.log(this.version)
+        // console.log(this.version)
         this.$nextTick(() => {
           this.setVersionModalVisible({ isShow: true })
         })
diff --git a/src/renderer/views/Download.vue b/src/renderer/views/Download.vue
index 22aa0e22..1a52913f 100644
--- a/src/renderer/views/Download.vue
+++ b/src/renderer/views/Download.vue
@@ -1,6 +1,8 @@
 <template lang="pug">
 div(:class="$style.download")
   //- transition
+  div(:class="$style.header")
+    material-tab(:class="$style.tab" :list="tabs" align="left" item-key="id" item-name="name" v-model="tabId")
   div(:class="$style.content" v-if="list.length")
     div(:class="$style.thead")
       table
@@ -17,7 +19,7 @@ div(:class="$style.download")
     div.scroll(v-if="list.length" :class="$style.tbody")
       table
         tbody
-          tr(v-for='(item, index) in list' :key='item.key' @click="handleDoubleClick(index)" :class="isPlayList && playIndex === index ? $style.active : ''")
+          tr(v-for='(item, index) in showList' :key='item.key' @click="handleDoubleClick(index)" :class="playListIndex === index ? $style.active : ''")
             td.nobreak.center(style="width: 37px;" @click.stop)
               material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
             td.break(style="width: 28%;") {{item.musicInfo.name}} - {{item.musicInfo.singer}}
@@ -46,6 +48,29 @@ export default {
       isIndeterminate: false,
       isShowEditBtn: false,
       isShowDownloadMultiple: false,
+      tabs: [
+        {
+          name: '全部任务',
+          id: 'all',
+        },
+        {
+          name: '正在下载',
+          id: 'runing',
+        },
+        {
+          name: '已暂停',
+          id: 'paused',
+        },
+        {
+          name: '出错',
+          id: 'error',
+        },
+        {
+          name: '下载完成',
+          id: 'finished',
+        },
+      ],
+      tabId: 'all',
     }
   },
   computed: {
@@ -54,6 +79,25 @@ export default {
     isPlayList() {
       return this.listId == 'download'
     },
+    playListIndex() {
+      if (this.listId != 'download') return
+      let path = this.list[this.playIndex].filePath
+      return this.showList.findIndex(i => i.filePath == path)
+    },
+    showList() {
+      switch (this.tabId) {
+        case 'runing':
+          return this.list.filter(i => i.status == this.downloadStatus.RUN || i.status == this.downloadStatus.WAITING)
+        case 'paused':
+          return this.list.filter(i => i.status == this.downloadStatus.PAUSE)
+        case 'error':
+          return this.list.filter(i => i.status == this.downloadStatus.ERROR)
+        case 'finished':
+          return this.list.filter(i => i.status == this.downloadStatus.COMPLETED)
+        default:
+          return this.list
+      }
+    },
   },
   watch: {
     selectdData(n) {
@@ -76,14 +120,14 @@ export default {
     ...mapMutations('player', ['setList']),
     ...mapMutations('download', ['pauseTask']),
     handlePauseTask(index) {
-      let info = this.list[index]
+      let info = this.showList[index]
       let dl = this.dls[info.key]
       dl ? dl.pause() : this.pauseTask(info)
       console.log('pause')
     },
     handleStartTask(index) {
       console.log('start')
-      let info = this.list[index]
+      let info = this.showList[index]
       let dl = this.dls[info.key]
       dl ? dl.resume() : this.startTask(info)
     },
@@ -101,7 +145,7 @@ export default {
       this.clickIndex = -1
     },
     handleClick(index) {
-      let info = this.list[index]
+      let info = this.showList[index]
       if (info.isComplate) {
         this.handlePlay(index)
       } else if (info.status === this.downloadStatus.RUN) {
@@ -111,8 +155,9 @@ export default {
       }
     },
     handlePlay(index) {
-      if (!checkPath(this.list[index].filePath)) return
-      this.setList({ list: this.list, listId: 'download', index })
+      if (!checkPath(this.showList[index].filePath)) return
+      let path = this.showList[index].filePath
+      this.setList({ list: this.list, listId: 'download', index: this.list.findIndex(i => i.filePath === path) })
     },
     handleListBtnClick(info) {
       switch (info.action) {
@@ -134,7 +179,7 @@ export default {
       }
     },
     handleSelectAllData(isSelect) {
-      this.selectdData = isSelect ? [...this.list] : []
+      this.selectdData = isSelect ? [...this.showList] : []
     },
     resetSelect() {
       this.isSelectAll = false
@@ -145,7 +190,7 @@ export default {
         case 'start':
           this.selectdData.forEach(item => {
             if (item.isComplate || item.status == this.downloadStatus.RUN) return
-            let index = this.list.indexOf(item)
+            let index = this.showList.indexOf(item)
             if (index < 0) return
             this.handleStartTask(index)
           })
@@ -155,13 +200,13 @@ export default {
           this.selectdData.forEach(item => {
             if (item.isComplate || item.status == this.downloadStatus.PAUSE) return
             if (item.status == this.downloadStatus.RUN) return runs.push(item)
-            let index = this.list.indexOf(item)
+            let index = this.showList.indexOf(item)
             if (index < 0) return
             this.handlePauseTask(index)
           })
           runs.forEach(item => {
             if (item.isComplate || item.status == this.downloadStatus.PAUSE) return
-            let index = this.list.indexOf(item)
+            let index = this.showList.indexOf(item)
             if (index < 0) return
             this.handlePauseTask(index)
           })
@@ -174,7 +219,7 @@ export default {
       this.resetSelect()
     },
     handleOpenFolder(index) {
-      let path = this.list[index].filePath
+      let path = this.showList[index].filePath
       if (!checkPath(path)) return
       openDirInExplorer(path)
     },
@@ -188,16 +233,23 @@ export default {
 .download {
   overflow: hidden;
   height: 100%;
+  display: flex;
+  flex-flow: column nowrap;
   // .noItem {
 
     // }
 }
+.header {
+  flex: none;
+}
 
 .content {
   height: 100%;
   font-size: 14px;
   display: flex;
   flex-flow: column nowrap;
+  flex: auto;
+  overflow: hidden;
   // table {
   //   position: relative;
   //   thead {