From d441f2ed78c004e62766394b2437f6089f2b4ca5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 21 Nov 2019 16:30:47 +0100 Subject: Add disable webtorrent migration --- server/helpers/webtorrent.ts | 4 +- .../migrations/0450-streaming-playlist-files.ts | 75 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/server/helpers/webtorrent.ts b/server/helpers/webtorrent.ts index f3e41f8d6..3a99518c6 100644 --- a/server/helpers/webtorrent.ts +++ b/server/helpers/webtorrent.ts @@ -72,6 +72,7 @@ async function downloadWebTorrentVideo (target: { magnetUri: string, torrentName async function createTorrentAndSetInfoHash (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, videoFile: MVideoFile) { const video = extractVideo(videoOrPlaylist) + const { baseUrlHttp } = video.getBaseUrls() const options = { // Keep the extname, it's used by the client to stream the file inside a web browser @@ -81,7 +82,7 @@ async function createTorrentAndSetInfoHash (videoOrPlaylist: MVideo | MStreaming [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], [ WEBSERVER.URL + '/tracker/announce' ] ], - urlList: [ WEBSERVER.URL + STATIC_PATHS.WEBSEED + getVideoFilename(videoOrPlaylist, videoFile) ] + urlList: [ videoOrPlaylist.getVideoFileUrl(videoFile, baseUrlHttp) ] } const torrent = await createTorrentPromise(getVideoFilePath(videoOrPlaylist, videoFile), options) @@ -126,6 +127,7 @@ function generateMagnetUri ( // --------------------------------------------------------------------------- export { + createTorrentPromise, createTorrentAndSetInfoHash, generateMagnetUri, downloadWebTorrentVideo diff --git a/server/initializers/migrations/0450-streaming-playlist-files.ts b/server/initializers/migrations/0450-streaming-playlist-files.ts index 536ef00f9..4e177bef8 100644 --- a/server/initializers/migrations/0450-streaming-playlist-files.ts +++ b/server/initializers/migrations/0450-streaming-playlist-files.ts @@ -1,4 +1,10 @@ import * as Sequelize from 'sequelize' +import { join } from 'path' +import { HLS_STREAMING_PLAYLIST_DIRECTORY, WEBSERVER } from '@server/initializers/constants' +import { CONFIG } from '@server/initializers/config' +import { pathExists, stat, writeFile } from 'fs-extra' +import * as parseTorrent from 'parse-torrent' +import { createTorrentPromise } from '@server/helpers/webtorrent' async function up (utils: { transaction: Sequelize.Transaction, @@ -28,6 +34,75 @@ async function up (utils: { await utils.queryInterface.changeColumn('videoFile', 'videoId', data) } + + { + await utils.queryInterface.removeIndex('videoFile', 'video_file_video_id_resolution_fps') + } + + { + const query = 'insert into "videoFile" ' + + '(resolution, size, "infoHash", "videoId", "createdAt", "updatedAt", fps, extname, "videoStreamingPlaylistId")' + + '(SELECT "videoFile".resolution, "videoFile".size, \'fake\', NULL, "videoFile"."createdAt", "videoFile"."updatedAt", "videoFile"."fps", ' + + '"videoFile".extname, "videoStreamingPlaylist".id FROM "videoStreamingPlaylist" ' + + 'inner join video ON video.id = "videoStreamingPlaylist"."videoId" inner join "videoFile" ON "videoFile"."videoId" = video.id)' + + await utils.sequelize.query(query, { transaction: utils.transaction }) + } + + { + const query = 'select "videoFile".id as id, "videoFile".resolution as resolution, "video".uuid as uuid from "videoFile" ' + + 'inner join "videoStreamingPlaylist" ON "videoStreamingPlaylist".id = "videoFile"."videoStreamingPlaylistId" ' + + 'inner join video ON video.id = "videoStreamingPlaylist"."videoId" ' + + 'WHERE video.remote IS FALSE' + const options = { + type: Sequelize.QueryTypes.SELECT, + transaction: utils.transaction + } + const res = await utils.sequelize.query(query, options) + + for (const row of res) { + const videoFilename = `${row['uuid']}-${row['resolution']}-fragmented.mp4` + const videoFilePath = join(HLS_STREAMING_PLAYLIST_DIRECTORY, row['uuid'], videoFilename) + + if (!await pathExists(videoFilePath)) { + console.warn('Cannot generate torrent of %s: file does not exist.', videoFilePath) + continue + } + + const createTorrentOptions = { + // Keep the extname, it's used by the client to stream the file inside a web browser + name: `video ${row['uuid']}`, + createdBy: 'PeerTube', + announceList: [ + [ WEBSERVER.WS + '://' + WEBSERVER.HOSTNAME + ':' + WEBSERVER.PORT + '/tracker/socket' ], + [ WEBSERVER.URL + '/tracker/announce' ] + ], + urlList: [ WEBSERVER.URL + join(HLS_STREAMING_PLAYLIST_DIRECTORY, row['uuid'], videoFilename) ] + } + const torrent = await createTorrentPromise(videoFilePath, createTorrentOptions) + + const torrentName = `${row['uuid']}-${row['resolution']}-hls.torrent` + const filePath = join(CONFIG.STORAGE.TORRENTS_DIR, torrentName) + + await writeFile(filePath, torrent) + + const parsedTorrent = parseTorrent(torrent) + const infoHash = parsedTorrent.infoHash + + const stats = await stat(videoFilePath) + const size = stats.size + + const queryUpdate = 'UPDATE "videoFile" SET "infoHash" = ?, "size" = ? WHERE id = ?' + + const options = { + type: Sequelize.QueryTypes.UPDATE, + replacements: [ infoHash, size, row['id'] ], + transaction: utils.transaction + } + await utils.sequelize.query(queryUpdate, options) + + } + } } function down (options) { -- cgit v1.2.3