From 2cdbc5b2a4d843fd4c8fa3a5e7b3f636dd696d4e Mon Sep 17 00:00:00 2001
From: Daan <dw.daanwijns@gmail.com>
Date: Sat, 3 Oct 2020 08:42:07 +0200
Subject: [PATCH] Tabs Trackers, Peers & Content are empty #43 && Fix global
 pause/resume

---
 package-lock.json                             |   6 +-
 package.json                                  |   4 +-
 .../TorrentDetailModal/Tabs/Content.vue       |   3 +
 .../Modals/TorrentDetailModal/Tabs/Info.vue   | 197 +++++++++---------
 .../Modals/TorrentDetailModal/Tabs/Peers.vue  |  19 +-
 .../TorrentDetailModal/Tabs/Trackers.vue      |   3 +
 src/services/qbit.js                          |   2 +-
 7 files changed, 119 insertions(+), 115 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3f4b8cc7..77c19679 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12104,9 +12104,9 @@
             }
         },
         "vuetify": {
-            "version": "2.3.10",
-            "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.10.tgz",
-            "integrity": "sha512-KzL/MhZ7ajubm9kwbdCoA/cRV50RX+a5Hcqiwt7Am1Fni2crDtl2no05UNwKroTfscrYYf07gq3WIFSurPsnCA=="
+            "version": "2.3.12",
+            "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.12.tgz",
+            "integrity": "sha512-FSt1pzpf0/Lh0xuctAPB7RiLbUl7bzVc7ejbXLLhfmgm7zD7yabuhVYuyVda/SzokjZMGS3j1lNu2lLfdrz0oQ=="
         },
         "vuex": {
             "version": "3.5.1",
diff --git a/package.json b/package.json
index 6360a463..97c9fb21 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vuetorrent",
-    "version": "0.3.5",
+    "version": "0.3.6",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve",
@@ -25,7 +25,7 @@
         "vue-router": "^3.4.5",
         "vue-toastification": "^1.7.8",
         "vue2-perfect-scrollbar": "^1.5.0",
-        "vuetify": "^2.3.4",
+        "vuetify": "^2.3.12",
         "vuex": "^3.5.1",
         "vuex-persist": "^3.1.3"
     },
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Content.vue b/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
index 9dba4145..f6904506 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Content.vue
@@ -65,6 +65,9 @@ export default {
                 this.getTorrentFiles()
             }
         }
+    },
+    created() {
+        this.getTorrentFiles()
     }
 }
 </script>
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Info.vue b/src/components/Modals/TorrentDetailModal/Tabs/Info.vue
index a5e082e7..24961e86 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Info.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Info.vue
@@ -1,103 +1,108 @@
 <template>
     <v-card flat>
-        <v-card-text class="pa-0" style="font-size: 1.1em">
-            <v-simple-table>
-                <tbody>
-                    <tr>
-                        <td class="grey--text">Torrent title</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.name }}
-                        </td>
-                    </tr>
-                    <tr style="margin-top: 10px !important">
-                        <td class="grey--text">hash</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.hash }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Size</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.size }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Done:</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.dloaded }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Download</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.dlspeed }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Upload</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.upspeed }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">ETA</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.eta }}
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Peers</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.num_leechs
-                            }}<span class="grey--text"
-                                >/{{ torrent.available_peers }}</span
+        <perfect-scrollbar>
+            <v-card-text
+                class="pa-0"
+                style="font-size: 1.1em; max-height: 500px; min-height: 400px"
+            >
+                <v-simple-table>
+                    <tbody>
+                        <tr>
+                            <td class="grey--text">Torrent title</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.name }}
+                            </td>
+                        </tr>
+                        <tr style="margin-top: 10px !important">
+                            <td class="grey--text">hash</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.hash }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Size</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.size }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Done:</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.dloaded }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Download</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.dlspeed }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Upload</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.upspeed }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">ETA</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.eta }}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Peers</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.num_leechs
+                                }}<span class="grey--text"
+                                    >/{{ torrent.available_peers }}</span
+                                >
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Seeds</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.num_seeds
+                                }}<span class="grey--text"
+                                    >/{{ torrent.available_seeds }}</span
+                                >
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Ratio</td>
+                            <td class="torrentmodaltext--text">
+                                {{ torrent.ratio }}%
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Tags</td>
+                            <td v-if="torrent.tags">
+                                {{ torrent.tags.join(',') }}
+                            </td>
+                            <td v-else>None</td>
+                        </tr>
+                        <tr>
+                            <td class="grey--text">Status</td>
+                            <v-chip
+                                small
+                                :class="`${torrent.state} white--text my-2 caption`"
+                                >{{ torrent.state }}</v-chip
                             >
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Seeds</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.num_seeds
-                            }}<span class="grey--text"
-                                >/{{ torrent.available_seeds }}</span
-                            >
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Ratio</td>
-                        <td class="torrentmodaltext--text">
-                            {{ torrent.ratio }}%
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Tags</td>
-                        <td v-if="torrent.tags">
-                            {{ torrent.tags.join(',') }}
-                        </td>
-                        <td v-else>None</td>
-                    </tr>
-                    <tr>
-                        <td class="grey--text">Status</td>
-                        <v-chip
-                            small
-                            :class="`${torrent.state} white--text my-2 caption`"
-                            >{{ torrent.state }}</v-chip
-                        >
-                    </tr>
-                </tbody>
-            </v-simple-table>
+                        </tr>
+                    </tbody>
+                </v-simple-table>
 
