From 2c019e12d6d5fa3ed82b9d3e4182ed10841e0ff6 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Tue, 31 Oct 2023 11:23:26 +0000 Subject: [PATCH 01/11] Add an option to show active torrents when completed torrents are hidden --- next-env.d.ts | 1 - .../locales/en/modules/torrents-status.json | 3 + .../locales/fr/modules/torrents-status.json | 3 + src/widgets/torrent/TorrentTile.spec.ts | 76 +++++++++++++++---- src/widgets/torrent/TorrentTile.tsx | 6 +- 5 files changed, 71 insertions(+), 18 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index fd36f9494..4f11a03dc 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,5 @@ /// /// -/// // NOTE: This file should not be edited // see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index 3f83a6396..00e23b16d 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -10,6 +10,9 @@ "displayCompletedTorrents": { "label": "Display completed torrents" }, + "displayActiveTorrents": { + "label": "Show active torrents when completed torrents are hidden" + }, "displayStaleTorrents": { "label": "Display stale torrents" }, diff --git a/public/locales/fr/modules/torrents-status.json b/public/locales/fr/modules/torrents-status.json index d9bc84188..47294f511 100644 --- a/public/locales/fr/modules/torrents-status.json +++ b/public/locales/fr/modules/torrents-status.json @@ -10,6 +10,9 @@ "displayCompletedTorrents": { "label": "Cacher les torrents terminés" }, + "displayActiveTorrents": { + "label": "Afficher les torrents actifs quand les torrents terminés sont masqués" + }, "displayStaleTorrents": { "label": "Afficher les torrents périmés" }, diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index f3a4148fd..519d40553 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -20,13 +20,14 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, + displayActiveTorrents: true, displayStaleTorrents: false, }, }; const torrents: NormalizedTorrent[] = [ - constructTorrent('ABC', 'Nice Torrent', false, 672), - constructTorrent('HH', 'I am completed', true, 0), - constructTorrent('HH', 'I am stale', false, 0), + constructTorrent('ABC', 'Nice Torrent', false, 672, 672), + constructTorrent('HH', 'I am completed', true, 0, 0), + constructTorrent('HH', 'I am stale', false, 0, 0), ]; // act @@ -55,13 +56,14 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, + displayActiveTorrents: true, displayStaleTorrents: true, }, }; const torrents: NormalizedTorrent[] = [ - constructTorrent('ABC', 'Nice Torrent', false, 672), - constructTorrent('HH', 'I am completed', true, 0), - constructTorrent('HH', 'I am stale', false, 0), + constructTorrent('ABC', 'Nice Torrent', false, 672, 672), + constructTorrent('HH', 'I am completed', true, 0, 0), + constructTorrent('HH', 'I am stale', false, 0, 0), ]; // act @@ -74,7 +76,7 @@ describe('TorrentTile', () => { expect(filtered.includes(torrents[2])).toBe(true); }); - it('filter when completed', () => { + it('filter when completed without active torrent', () => { // arrange const widget: ITorrent = { id: 'abc', @@ -90,13 +92,14 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: false, + displayActiveTorrents: false, displayStaleTorrents: true, }, }; const torrents: NormalizedTorrent[] = [ - constructTorrent('ABC', 'Nice Torrent', false, 672), - constructTorrent('HH', 'I am completed', true, 0), - constructTorrent('HH', 'I am stale', false, 0), + constructTorrent('ABC', 'Nice Torrent', false, 672, 672), + constructTorrent('HH', 'I am completed', true, 0, 672), + constructTorrent('HH', 'I am stale', false, 0, 0), ]; // act @@ -109,6 +112,44 @@ describe('TorrentTile', () => { expect(filtered.at(1)).toBe(torrents[2]); }); + it('filter when completed with active torrent', () => { + // arrange + const widget: ITorrent = { + id: 'abc', + area: { + type: 'sidebar', + properties: { + location: 'left', + }, + }, + shape: {}, + type: 'torrents-status', + properties: { + labelFilter: [], + labelFilterIsWhitelist: false, + displayCompletedTorrents: false, + displayActiveTorrents: true, + displayStaleTorrents: true, + }, + }; + const torrents: NormalizedTorrent[] = [ + constructTorrent('ABC', 'Nice Torrent', false, 672, 672), + constructTorrent('HH', 'I am completed and uploading', true, 0, 672), + constructTorrent('HH', 'I am completed', true, 0, 0), + constructTorrent('HH', 'I am stale', false, 0, 0), + ]; + + // act + const filtered = filterTorrents(widget, torrents); + + // assert + expect(filtered.length).toBe(3); + expect(filtered.at(0)).toBe(torrents[0]); + expect(filtered.at(1)).toBe(torrents[1]); + expect(filtered.includes(torrents[2])).toBe(false); + expect(filtered.at(2)).toBe(torrents[3]); + }); + it('filter by label when whitelist', () => { // arrange const widget: ITorrent = { @@ -125,13 +166,14 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: true, displayCompletedTorrents: true, + displayActiveTorrents: true, displayStaleTorrents: true, }, }; const torrents: NormalizedTorrent[] = [ - constructTorrent('1', 'A sick drop', false, 672, 'music'), - constructTorrent('2', 'I cried', true, 0, 'movie'), - constructTorrent('3', 'Great Animations', false, 0, 'anime'), + constructTorrent('1', 'A sick drop', false, 672, 672, 'music'), + constructTorrent('2', 'I cried', true, 0, 0, 'movie'), + constructTorrent('3', 'Great Animations', false, 0, 0, 'anime'), ]; // act @@ -160,13 +202,14 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: false, displayCompletedTorrents: false, + displayActiveTorrents: false, displayStaleTorrents: true, }, }; const torrents: NormalizedTorrent[] = [ - constructTorrent('ABC', 'Nice Torrent', false, 672, 'anime'), - constructTorrent('HH', 'I am completed', true, 0, 'movie'), - constructTorrent('HH', 'I am stale', false, 0, 'tv'), + constructTorrent('ABC', 'Nice Torrent', false, 672, 672, 'anime'), + constructTorrent('HH', 'I am completed', true, 0, 0, 'movie'), + constructTorrent('HH', 'I am stale', false, 0, 0, 'tv'), ]; // act @@ -185,6 +228,7 @@ const constructTorrent = ( name: string, isCompleted: boolean, downloadSpeed: number, + uploadSpeed: number, label?: string ): NormalizedTorrent => ({ id, diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index 70df20529..a8ee610e1 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -40,6 +40,10 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, + displayActiveTorrents: { + type: 'switch', + defaultValue: true, + }, displayStaleTorrents: { type: 'switch', defaultValue: true, @@ -194,7 +198,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > 0)); } if (widget.properties.labelFilter.length > 0) { From ae11d5d84f32d9fd6d3561157b805416488ff636 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:44:10 +0100 Subject: [PATCH 02/11] Update TorrentTile.spec.ts to fix test --- src/widgets/torrent/TorrentTile.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index 519d40553..dbe3de205 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -252,6 +252,6 @@ const constructTorrent = ( totalSize: 839539535, totalSelected: 0, totalUploaded: 378535535, - uploadSpeed: 8349, + uploadSpeed, label, }); From b135063f5e12490ff4631ada30787e820fc02544 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:31:08 +0000 Subject: [PATCH 03/11] Add option to set uploadspeed limit to consider torrents as active --- public/locales/en/modules/torrents-status.json | 3 +++ public/locales/fr/modules/torrents-status.json | 3 +++ src/widgets/torrent/TorrentTile.spec.ts | 16 ++++++++++++---- src/widgets/torrent/TorrentTile.tsx | 6 +++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index 00e23b16d..286a315c6 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -13,6 +13,9 @@ "displayActiveTorrents": { "label": "Show active torrents when completed torrents are hidden" }, + "SpeedLimitOfActiveTorrents": { + "label": "Upload speed to consider a torrent as active (ko/s)" + }, "displayStaleTorrents": { "label": "Display stale torrents" }, diff --git a/public/locales/fr/modules/torrents-status.json b/public/locales/fr/modules/torrents-status.json index 47294f511..1c7580b0b 100644 --- a/public/locales/fr/modules/torrents-status.json +++ b/public/locales/fr/modules/torrents-status.json @@ -13,6 +13,9 @@ "displayActiveTorrents": { "label": "Afficher les torrents actifs quand les torrents terminés sont masqués" }, + "SpeedLimitOfActiveTorrents": { + "label": "Débit d'upload pour considérer un torrent comme actif (ko/s)" + }, "displayStaleTorrents": { "label": "Afficher les torrents périmés" }, diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index dbe3de205..49fde4e9b 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -21,6 +21,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: true, displayActiveTorrents: true, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: false, }, }; @@ -57,6 +58,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: true, displayActiveTorrents: true, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -93,6 +95,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: false, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -129,12 +132,14 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: true, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; const torrents: NormalizedTorrent[] = [ constructTorrent('ABC', 'Nice Torrent', false, 672, 672), - constructTorrent('HH', 'I am completed and uploading', true, 0, 672), + constructTorrent('HH', 'I am completed and uploading less than 10 ko/s (81919 = 9.99ko/s)', true, 0, 81919), + constructTorrent('HH', 'I am completed and uploading more than 10 ko/s (81921 = 10.01ko/s)', true, 0, 81921), constructTorrent('HH', 'I am completed', true, 0, 0), constructTorrent('HH', 'I am stale', false, 0, 0), ]; @@ -145,9 +150,10 @@ describe('TorrentTile', () => { // assert expect(filtered.length).toBe(3); expect(filtered.at(0)).toBe(torrents[0]); - expect(filtered.at(1)).toBe(torrents[1]); - expect(filtered.includes(torrents[2])).toBe(false); - expect(filtered.at(2)).toBe(torrents[3]); + expect(filtered.includes(torrents[1])).toBe(false); + expect(filtered.at(1)).toBe(torrents[2]); + expect(filtered.includes(torrents[3])).toBe(false); + expect(filtered.at(2)).toBe(torrents[4]); }); it('filter by label when whitelist', () => { @@ -167,6 +173,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: true, displayCompletedTorrents: true, displayActiveTorrents: true, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -203,6 +210,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: false, + SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index a8ee610e1..47fa4844a 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -44,6 +44,10 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, + SpeedLimitOfActiveTorrents: { // Unit : ko/s + type: 'number', + defaultValue: 10, + }, displayStaleTorrents: { type: 'switch', defaultValue: true, @@ -198,7 +202,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > 0)); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024 * 8)); } if (widget.properties.labelFilter.length > 0) { From 534318f74c2884d64d84a8ef464d1e74fab25a5d Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Wed, 1 Nov 2023 01:11:12 +0100 Subject: [PATCH 04/11] Update en/.../torrents-status.json Fix English unit for Megabytes per second --- public/locales/en/modules/torrents-status.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index 286a315c6..c8b38af58 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -14,7 +14,7 @@ "label": "Show active torrents when completed torrents are hidden" }, "SpeedLimitOfActiveTorrents": { - "label": "Upload speed to consider a torrent as active (ko/s)" + "label": "Upload speed to consider a torrent as active (kB/s)" }, "displayStaleTorrents": { "label": "Display stale torrents" From 33fa6cfafe435184048e165ca8b0472bb864da38 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:25:56 +0000 Subject: [PATCH 05/11] Fixed torrent upload speed comparison to consider it active Torrent.uploadSpeed is already in Bytes/s, no need to multiple SpeedLimitOfActiveTorrents by 8 See PR #1273 and Issue #488 --- src/widgets/torrent/TorrentTile.spec.ts | 8 ++++---- src/widgets/torrent/TorrentTile.tsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index 49fde4e9b..a3c1edf0f 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -138,8 +138,8 @@ describe('TorrentTile', () => { }; const torrents: NormalizedTorrent[] = [ constructTorrent('ABC', 'Nice Torrent', false, 672, 672), - constructTorrent('HH', 'I am completed and uploading less than 10 ko/s (81919 = 9.99ko/s)', true, 0, 81919), - constructTorrent('HH', 'I am completed and uploading more than 10 ko/s (81921 = 10.01ko/s)', true, 0, 81921), + constructTorrent('HH', 'I am completed and uploading less than 10 ko/s (10239 ≈ 9.99ko/s)', true, 0, 10239), + constructTorrent('HH', 'I am completed and uploading more than 10 ko/s (10241 ≈ 10.01ko/s)', true, 0, 10241), constructTorrent('HH', 'I am completed', true, 0, 0), constructTorrent('HH', 'I am stale', false, 0, 0), ]; @@ -235,8 +235,8 @@ const constructTorrent = ( id: string, name: string, isCompleted: boolean, - downloadSpeed: number, - uploadSpeed: number, + downloadSpeed: number, // Bytes per second in @ctrl/shared-torrent + uploadSpeed: number, // Bytes per second in @ctrl/shared-torrent label?: string ): NormalizedTorrent => ({ id, diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index 47fa4844a..ee4d0cea0 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -44,7 +44,7 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, - SpeedLimitOfActiveTorrents: { // Unit : ko/s + SpeedLimitOfActiveTorrents: { // Unit : kB/s type: 'number', defaultValue: 10, }, @@ -202,7 +202,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024 * 8)); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); } if (widget.properties.labelFilter.length > 0) { From 982bb557a3a714ffadf926e7fdac2f611ecf70b6 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Thu, 2 Nov 2023 08:44:46 +0000 Subject: [PATCH 06/11] Renamed option "Display active torrents" Removed change in public/locales/fr/modules/torrents-status.json --- public/locales/en/modules/torrents-status.json | 2 +- public/locales/fr/modules/torrents-status.json | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index c8b38af58..d6039b83c 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -11,7 +11,7 @@ "label": "Display completed torrents" }, "displayActiveTorrents": { - "label": "Show active torrents when completed torrents are hidden" + "label": "Display active torrents" }, "SpeedLimitOfActiveTorrents": { "label": "Upload speed to consider a torrent as active (kB/s)" diff --git a/public/locales/fr/modules/torrents-status.json b/public/locales/fr/modules/torrents-status.json index 1c7580b0b..d9bc84188 100644 --- a/public/locales/fr/modules/torrents-status.json +++ b/public/locales/fr/modules/torrents-status.json @@ -10,12 +10,6 @@ "displayCompletedTorrents": { "label": "Cacher les torrents terminés" }, - "displayActiveTorrents": { - "label": "Afficher les torrents actifs quand les torrents terminés sont masqués" - }, - "SpeedLimitOfActiveTorrents": { - "label": "Débit d'upload pour considérer un torrent comme actif (ko/s)" - }, "displayStaleTorrents": { "label": "Afficher les torrents périmés" }, From b60be13ab9761c656e7728bb6c7e9b29c7cfb245 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:41:42 +0100 Subject: [PATCH 07/11] Fix torrent speeds unit --- src/widgets/torrent/TorrentQueueItem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/torrent/TorrentQueueItem.tsx b/src/widgets/torrent/TorrentQueueItem.tsx index 74600ca87..6c9b4aa7a 100644 --- a/src/widgets/torrent/TorrentQueueItem.tsx +++ b/src/widgets/torrent/TorrentQueueItem.tsx @@ -83,14 +83,14 @@ export const BitTorrentQueueItem = ({ torrent, width, app }: TorrentQueueItemPro {width > MIN_WIDTH_MOBILE && ( - {downloadSpeed > 0 ? `${downloadSpeed.toFixed(1)} Mb/s` : '-'} + {downloadSpeed > 0 ? `${downloadSpeed.toFixed(1)} MB/s` : '-'} )} {width > MIN_WIDTH_MOBILE && ( - {uploadSpeed > 0 ? `${uploadSpeed.toFixed(1)} Mb/s` : '-'} + {uploadSpeed > 0 ? `${uploadSpeed.toFixed(1)} MB/s` : '-'} )} From 832276e80e5d04bc675cebcd84451dbb5f29ed8c Mon Sep 17 00:00:00 2001 From: Tagaishi Date: Thu, 2 Nov 2023 11:35:17 +0100 Subject: [PATCH 08/11] Revert "Fix torrent speeds unit" This reverts commit b60be13ab9761c656e7728bb6c7e9b29c7cfb245. --- src/widgets/torrent/TorrentQueueItem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/torrent/TorrentQueueItem.tsx b/src/widgets/torrent/TorrentQueueItem.tsx index 6c9b4aa7a..74600ca87 100644 --- a/src/widgets/torrent/TorrentQueueItem.tsx +++ b/src/widgets/torrent/TorrentQueueItem.tsx @@ -83,14 +83,14 @@ export const BitTorrentQueueItem = ({ torrent, width, app }: TorrentQueueItemPro {width > MIN_WIDTH_MOBILE && ( - {downloadSpeed > 0 ? `${downloadSpeed.toFixed(1)} MB/s` : '-'} + {downloadSpeed > 0 ? `${downloadSpeed.toFixed(1)} Mb/s` : '-'} )} {width > MIN_WIDTH_MOBILE && ( - {uploadSpeed > 0 ? `${uploadSpeed.toFixed(1)} MB/s` : '-'} + {uploadSpeed > 0 ? `${uploadSpeed.toFixed(1)} Mb/s` : '-'} )} From c6c2dbd0613fb3e5fbe4b9a0c4bf2c5bb7d55e63 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Fri, 3 Nov 2023 20:41:54 +0000 Subject: [PATCH 09/11] Switch to CamelCase for DisplayActiveTorrents var --- public/locales/en/modules/torrents-status.json | 2 +- src/widgets/torrent/TorrentTile.spec.ts | 12 ++++++------ src/widgets/torrent/TorrentTile.tsx | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index d6039b83c..4b841f5dc 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -10,7 +10,7 @@ "displayCompletedTorrents": { "label": "Display completed torrents" }, - "displayActiveTorrents": { + "DisplayActiveTorrents": { "label": "Display active torrents" }, "SpeedLimitOfActiveTorrents": { diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index a3c1edf0f..653e1e4f8 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -20,7 +20,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, - displayActiveTorrents: true, + DisplayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: false, }, @@ -57,7 +57,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, - displayActiveTorrents: true, + DisplayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -94,7 +94,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - displayActiveTorrents: false, + DisplayActiveTorrents: false, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -131,7 +131,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - displayActiveTorrents: true, + DisplayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -172,7 +172,7 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: true, displayCompletedTorrents: true, - displayActiveTorrents: true, + DisplayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -209,7 +209,7 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - displayActiveTorrents: false, + DisplayActiveTorrents: false, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index ee4d0cea0..c7c58f970 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -40,7 +40,7 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, - displayActiveTorrents: { + DisplayActiveTorrents: { type: 'switch', defaultValue: true, }, @@ -202,7 +202,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.DisplayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); } if (widget.properties.labelFilter.length > 0) { From f07d5f798c3a329733da8cff1689a9385f1de5c6 Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:02:45 +0000 Subject: [PATCH 10/11] Revert "Switch to CamelCase for DisplayActiveTorrents var" This reverts commit c6c2dbd0613fb3e5fbe4b9a0c4bf2c5bb7d55e63. Revert : Wrong case used --- public/locales/en/modules/torrents-status.json | 2 +- src/widgets/torrent/TorrentTile.spec.ts | 12 ++++++------ src/widgets/torrent/TorrentTile.tsx | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index 4b841f5dc..d6039b83c 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -10,7 +10,7 @@ "displayCompletedTorrents": { "label": "Display completed torrents" }, - "DisplayActiveTorrents": { + "displayActiveTorrents": { "label": "Display active torrents" }, "SpeedLimitOfActiveTorrents": { diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index 653e1e4f8..a3c1edf0f 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -20,7 +20,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, - DisplayActiveTorrents: true, + displayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: false, }, @@ -57,7 +57,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: true, - DisplayActiveTorrents: true, + displayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -94,7 +94,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - DisplayActiveTorrents: false, + displayActiveTorrents: false, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -131,7 +131,7 @@ describe('TorrentTile', () => { labelFilter: [], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - DisplayActiveTorrents: true, + displayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -172,7 +172,7 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: true, displayCompletedTorrents: true, - DisplayActiveTorrents: true, + displayActiveTorrents: true, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, @@ -209,7 +209,7 @@ describe('TorrentTile', () => { labelFilter: ['music', 'movie'], labelFilterIsWhitelist: false, displayCompletedTorrents: false, - DisplayActiveTorrents: false, + displayActiveTorrents: false, SpeedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index c7c58f970..ee4d0cea0 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -40,7 +40,7 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, - DisplayActiveTorrents: { + displayActiveTorrents: { type: 'switch', defaultValue: true, }, @@ -202,7 +202,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.DisplayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); } if (widget.properties.labelFilter.length > 0) { From 390d4e752295b7717012659175e4b97cfc3fd08f Mon Sep 17 00:00:00 2001 From: Someone <10882916+InterN0te@users.noreply.github.com> Date: Fri, 3 Nov 2023 21:05:16 +0000 Subject: [PATCH 11/11] Switch speedLimitOfActiveTorrents to camel case --- public/locales/en/modules/torrents-status.json | 2 +- src/widgets/torrent/TorrentTile.spec.ts | 12 ++++++------ src/widgets/torrent/TorrentTile.tsx | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/locales/en/modules/torrents-status.json b/public/locales/en/modules/torrents-status.json index d6039b83c..f83493b9d 100644 --- a/public/locales/en/modules/torrents-status.json +++ b/public/locales/en/modules/torrents-status.json @@ -13,7 +13,7 @@ "displayActiveTorrents": { "label": "Display active torrents" }, - "SpeedLimitOfActiveTorrents": { + "speedLimitOfActiveTorrents": { "label": "Upload speed to consider a torrent as active (kB/s)" }, "displayStaleTorrents": { diff --git a/src/widgets/torrent/TorrentTile.spec.ts b/src/widgets/torrent/TorrentTile.spec.ts index a3c1edf0f..71fb178ff 100644 --- a/src/widgets/torrent/TorrentTile.spec.ts +++ b/src/widgets/torrent/TorrentTile.spec.ts @@ -21,7 +21,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: true, displayActiveTorrents: true, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: false, }, }; @@ -58,7 +58,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: true, displayActiveTorrents: true, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -95,7 +95,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: false, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -132,7 +132,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: true, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -173,7 +173,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: true, displayCompletedTorrents: true, displayActiveTorrents: true, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; @@ -210,7 +210,7 @@ describe('TorrentTile', () => { labelFilterIsWhitelist: false, displayCompletedTorrents: false, displayActiveTorrents: false, - SpeedLimitOfActiveTorrents: 10, + speedLimitOfActiveTorrents: 10, displayStaleTorrents: true, }, }; diff --git a/src/widgets/torrent/TorrentTile.tsx b/src/widgets/torrent/TorrentTile.tsx index ee4d0cea0..0b81cea6f 100644 --- a/src/widgets/torrent/TorrentTile.tsx +++ b/src/widgets/torrent/TorrentTile.tsx @@ -44,7 +44,7 @@ const definition = defineWidget({ type: 'switch', defaultValue: true, }, - SpeedLimitOfActiveTorrents: { // Unit : kB/s + speedLimitOfActiveTorrents: { // Unit : kB/s type: 'number', defaultValue: 10, }, @@ -202,7 +202,7 @@ function TorrentTile({ widget }: TorrentTileProps) { export const filterTorrents = (widget: ITorrent, torrents: NormalizedTorrent[]) => { let result = torrents; if (!widget.properties.displayCompletedTorrents) { - result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.SpeedLimitOfActiveTorrents * 1024)); + result = result.filter((torrent) => !torrent.isCompleted || (widget.properties.displayActiveTorrents && torrent.uploadSpeed > widget.properties.speedLimitOfActiveTorrents * 1024)); } if (widget.properties.labelFilter.length > 0) {