From 9ec4b09b28b9109f35ecf19ca48081c221448cf8 Mon Sep 17 00:00:00 2001 From: Daan Wijns Date: Wed, 6 Jan 2021 13:12:45 +0100 Subject: [PATCH] 0.4.9 (#94) --- package-lock.json | 50 ++----- package.json | 8 +- public/img/icons/apple-touch-icon-152x152.png | Bin 8576 -> 9412 bytes public/img/icons/safari-pinned-tab.svg | 67 ---------- src/components/Modals/AddModal.vue | 7 + .../Modals/SettingsModal/Tabs/Downloads.vue | 124 ++++++++++-------- .../SettingsModal/Tabs/Vuetorrent/General.vue | 2 +- .../TorrentDetailModal/Tabs/Content.vue | 82 ++++++++++-- src/components/Navbar/CurrentSpeed.vue | 2 - src/components/Navbar/Navbar.vue | 13 +- src/components/Navbar/SessionStats.vue | 1 - src/components/Navbar/TopActions.vue | 68 ++++------ src/components/Navbar/TopMenu.vue | 44 +++++++ src/components/Navbar/index.js | 4 +- src/helpers.js | 1 + src/styles/variables.scss | 6 +- src/views/Dashboard.vue | 24 ++-- 17 files changed, 261 insertions(+), 242 deletions(-) delete mode 100644 public/img/icons/safari-pinned-tab.svg create mode 100644 src/components/Navbar/TopMenu.vue diff --git a/package-lock.json b/package-lock.json index 573f07ef..a4f5d895 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vuetorrent", - "version": "0.4.8", + "version": "0.4.9", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2334,34 +2334,11 @@ "dev": true }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { - "follow-redirects": "1.5.10" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } + "follow-redirects": "^1.10.0" } }, "babel-eslint": { @@ -5001,18 +4978,18 @@ } }, "eslint-plugin-prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz", - "integrity": "sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz", + "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" } }, "eslint-plugin-vue": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz", - "integrity": "sha512-bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz", + "integrity": "sha512-W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw==", "dev": true, "requires": { "eslint-utils": "^2.1.0", @@ -5659,7 +5636,6 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz", "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==", - "dev": true, "requires": { "debug": "^3.0.0" }, @@ -5668,7 +5644,6 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, "requires": { "ms": "^2.1.1" } @@ -7806,8 +7781,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "multicast-dns": { "version": "6.2.3", diff --git a/package.json b/package.json index d83ef220..3d602a02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuetorrent", - "version": "0.4.8", + "version": "0.4.9", "private": true, "scripts": { "start": "npm run serve", @@ -11,7 +11,7 @@ "dependencies": { "@babel/polyfill": "^7.12.1", "apexcharts": "^3.23.1", - "axios": "^0.19.2", + "axios": "^0.21.1", "core-js": "^3.8.2", "dayjs": "^1.10.1", "fuse.js": "^6.4.5", @@ -39,8 +39,8 @@ "babel-eslint": "^10.1.0", "eslint": "^7.17.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-prettier": "^3.3.0", - "eslint-plugin-vue": "^7.4.0", + "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-vue": "^7.4.1", "fibers": "^5.0.0", "node-sass": "^4.14.1", "sass": "^1.32.0", diff --git a/public/img/icons/apple-touch-icon-152x152.png b/public/img/icons/apple-touch-icon-152x152.png index 9452a249cbfddca540c4718d2f14a468a5692bc7..dbc1d534cb1d5607d252c55d7007baa7ff1b3b1b 100644 GIT binary patch literal 9412 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

@c_%H-zTS)$tQ zcH=RW26EIDTu#ak$X!CKSl9_adhb%Tl1wK}y|0j=BEx5LDdS3dDf4Xx3C&Y=A6k)+ zv4Rx(-En2t#;#SmJRrFj*?033DnjHgw}s^el!SF^dhiSBdm^oGo^0@X{)lX^aYi97 z8vbZCyfwLza(zkbwgNc^z(tj@c#(I@ZJvXQ#w_=z@ERF-7El(h ziWFrgZ?GM;+tl*{&lld=k6PR>`n33Jz@Sdjx0y^|hoNNc)9?Lia`zRKFjJ-KrH8uZ|QnqKF>tP#C-w%T0=E2vcZc_97s9$3xX1>eCJ?S z(M4IObGBd1_%h?1cSxkI#9|M!C@bLMT{J@)oyv$~Ml}7UUAOjG@cQ?h>pC&4U3t{I z`bA7bXZY|+av+DOt@jhQe8}x#;FKUn$lfoAZhgbX=P2;H*6(zv!1$MS$F4~6+Xvat zS)x< zXLy_a8-)YYECaiT?{-oP7AlY?(O2iatX#vw4;3qEsHnC_-1 zFkVCKjgdl8Mh00>s8yhhnXAd_#?kuv-jm8Ickc~h1dm=Lr3Qs-@g^}+3y>S;a}%~y_|3>l7^pY#t7k=x~Mp-S@)?Puv{bG5%V zEif|kdK;H`*2DM*yK*EtTUHDGZkYI&o;6g5pW|V3pPR~@l6=U$@4bZ?ElqbaY@na# z{n04gp?s95-ACflN!^_eqK`x2u>mix8hg+>4YLl4rRSv&!JieEG@R}(w}&?l|I1wIsV8qhpoXe$d`Dt9l!o}ai+_lZf=yN=DX9%}( zV;|>o%_oN;nDE;thEo-?-%XK9N)7`!#Q)X03=;ymo$hJ43=r=|QeR??GFp0&5##{DK=iIy}dY8NR1(>YC6)wg<86t~R z#aT{1%`8&!V22|gFj2o$zmo8RCcct0d+0WPMHwGs+@T&{^eR7iuztUhnfZM+`GGRswPHE>b=kz0O8*qQJ-97c%ogcVwf&c zb6SN{+i;?kkJSv@67x+?yyi*IJ^VOFR!j4w-E7pyHBN&a3FpJFGwcZ<=BrzRqjsqw zmrH`zDNoP>tcH}9o5e+jt%Z{?-^b;CwmK3wj}+a$2$*@?6W=9_46}%7oD9y&}t7+JzW}f0z=QMaY*We z=uIn;{=;Oq*cKeEqHg}I&f;SSw~@)aVci`;DM^{%#ugBH_5M-A)z8rk|?CheQAEFU)@>Fr5*cGAP2TxnG z-f%3B+2u&pTlk}JrAGsVYXbJm)pYf>7phbBC3V@ibLk{qx4nqyV6@g*Lk_j}Hl{-I zBBciV+Y6UDX82PWJ(9Tgy_?QNCMK-(WPc*d$96-hGOpI{xW;=kbq#$QtkqOlo%A$F z6q_+e(|_4kWK;uIRJi@g{fT{S1&8kL(cs4yFD=_H4Of@MzF}oN1QCK9jowkFD>Njm z51H=uHaIRNkJohQh7`F1q}4omCosJJ3(a2<)935$W3EhkE=Z{WO~jZEJQrbf znLa(2^Qa_SGyXaqJ@nXY#vw^%^PRMc^s-*-(KnpWF9RnBP?Hd^_rfjJYVi7Ep~Ju# zgF$^T2#OZJSW}^`!Rx~xW%ud;2x%{ zvLLj~u9ktgU3_;1Sb4*@iI+Vm8!2Br))4y;9DUV=O-)49r9wfx!7(!DYVKo10$fl5 zK3~oM*sO2Xk8OhAsppOVD=|~C*<}f}e1SHrfs@!h+9nq9=Uypy%|{ZM)Z*^0>)*P1 zFzLj2WkR5O>Q#LXrlx7W&UaH~wgx(8hqPas@CyLI_xzsH4;jpFLAr+rwZ*d^u#~LT z=;T8L^1oP5*c>xYrd5!R?6LT`=J*D$tbPEwVDH=zKD^4QXv7o7m4G;#C&G9ppXUGR zc;0~SQ`7^xVf^XX8Zo9bqL+h`O5d4XAgbN5U_F~~?#0pCQU%W?eW&;`F@npW%W>#z zQZsl$EmXP5%7>({{oXO`a!|ziDaZa|lLapMZ7^{xeLpS!bl7G3*(Ap1F2>`2D-u5B zqkJc^y9-bmUo7TY_cIYHm#-?&KHg<6KF?r4?tIBvdahB0cM`2@bk{a*oLaf{|S1wMI=G2bj zp9}8T@$wGvYwY&(>VUT^JVwYRk&=17nMxh=QwfHtx{arRqe`X})iR~cIzu&8Tc7&Q z*VR;T*#S66n(z(2+ja^1l zS!}&!zz^JD_U@pXJi|sKUOhKRr?;-%&4ca?dtOKu@_tSzLK@r8>Wx)=xQhvI)(Jd8 zmOZhMFKOp;%)nBoEl29Cr}MS6NzbDViSH#@2Q-$dKi+B#diiv!EdJ$qR!aU$bKdF7 z)s&n^1Ew6sx#&m^$-7O=`2zjoi*d+@F(tP>zolnb9AW-aw&I#ld|*XKKoO&PqoUuTvZJl4g?WxeY_k6DyYM^o8kgi z2G(o?#gvQ==sB<&P0T-b5n^>pxS2H`hcvs}^|m$+`P|$u`<4;SInKg~$A~uV_VsDF vMOf8YuTlrIu&TH3$HcsZ{>K29*O`vDP?Fs`Qg3YhlZ}?zDb;M1^MU^dc*$w0 delta 7744 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 K+SM?pnEwGYygj-A diff --git a/public/img/icons/safari-pinned-tab.svg b/public/img/icons/safari-pinned-tab.svg deleted file mode 100644 index 524d2405..00000000 --- a/public/img/icons/safari-pinned-tab.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - diff --git a/src/components/Modals/AddModal.vue b/src/components/Modals/AddModal.vue index 54dc3fda..f1b968ac 100644 --- a/src/components/Modals/AddModal.vue +++ b/src/components/Modals/AddModal.vue @@ -195,8 +195,15 @@ export default { this.$store.commit('FETCH_SETTINGS') this.$store.commit('FETCH_CATEGORIES') this.urls = this.initialMagnet + this.setSettings() }, methods: { + setSettings() { + const settings = this.getSettings() + this.start = !settings.start_paused_enabled + this.autoTMM = settings.auto_tmm_enabled + this.root_folder = settings.create_subfolder_enabled + }, addDropFile(e) { this.files.push(...Array.from(e.dataTransfer.files)) }, diff --git a/src/components/Modals/SettingsModal/Tabs/Downloads.vue b/src/components/Modals/SettingsModal/Tabs/Downloads.vue index ccf1a8ce..3c9635a7 100644 --- a/src/components/Modals/SettingsModal/Tabs/Downloads.vue +++ b/src/components/Modals/SettingsModal/Tabs/Downloads.vue @@ -1,69 +1,81 @@ diff --git a/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue b/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue index eba5a4c6..6625cbdf 100644 --- a/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue +++ b/src/components/Modals/SettingsModal/Tabs/Vuetorrent/General.vue @@ -66,7 +66,7 @@ color="green_accent" > [{{ item.size }}] {{ item.progress }}% + [ {{ item.priority | priority }} ] + + + + + {{ prio.icon }} + + {{ prio.name }} + + + + el.value === value) + + return res ? res.name : 'undefined' + } + }, mixins: [FullScreenModal], props: { hash: String, @@ -82,7 +128,8 @@ export default { return { opened: null, selected: [], - treeData: null + treeData: null, + priority_options: FILE_PRIORITY_OPTIONS } }, computed: { @@ -105,20 +152,23 @@ export default { } }, created() { - this.getTorrentFiles().then(() => { - this.opened = [] - .concat( - ...this.treeData - .map(file => file.name.split('/')) - .filter(f => f.splice(-1, 1)) - ) - .filter((f, index, self) => index === self.indexOf(f)) - this.selected = this.treeData - .filter(file => file.priority !== 0) - .map(file => file.name) - }) + this.initFiles() }, methods: { + initFiles() { + this.getTorrentFiles().then(() => { + this.opened = [] + .concat( + ...this.treeData + .map(file => file.name.split('/')) + .filter(f => f.splice(-1, 1)) + ) + .filter((f, index, self) => index === self.indexOf(f)) + this.selected = this.treeData + .filter(file => file.priority !== 0) + .map(file => file.name) + }) + }, async getTorrentFiles() { const { data } = await qbit.getTorrentFiles(this.hash) data.forEach((d, i) => { @@ -162,7 +212,11 @@ export default { qbit.renameFile(this.hash, item.id, item.newName) item.name = item.newName this.togleEditing(item) + }, + setFilePrio(fileId, priority) { + qbit.setTorrentFilePriority(this.hash, [fileId], priority) + .then(() => this.initFiles()) } } } - + \ No newline at end of file diff --git a/src/components/Navbar/CurrentSpeed.vue b/src/components/Navbar/CurrentSpeed.vue index 1cce604a..f20dc653 100644 --- a/src/components/Navbar/CurrentSpeed.vue +++ b/src/components/Navbar/CurrentSpeed.vue @@ -34,5 +34,3 @@ export default { props: ['status'] } - - diff --git a/src/components/Navbar/Navbar.vue b/src/components/Navbar/Navbar.vue index c6359082..28079477 100644 --- a/src/components/Navbar/Navbar.vue +++ b/src/components/Navbar/Navbar.vue @@ -7,19 +7,18 @@ @click.stop="drawer = !drawer" /> -