-            <v-flex class="pt-3 pb-4">
-                <v-progress-linear
-                    height="5"
-                    stream
-                    rounded
-                    color="cyan darken-1"
-                    background-color="cyan lighten-3"
-                    :buffer-value="torrent.progress"
-                ></v-progress-linear>
-            </v-flex>
-        </v-card-text>
+                <v-flex class="pt-3 pb-4">
+                    <v-progress-linear
+                        height="5"
+                        stream
+                        rounded
+                        color="cyan darken-1"
+                        background-color="cyan lighten-3"
+                        :buffer-value="torrent.progress"
+                    ></v-progress-linear>
+                </v-flex>
+            </v-card-text>
+        </perfect-scrollbar>
     </v-card>
 </template>
 
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue b/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
index bd0b18a4..2b4bddbc 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Peers.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { map, merge, cloneDeep } from 'lodash'
+import { map, merge } from 'lodash'
 import qbit from '@/services/qbit'
 import { codeToFlag, isWindows } from '@/helpers'
 
@@ -76,22 +76,12 @@ export default {
         async getTorrentPeers() {
             const { data } = await qbit.getTorrentPeers(
                 this.hash,
-                this.rid || undefined
+                this.rid + 1 || undefined
             )
 
             this.rid = data.rid
 
-            if (data.full_update) {
-                this.peersObj = data.peers
-            } else {
-                const tmp = cloneDeep(this.peersObj)
-                if (data.peers_removed) {
-                    for (const key of data.peers_removed) {
-                        delete tmp[key]
-                    }
-                }
-                this.peersObj = merge(tmp, data.peers)
-            }
+            this.peersObj = data.peers
         }
     },
     watch: {
@@ -113,6 +103,9 @@ export default {
         peers() {
             return map(this.peersObj, (value, key) => merge({}, value, { key }))
         }
+    },
+    created() {
+        this.getTorrentPeers()
     }
 }
 </script>
diff --git a/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue b/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
index e730d410..a34d4ee0 100644
--- a/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
+++ b/src/components/Modals/TorrentDetailModal/Tabs/Trackers.vue
@@ -78,6 +78,9 @@ export default {
         trackers() {
             return this.tempTrackers
         }
+    },
+    created() {
+        this.getTorrentTrackers()
     }
 }
 </script>
diff --git a/src/services/qbit.js b/src/services/qbit.js
index 8ff4f316..0b505170 100644
--- a/src/services/qbit.js
+++ b/src/services/qbit.js
@@ -300,7 +300,7 @@ class Qbit {
 
     actionTorrents(action, hashes, extra) {
         const params = {
-            hashes: hashes.join('|'),
+            hashes: hashes.length ? hashes.join('|') : 'all',
             ...extra
         }
         const data = new URLSearchParams(params)