Skip to content

Commit 332a654

Browse files
committed
Merge #582: Update Index configuration
59a87c7 fix: [#581] update references to udpated index settings (Jose Celano) 661d6f7 fix: [#581] update Index config files (Jose Celano) Pull request description: The Torrust Index config file has been updated, and some API endpoints exposing the configuration have also changed. We must apply those changes here. - [x] Update config files - [x] torrust/torrust-index-types-lib#20 (Update types lib) - [x] Update code referencing changes in the API response ### Old version ```toml [logging] log_level = "info" [tracker] mode = "public" ``` ### New version ```toml version = "2" [logging] threshold = "info" [tracker] private = false listed = false ``` ACKs for top commit: josecelano: ACK 59a87c7 Tree-SHA512: 4f07659cf7378b10c6838bef3c1a6ffce81177ca3e66c6dd48ff85256ec6030ed95a65f12809dba0ae254c0341d17ec606cd09912fb755bed38162f64700ae29
2 parents a40e2c7 + 59a87c7 commit 332a654

File tree

7 files changed

+25
-19
lines changed

7 files changed

+25
-19
lines changed

components/torrent/TorrentActionCard.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<div class="flex flex-row gap-3">
102102
<template v-if="showDownloadButtons()">
103103
<button class="btn btn-primary grow" data-cy="torrent-action-download" @click="downloadTorrent(torrent.info_hash, torrent.name)">
104-
download {{ isTrackerClose()? 'private' : '' }} torrent
104+
download {{ isTrackerPrivate()? 'private' : '' }} torrent
105105
</button>
106106
<button class="w-12 p-0 btn btn-primary">
107107
<a data-cy="torrent-action-magnet-link" class="flex items-center" :href="torrent.magnet_link">
@@ -147,7 +147,7 @@ import {
147147
downloadTorrent,
148148
useRestApi,
149149
isUserLoggedIn,
150-
isTrackerOpen, isTrackerClose, navigateTo
150+
isTrackerPublic, navigateTo
151151
} from "#imports";
152152
import { canEditThisTorrent } from "~/composables/helpers";
153153
@@ -170,7 +170,7 @@ function hasEditRights (): boolean {
170170
}
171171
172172
function showDownloadButtons (): boolean {
173-
return isUserLoggedIn() || isTrackerOpen();
173+
return isUserLoggedIn() || isTrackerPublic();
174174
}
175175
176176
function seedersPercentage () {

composables/helpers.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import { type TorrentResponse, TrackerMode, type PublicSettings } from "torrust-index-types-lib";
1+
import { type TorrentResponse, type PublicSettings } from "torrust-index-types-lib";
22
import { useRestApi, useSettings, useUser } from "~/composables/states";
33

4-
export function isTrackerOpen (): boolean {
5-
const settings = useSettings();
6-
7-
return settings.value.tracker_mode === TrackerMode.Public ||
8-
settings.value.tracker_mode === TrackerMode.Listed;
4+
export function isTrackerPublic (): boolean {
5+
return !isTrackerPrivate();
96
}
107

11-
export function isTrackerClose (): boolean {
12-
return !isTrackerOpen();
8+
export function isTrackerPrivate (): boolean {
9+
const settings = useSettings();
10+
return settings.value.tracker_private === true;
1311
}
1412

1513
export function isUserLoggedIn (): boolean {

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"generate": "nuxt generate",
77
"preview": "nuxt preview",
88
"postinstall": "nuxt prepare",
9-
"lint": "eslint --ext \".ts,.js,.vue\" . --max-warnings=0" ,
9+
"lint": "eslint --ext \".ts,.js,.vue\" . --max-warnings=0",
1010
"lintfix": "eslint --fix --ext \".ts,.js,.vue\" .",
1111
"cypress:open": "cypress open",
1212
"cypress:run": "cypress run"
@@ -42,7 +42,7 @@
4242
"marked": "^12.0.2",
4343
"notiwind-ts": "^2.0.2",
4444
"torrust-index-api-lib": "^1.0.0-alpha.7",
45-
"torrust-index-types-lib": "^3.0.0-alpha.1",
45+
"torrust-index-types-lib": "^3.0.0-alpha.6",
4646
"uuid": "^9.0.1"
4747
}
48-
}
48+
}

share/default/config/index.private.e2e.container.sqlite3.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
version = "2"
2+
13
[tracker]
24
api_url = "http://tracker:1212"
3-
mode = "private"
5+
private = true
46
url = "http://tracker:7070"
57

68
[database]

share/default/config/index.public.e2e.container.sqlite3.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
version = "2"
2+
13
[tracker]
24
api_url = "http://tracker:1212"
5+
private = false
36
url = "udp://tracker:6969"
47

58
[database]

share/default/config/tracker.public.e2e.container.sqlite3.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version = "2"
22

3+
[core]
4+
private = false
5+
36
[core.database]
47
path = "/var/lib/torrust/tracker/database/e2e_testing_sqlite3.db"
58

0 commit comments

Comments
 (0)