- Vue - Torrent -
+ Vue + Torrent - + - diff --git a/src/components/Navbar/TopActions.vue b/src/components/Navbar/TopActions.vue index 457c0e8c..2c318e3a 100644 --- a/src/components/Navbar/TopActions.vue +++ b/src/components/Navbar/TopActions.vue @@ -1,24 +1,20 @@ - - diff --git a/src/components/Navbar/TopMenu.vue b/src/components/Navbar/TopMenu.vue new file mode 100644 index 00000000..d280a2bc --- /dev/null +++ b/src/components/Navbar/TopMenu.vue @@ -0,0 +1,44 @@ + + + + diff --git a/src/components/Navbar/index.js b/src/components/Navbar/index.js index 1b2092e1..7afd0d02 100644 --- a/src/components/Navbar/index.js +++ b/src/components/Navbar/index.js @@ -6,6 +6,7 @@ import FreeSpace from './FreeSpace.vue' import SessionStats from './SessionStats.vue' import CurrentSpeed from './CurrentSpeed.vue' import FilterSelect from './FilterSelect.vue' +import TopMenu from './TopMenu.vue' export { Navbar, @@ -15,5 +16,6 @@ export { FreeSpace, SessionStats, CurrentSpeed, - FilterSelect + FilterSelect, + TopMenu } diff --git a/src/helpers.js b/src/helpers.js index 3b9d139e..ec7add9d 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -90,6 +90,7 @@ function createFile(data, name, children) { progress: Math.round(data.progress * 100), size: formatBytes(data.size), icon: getIconForFileType(name.split('.').pop()), + priority: data.priority, children: children } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index fac1791e..fe1d99e6 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,11 +1,11 @@ -$torrent-done: #3cd1c2; +$torrent-done: #3cd1c2; $torrent-downloading: #ffaa2c; $torrent-fail: #f83e70; $torrent-paused: #cfd8dc; $torrent-queued: #2e5eaa; -$torrent-seeding: #26a69a; +$torrent-seeding: #0D9488; $torrent-checking: #ff7043; -$torrent-stalled: #81c784; +$torrent-stalled: #4ADE80; $torrent-metadata: #7e57c2; $torrent-moving: #ffaa2c; diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index b0c95e8a..58364e5e 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -4,15 +4,21 @@ color="background" @click.self="resetSelected" > -

- Dashboard -

- {{ torrentCountString }} -

-

+ + +

+ Dashboard +

+
+ +

+ {{ torrentCountString }} +

+
+