fix(filters): Don't count offline torrent in "Not working" tracker fi…

…lter (#2051)
VueTorrent · Nov 18, 2024 · d59cae7 · d59cae7
1 parent 0928458
commit d59cae7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/stores/categories.ts b/src/stores/categories.ts
@@ -1,10 +1,10 @@
 import { comparators } from '@/helpers'
 import qbit from '@/services/qbit'
-import { useTorrentStore } from '@/stores/torrents.ts'
 import { Category } from '@/types/qbit/models'
 import { useSorted } from '@vueuse/core'
 import { acceptHMRUpdate, defineStore, storeToRefs } from 'pinia'
 import { computed, shallowRef, triggerRef } from 'vue'
+import { useTorrentStore } from './torrents'
 
 export const useCategoryStore = defineStore('categories', () => {
   /** Key: Category name */

diff --git a/src/stores/content.ts b/src/stores/content.ts
@@ -1,15 +1,15 @@
 import { useI18nUtils, useSearchQuery, useTreeBuilder } from '@/composables'
 import { FilePriority } from '@/constants/qbit'
 import qbit from '@/services/qbit'
-import { useDialogStore } from '@/stores/dialog'
-import { useVueTorrentStore } from '@/stores/vuetorrent'
 import { TorrentFile } from '@/types/qbit/models'
 import { RightClickMenuEntryType, RightClickProperties, TreeFolder, TreeNode } from '@/types/vuetorrent'
 import { useIntervalFn } from '@vueuse/core'
 import { acceptHMRUpdate, defineStore, storeToRefs } from 'pinia'
 import { computed, nextTick, reactive, shallowRef, toRaw, triggerRef } from 'vue'
 import { useTask } from 'vue-concurrency'
 import { useRoute } from 'vue-router'
+import { useDialogStore } from './dialog'
+import { useVueTorrentStore } from './vuetorrent'
 
 export const useContentStore = defineStore('content', () => {
   const { t } = useI18nUtils()

diff --git a/src/stores/tags.ts b/src/stores/tags.ts
@@ -1,9 +1,9 @@
 import { comparators } from '@/helpers'
 import qbit from '@/services/qbit'
-import { useTorrentStore } from '@/stores/torrents.ts'
 import { useSorted } from '@vueuse/core'
 import { acceptHMRUpdate, defineStore, storeToRefs } from 'pinia'
 import { computed, shallowRef, triggerRef } from 'vue'
+import { useTorrentStore } from './torrents'
 
 export const useTagStore = defineStore('tags', () => {
   const _tags = shallowRef<Set<string>>(new Set())

diff --git a/src/stores/torrents.ts b/src/stores/torrents.ts
@@ -14,6 +14,19 @@ import { useTrackerStore } from './trackers'
 export const useTorrentStore = defineStore(
   'torrents',
   () => {
+    const torrentStateNotAnnounced = [
+      TorrentState.UNKNOWN,
+      TorrentState.ERROR,
+      TorrentState.MISSING_FILES,
+      TorrentState.DL_STOPPED,
+      TorrentState.UL_STOPPED,
+      TorrentState.UL_QUEUED,
+      TorrentState.DL_QUEUED,
+      TorrentState.CHECKING_DISK,
+      TorrentState.CHECKING_RESUME_DATA,
+      TorrentState.MOVING
+    ]
+
     const appStore = useAppStore()
     const { buildFromQbit } = useTorrentBuilder()
     const trackerStore = useTrackerStore()
@@ -81,7 +94,7 @@ export const useTorrentStore = defineStore(
           if (trackers.length === 0) {
             acc[TrackerSpecialFilter.UNTRACKED] = (acc[TrackerSpecialFilter.UNTRACKED] ?? 0) + 1
             return acc
-          } else if (torrent.tracker === '') {
+          } else if (torrent.tracker === '' && !torrentStateNotAnnounced.includes(torrent.state)) {
             acc[TrackerSpecialFilter.NOT_WORKING] = (acc[TrackerSpecialFilter.NOT_WORKING] ?? 0) + 1
             return acc
           }
@@ -130,7 +143,7 @@ export const useTorrentStore = defineStore(
           case TrackerSpecialFilter.UNTRACKED:
             return torrentTrackers.length === 0
           case TrackerSpecialFilter.NOT_WORKING:
-            return torrentTrackers.length > 0 && t.tracker === ''
+            return torrentTrackers.length > 0 && t.tracker === '' && !torrentStateNotAnnounced.includes(t.state)
           default:
             return torrentTrackers.includes(tracker)
         }