import 'mocha'
import * as chai from 'chai'
-import { waitJobs } from '../../../shared/extra-utils/server/jobs'
+import { createFile, readdir } from 'fs-extra'
+import { join } from 'path'
+import { buildUUID } from '@server/helpers/uuid'
import {
- buildServerDirectory,
cleanupTests,
- createVideoPlaylist,
+ CLICommand,
+ createMultipleServers,
doubleFollow,
- execCLI,
- flushAndRunMultipleServers,
- getAccount,
- getEnvCli,
killallServers,
makeGetRequest,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
setDefaultVideoChannel,
- updateMyAvatar,
- uploadVideo,
- wait
-} from '../../../shared/extra-utils'
-import { Account, VideoPlaylistPrivacy } from '../../../shared/models'
-import { createFile, readdir } from 'fs-extra'
-import { v4 as uuidv4 } from 'uuid'
-import { join } from 'path'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
+ wait,
+ waitJobs
+} from '@shared/extra-utils'
+import { HttpStatusCode, VideoPlaylistPrivacy } from '@shared/models'
const expect = chai.expect
-async function countFiles (internalServerNumber: number, directory: string) {
- const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
+async function countFiles (server: PeerTubeServer, directory: string) {
+ const files = await readdir(server.servers.buildDirectory(directory))
return files.length
}
-async function assertNotExists (internalServerNumber: number, directory: string, substring: string) {
- const files = await readdir(buildServerDirectory({ internalServerNumber }, directory))
+async function assertNotExists (server: PeerTubeServer, directory: string, substring: string) {
+ const files = await readdir(server.servers.buildDirectory(directory))
for (const f of files) {
expect(f).to.not.contain(substring)
}
}
-async function assertCountAreOkay (servers: ServerInfo[]) {
+async function assertCountAreOkay (servers: PeerTubeServer[], videoServer2UUID: string) {
for (const server of servers) {
- const videosCount = await countFiles(server.internalServerNumber, 'videos')
+ const videosCount = await countFiles(server, 'videos')
expect(videosCount).to.equal(8)
- const torrentsCount = await countFiles(server.internalServerNumber, 'torrents')
+ const torrentsCount = await countFiles(server, 'torrents')
expect(torrentsCount).to.equal(16)
- const previewsCount = await countFiles(server.internalServerNumber, 'previews')
+ const previewsCount = await countFiles(server, 'previews')
expect(previewsCount).to.equal(2)
- const thumbnailsCount = await countFiles(server.internalServerNumber, 'thumbnails')
+ const thumbnailsCount = await countFiles(server, 'thumbnails')
expect(thumbnailsCount).to.equal(6)
- const avatarsCount = await countFiles(server.internalServerNumber, 'avatars')
+ const avatarsCount = await countFiles(server, 'avatars')
expect(avatarsCount).to.equal(2)
}
+
+ // When we'll prune HLS directories too
+ // const hlsRootCount = await countFiles(servers[1], 'streaming-playlists/hls/')
+ // expect(hlsRootCount).to.equal(2)
+
+ // const hlsCount = await countFiles(servers[1], 'streaming-playlists/hls/' + videoServer2UUID)
+ // expect(hlsCount).to.equal(10)
}
describe('Test prune storage scripts', function () {
- let servers: ServerInfo[]
+ let servers: PeerTubeServer[]
const badNames: { [directory: string]: string[] } = {}
+ let videoServer2UUID: string
+
before(async function () {
this.timeout(120000)
- servers = await flushAndRunMultipleServers(2, { transcoding: { enabled: true } })
+ servers = await createMultipleServers(2, { transcoding: { enabled: true } })
await setAccessTokensToServers(servers)
await setDefaultVideoChannel(servers)
for (const server of servers) {
- await uploadVideo(server.url, server.accessToken, { name: 'video 1' })
- await uploadVideo(server.url, server.accessToken, { name: 'video 2' })
+ await server.videos.upload({ attributes: { name: 'video 1' } })
- await updateMyAvatar({ url: server.url, accessToken: server.accessToken, fixture: 'avatar.png' })
+ const { uuid } = await server.videos.upload({ attributes: { name: 'video 2' } })
+ if (server.serverNumber === 2) videoServer2UUID = uuid
- await createVideoPlaylist({
- url: server.url,
- token: server.accessToken,
- playlistAttrs: {
+ await server.users.updateMyAvatar({ fixture: 'avatar.png' })
+
+ await server.playlists.create({
+ attributes: {
displayName: 'playlist',
privacy: VideoPlaylistPrivacy.PUBLIC,
- videoChannelId: server.videoChannel.id,
+ videoChannelId: server.store.channel.id,
thumbnailfile: 'thumbnail.jpg'
}
})
// Lazy load the remote avatar
{
- const res = await getAccount(servers[0].url, 'root@localhost:' + servers[1].port)
- const account: Account = res.body
+ const account = await servers[0].accounts.get({ accountName: 'root@localhost:' + servers[1].port })
await makeGetRequest({
url: servers[0].url,
path: account.avatar.path,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
}
{
- const res = await getAccount(servers[1].url, 'root@localhost:' + servers[0].port)
- const account: Account = res.body
+ const account = await servers[1].accounts.get({ accountName: 'root@localhost:' + servers[0].port })
await makeGetRequest({
url: servers[1].url,
path: account.avatar.path,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
}
await wait(1000)
await waitJobs(servers)
- killallServers(servers)
+ await killallServers(servers)
await wait(1000)
})
it('Should have the files on the disk', async function () {
- await assertCountAreOkay(servers)
+ await assertCountAreOkay(servers, videoServer2UUID)
})
it('Should create some dirty files', async function () {
for (let i = 0; i < 2; i++) {
{
- const base = buildServerDirectory(servers[0], 'videos')
+ const base = servers[0].servers.buildDirectory('videos')
- const n1 = uuidv4() + '.mp4'
- const n2 = uuidv4() + '.webm'
+ const n1 = buildUUID() + '.mp4'
+ const n2 = buildUUID() + '.webm'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0], 'torrents')
+ const base = servers[0].servers.buildDirectory('torrents')
- const n1 = uuidv4() + '-240.torrent'
- const n2 = uuidv4() + '-480.torrent'
+ const n1 = buildUUID() + '-240.torrent'
+ const n2 = buildUUID() + '-480.torrent'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0], 'thumbnails')
+ const base = servers[0].servers.buildDirectory('thumbnails')
- const n1 = uuidv4() + '.jpg'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.jpg'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0], 'previews')
+ const base = servers[0].servers.buildDirectory('previews')
- const n1 = uuidv4() + '.jpg'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.jpg'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
}
{
- const base = buildServerDirectory(servers[0], 'avatars')
+ const base = servers[0].servers.buildDirectory('avatars')
- const n1 = uuidv4() + '.png'
- const n2 = uuidv4() + '.jpg'
+ const n1 = buildUUID() + '.png'
+ const n2 = buildUUID() + '.jpg'
await createFile(join(base, n1))
await createFile(join(base, n2))
badNames['avatars'] = [ n1, n2 ]
}
+
+ // When we'll prune HLS directories too
+ // {
+ // const directory = join('streaming-playlists', 'hls')
+ // const base = servers[1].servers.buildDirectory(directory)
+
+ // const n1 = buildUUID()
+ // await createFile(join(base, n1))
+ // badNames[directory] = [ n1 ]
+ // }
+
+ // {
+ // const directory = join('streaming-playlists', 'hls', videoServer2UUID)
+ // const base = servers[1].servers.buildDirectory(directory)
+ // const n1 = buildUUID() + '-240-fragmented-.mp4'
+ // const n2 = buildUUID() + '-master.m3u8'
+
+ // await createFile(join(base, n1))
+ // await createFile(join(base, n2))
+
+ // badNames[directory] = [ n1, n2 ]
+ // }
}
})
it('Should run prune storage', async function () {
this.timeout(30000)
- const env = getEnvCli(servers[0])
- await execCLI(`echo y | ${env} npm run prune-storage`)
+ const env = servers[0].cli.getEnv()
+ await CLICommand.exec(`echo y | ${env} npm run prune-storage`)
})
it('Should have removed files', async function () {
- await assertCountAreOkay(servers)
+ await assertCountAreOkay(servers, videoServer2UUID)
for (const directory of Object.keys(badNames)) {
for (const name of badNames[directory]) {
- await assertNotExists(servers[0].internalServerNumber, directory, name)
+ await assertNotExists(servers[0], directory, name)
}
}
})
projects / github / Chocobozzz / PeerTube.git / blobdiff