diff options
author | Chocobozzz <me@florianbigard.com> | 2021-07-16 09:47:51 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-07-20 15:27:18 +0200 |
commit | 254d3579f5338f5fd775c17d15cdfc37078bcfb4 (patch) | |
tree | eaeb13fda16c16e98cd6991d202b0ca6a4cbdb63 /shared/extra-utils/miscs | |
parent | 89d241a79c262b9775c233b73cff080043ebb5e6 (diff) | |
download | PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.tar.gz PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.tar.zst PeerTube-254d3579f5338f5fd775c17d15cdfc37078bcfb4.zip |
Use an object to represent a server
Diffstat (limited to 'shared/extra-utils/miscs')
-rw-r--r-- | shared/extra-utils/miscs/checks.ts | 4 | ||||
-rw-r--r-- | shared/extra-utils/miscs/webtorrent.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shared/extra-utils/miscs/checks.ts b/shared/extra-utils/miscs/checks.ts index 8f7bdb9b5..c81460330 100644 --- a/shared/extra-utils/miscs/checks.ts +++ b/shared/extra-utils/miscs/checks.ts | |||
@@ -6,7 +6,7 @@ import { join } from 'path' | |||
6 | import { root } from '@server/helpers/core-utils' | 6 | import { root } from '@server/helpers/core-utils' |
7 | import { HttpStatusCode } from '@shared/core-utils' | 7 | import { HttpStatusCode } from '@shared/core-utils' |
8 | import { makeGetRequest } from '../requests' | 8 | import { makeGetRequest } from '../requests' |
9 | import { ServerInfo } from '../server' | 9 | import { PeerTubeServer } from '../server' |
10 | 10 | ||
11 | // Default interval -> 5 minutes | 11 | // Default interval -> 5 minutes |
12 | function dateIsValid (dateString: string, interval = 300000) { | 12 | function dateIsValid (dateString: string, interval = 300000) { |
@@ -33,7 +33,7 @@ async function testImage (url: string, imageName: string, imagePath: string, ext | |||
33 | expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture') | 33 | expect(data.length).to.be.below(maxLength, 'the generated image is way larger than the recorded fixture') |
34 | } | 34 | } |
35 | 35 | ||
36 | async function testFileExistsOrNot (server: ServerInfo, directory: string, filePath: string, exist: boolean) { | 36 | async function testFileExistsOrNot (server: PeerTubeServer, directory: string, filePath: string, exist: boolean) { |
37 | const base = server.servers.buildDirectory(directory) | 37 | const base = server.servers.buildDirectory(directory) |
38 | 38 | ||
39 | expect(await pathExists(join(base, filePath))).to.equal(exist) | 39 | expect(await pathExists(join(base, filePath))).to.equal(exist) |
diff --git a/shared/extra-utils/miscs/webtorrent.ts b/shared/extra-utils/miscs/webtorrent.ts index 84e390b2a..815ea3d56 100644 --- a/shared/extra-utils/miscs/webtorrent.ts +++ b/shared/extra-utils/miscs/webtorrent.ts | |||
@@ -2,7 +2,7 @@ import { readFile } from 'fs-extra' | |||
2 | import * as parseTorrent from 'parse-torrent' | 2 | import * as parseTorrent from 'parse-torrent' |
3 | import { join } from 'path' | 3 | import { join } from 'path' |
4 | import * as WebTorrent from 'webtorrent' | 4 | import * as WebTorrent from 'webtorrent' |
5 | import { ServerInfo } from '../server' | 5 | import { PeerTubeServer } from '../server' |
6 | 6 | ||
7 | let webtorrent: WebTorrent.Instance | 7 | let webtorrent: WebTorrent.Instance |
8 | 8 | ||
@@ -15,7 +15,7 @@ function webtorrentAdd (torrent: string, refreshWebTorrent = false) { | |||
15 | return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res)) | 15 | return new Promise<WebTorrent.Torrent>(res => webtorrent.add(torrent, res)) |
16 | } | 16 | } |
17 | 17 | ||
18 | async function parseTorrentVideo (server: ServerInfo, videoUUID: string, resolution: number) { | 18 | async function parseTorrentVideo (server: PeerTubeServer, videoUUID: string, resolution: number) { |
19 | const torrentName = videoUUID + '-' + resolution + '.torrent' | 19 | const torrentName = videoUUID + '-' + resolution + '.torrent' |
20 | const torrentPath = server.servers.buildDirectory(join('torrents', torrentName)) | 20 | const torrentPath = server.servers.buildDirectory(join('torrents', torrentName)) |
21 | 21 | ||