fix(content): Fix regressions after #1779 (#1785)

- Improve concurrency of updateFileTree - Fix selection toggle **enabling** all files on mixed priority - Fix mixed priority folder render (checkbox / color) - Only display selected size on folders
VueTorrent · Jul 10, 2024 · b977713 · b977713
1 parent 1eb0a93
commit b977713
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/src/components/TorrentDetail/Content/ContentNode.vue b/src/components/TorrentDetail/Content/ContentNode.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { getFileIcon } from '@/constants/vuetorrent'
-import { useI18n } from 'vue-i18n'
 import { FilePriority } from '@/constants/qbit'
+import { getFileIcon } from '@/constants/vuetorrent'
 import { doesCommand, formatData } from '@/helpers'
 import { useContentStore, useVueTorrentStore } from '@/stores'
 import { TreeNode } from '@/types/vuetorrent'
 import { computed } from 'vue'
+import { useI18n } from 'vue-i18n'
 import { useDisplay } from 'vuetify'
 
 const props = defineProps<{
@@ -92,10 +92,18 @@ function getNodeSubtitle(node: TreeNode) {
   const size = formatData(node.size, vuetorrentStore.useBinarySize)
   const selectedSize = formatData(node.selectedSize, vuetorrentStore.useBinarySize)
 
-  const values = [size + (node.selectedSize > 0 ? ` (${selectedSize})` : '')]
-
+  let values: string[]
   if (node.type === 'folder') {
-    values.push(getNodeDeepCount(node))
+    let displayedSize = size
+    if (node.selectedSize > 0) {
+      displayedSize += ` (${selectedSize})`
+    }
+    values = [
+      displayedSize,
+      getNodeDeepCount(node)
+    ]
+  } else {
+    values = [size]
   }
 
   return values.join(' | ')
@@ -111,7 +119,7 @@ function getNodeSubtitle(node: TreeNode) {
     <div class="d-flex">
       <!-- Selection checkbox -->
       <div class="d-flex align-center" @click.stop="toggleFileSelection(node)">
-        <v-icon v-if="node.wanted === null" :color="getNodeColor(node)" icon="mdi-checkbox-intermediate-variant" />
+        <v-icon v-if="node.priority === FilePriority.MIXED" :color="getNodeColor(node)" icon="mdi-checkbox-intermediate-variant" />
         <v-icon v-else-if="node.wanted" :color="getNodeColor(node)" icon="mdi-checkbox-marked" />
         <v-icon v-else :color="getNodeColor(node)" icon="mdi-checkbox-blank-outline" />
       </div>

diff --git a/src/stores/content.ts b/src/stores/content.ts
@@ -110,13 +110,13 @@ export const useContentStore = defineStore('content', () => {
       isFolder: node.type === 'folder',
       oldName: node.fullName
     }
-    dialogStore.createDialog(MoveTorrentFileDialog, payload, updateFileTree)
+    dialogStore.createDialog(MoveTorrentFileDialog, payload, updateFileTreeTask.perform)
   }
 
   async function bulkRename(node: TreeFolder) {
     const { default: BulkRenameFilesDialog } = await import('@/components/Dialogs/BulkRenameFilesDialog.vue')
     const payload = { hash: hash.value, node }
-    dialogStore.createDialog(BulkRenameFilesDialog, payload, updateFileTree)
+    dialogStore.createDialog(BulkRenameFilesDialog, payload, updateFileTreeTask.perform)
   }
 
   async function renameTorrentFile(hash: string, oldPath: string, newPath: string) {
@@ -129,7 +129,7 @@ export const useContentStore = defineStore('content', () => {
 
   async function setFilePriority(fileIdx: number[], priority: FilePriority) {
     await qbit.setTorrentFilePriority(hash.value, fileIdx, priority)
-    await updateFileTree()
+    updateFileTreeTask.perform()
   }
 
   async function fetchFiles(hash: string, indexes?: number[]) {

diff --git a/src/types/vuetorrent/TreeObjects.spec.ts b/src/types/vuetorrent/TreeObjects.spec.ts
@@ -87,14 +87,17 @@ describe('TreeObjects', () => {
   })
 
   test('isWanted', () => {
+    // Mixed
     folder.children = [file_unwanted, file_normal, file_high, file_maximal]
     folder.buildCache()
-    expect(folder.wanted).toBe(null)
+    expect(folder.wanted).toBe(true)
 
+    // Selected
     folder.children = [file_normal, file_high, file_maximal]
     folder.buildCache()
     expect(folder.wanted).toBe(true)
 
+    // Skipped
     folder.children = [file_unwanted]
     folder.buildCache()
     expect(folder.wanted).toBe(false)

diff --git a/src/types/vuetorrent/TreeObjects.ts b/src/types/vuetorrent/TreeObjects.ts
@@ -102,21 +102,15 @@ export class TreeFolder {
 
     this.childrenIds = this.children.map(child => child.childrenIds ?? []).flat()
 
-    this.wanted = this.children
-      .map(child => child.wanted)
-      .reduce((prev, curr) => {
-        if (prev === null || prev === curr) return prev
-        return null
-      })
+    this.wanted = this.children.map(child => child.wanted).some(Boolean)
 
-    const values = this.children.filter(child => child.wanted)
-    if (values.length === 0) {
+    const wantedChildren = this.children.filter(child => child.wanted)
+    if (wantedChildren.length === 0) {
       this.progress = 0
     } else {
       // Downloaded / total
-      const result = values.reduce((prev, child) => [prev[0] + child.selectedSize * child.progress, prev[1] + child.selectedSize], [0, 0])
+      const result = wantedChildren.reduce((prev, child) => [prev[0] + child.selectedSize * child.progress, prev[1] + child.selectedSize], [0, 0])
       this.progress = result[0] / result[1]
-      console.log(values.length, result, this.progress)
     }
 
     this.deepCount = this.children