X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-import-videos.ts;h=9159950318d4f32316bf3c6789c233c9700e5cec;hb=38ce2aa7a8cc51a833b85a32222da2d2c2a43cb9;hp=5fc5a867cdbe3829c372eaa2d6718d1af9315b30;hpb=5721fd8374e732c4dfa149c54a800db74591c245;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 5fc5a867c..915995031 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -2,16 +2,17 @@ import { registerTSPaths } from '../helpers/register-ts-paths' registerTSPaths() import * as program from 'commander' -import { join } from 'path' -import { doRequestAndSaveToFile } from '../helpers/requests' -import { CONSTRAINTS_FIELDS } from '../initializers/constants' -import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../../shared/extra-utils/index' -import { truncate } from 'lodash' -import * as prompt from 'prompt' import { accessSync, constants } from 'fs' import { remove } from 'fs-extra' +import { truncate } from 'lodash' +import { join } from 'path' +import * as prompt from 'prompt' +import { promisify } from 'util' +import { advancedVideosSearch, getClient, getVideoCategories, login, uploadVideo } from '../../shared/extra-utils/index' import { sha256 } from '../helpers/core-utils' -import { buildOriginallyPublishedAt, safeGetYoutubeDL } from '../helpers/youtube-dl' +import { doRequestAndSaveToFile } from '../helpers/requests' +import { buildOriginallyPublishedAt, getYoutubeDLVideoFormat, safeGetYoutubeDL } from '../helpers/youtube-dl' +import { CONSTRAINTS_FIELDS } from '../initializers/constants' import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getLogger, getServerCredentials } from './cli' type UserInfo = { @@ -37,26 +38,29 @@ command .option('--until ', 'Publication date (inclusive) until which the videos can be imported (YYYY-MM-DD)', parseDate) .option('--first ', 'Process first n elements of returned playlist') .option('--last ', 'Process last n elements of returned playlist') + .option('--wait-interval ', 'Duration between two video imports (in seconds)', convertIntoMs) .option('-T, --tmpdir ', 'Working directory', __dirname) .usage("[global options] [ -- youtube-dl options]") .parse(process.argv) -const log = getLogger(program['verbose']) +const options = command.opts() + +const log = getLogger(options.verbose) getServerCredentials(command) .then(({ url, username, password }) => { - if (!program['targetUrl']) { + if (!options.targetUrl) { exitError('--target-url field is required.') } try { - accessSync(program['tmpdir'], constants.R_OK | constants.W_OK) + accessSync(options.tmpdir, constants.R_OK | constants.W_OK) } catch (e) { - exitError('--tmpdir %s: directory does not exist or is not accessible', program['tmpdir']) + exitError('--tmpdir %s: directory does not exist or is not accessible', options.tmpdir) } url = normalizeTargetUrl(url) - program['targetUrl'] = normalizeTargetUrl(program['targetUrl']) + options.targetUrl = normalizeTargetUrl(options.targetUrl) const user = { username, password } @@ -72,7 +76,7 @@ async function run (url: string, user: UserInfo) { const youtubeDL = await safeGetYoutubeDL() - let info = await getYoutubeDLInfo(youtubeDL, program['targetUrl'], command.args) + let info = await getYoutubeDLInfo(youtubeDL, options.targetUrl, command.args) if (!Array.isArray(info)) info = [ info ] @@ -87,35 +91,39 @@ async function run (url: string, user: UserInfo) { let infoArray: any[] - // Normalize utf8 fields infoArray = [].concat(info) - if (program['first']) { - infoArray = infoArray.slice(0, program['first']) - } else if (program['last']) { - infoArray = infoArray.slice(-program['last']) + if (options.first) { + infoArray = infoArray.slice(0, options.first) + } else if (options.last) { + infoArray = infoArray.slice(-options.last) } + // Normalize utf8 fields infoArray = infoArray.map(i => normalizeObject(i)) log.info('Will download and upload %d videos.\n', infoArray.length) - for (const info of infoArray) { + for (const [ index, info ] of infoArray.entries()) { try { + if (index > 0 && options.waitInterval) { + log.info("Wait for %d seconds before continuing.", options.waitInterval / 1000) + await new Promise(res => setTimeout(res, options.waitInterval)) + } await processVideo({ - cwd: program['tmpdir'], + cwd: options.tmpdir, url, user, youtubeInfo: info }) } catch (err) { - console.error('Cannot process video.', { info, url }) + console.error('Cannot process video.', { info, url, err }) } } - log.info('Video/s for user %s imported: %s', user.username, program['targetUrl']) + log.info('Video/s for user %s imported: %s', user.username, options.targetUrl) process.exit(0) } -function processVideo (parameters: { +async function processVideo (parameters: { cwd: string url: string user: { username: string, password: string } @@ -123,63 +131,52 @@ function processVideo (parameters: { }) { const { youtubeInfo, cwd, url, user } = parameters - return new Promise(async res => { - log.debug('Fetching object.', youtubeInfo) - - const videoInfo = await fetchObject(youtubeInfo) - log.debug('Fetched object.', videoInfo) + log.debug('Fetching object.', youtubeInfo) - const originallyPublishedAt = buildOriginallyPublishedAt(videoInfo) - - if (program['since'] && originallyPublishedAt && originallyPublishedAt.getTime() < program['since'].getTime()) { - log.info('Video "%s" has been published before "%s", don\'t upload it.\n', - videoInfo.title, formatDate(program['since'])) - return res() - } - - if (program['until'] && originallyPublishedAt && originallyPublishedAt.getTime() > program['until'].getTime()) { - log.info('Video "%s" has been published after "%s", don\'t upload it.\n', - videoInfo.title, formatDate(program['until'])) - return res() - } + const videoInfo = await fetchObject(youtubeInfo) + log.debug('Fetched object.', videoInfo) - const result = await searchVideoWithSort(url, videoInfo.title, '-match') + const originallyPublishedAt = buildOriginallyPublishedAt(videoInfo) + if (options.since && originallyPublishedAt && originallyPublishedAt.getTime() < options.since.getTime()) { + log.info('Video "%s" has been published before "%s", don\'t upload it.\n', + videoInfo.title, formatDate(options.since)) + return + } + if (options.until && originallyPublishedAt && originallyPublishedAt.getTime() > options.until.getTime()) { + log.info('Video "%s" has been published after "%s", don\'t upload it.\n', + videoInfo.title, formatDate(options.until)) + return + } - log.info('############################################################\n') + const result = await advancedVideosSearch(url, { search: videoInfo.title, sort: '-match', searchTarget: 'local' }) - if (result.body.data.find(v => v.name === videoInfo.title)) { - log.info('Video "%s" already exists, don\'t reupload it.\n', videoInfo.title) - return res() - } + log.info('############################################################\n') - const path = join(cwd, sha256(videoInfo.url) + '.mp4') + if (result.body.data.find(v => v.name === videoInfo.title)) { + log.info('Video "%s" already exists, don\'t reupload it.\n', videoInfo.title) + return + } - log.info('Downloading video "%s"...', videoInfo.title) + const path = join(cwd, sha256(videoInfo.url) + '.mp4') - const options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', ...command.args, '-o', path ] - try { - const youtubeDL = await safeGetYoutubeDL() - youtubeDL.exec(videoInfo.url, options, processOptions, async (err, output) => { - if (err) { - log.error(err) - return res() - } + log.info('Downloading video "%s"...', videoInfo.title) - log.info(output.join('\n')) - await uploadVideoOnPeerTube({ - cwd, - url, - user, - videoInfo: normalizeObject(videoInfo), - videoPath: path - }) - return res() - }) - } catch (err) { - log.error(err.message) - return res() - } - }) + const youtubeDLOptions = [ '-f', getYoutubeDLVideoFormat(), ...command.args, '-o', path ] + try { + const youtubeDL = await safeGetYoutubeDL() + const youtubeDLExec = promisify(youtubeDL.exec).bind(youtubeDL) + const output = await youtubeDLExec(videoInfo.url, youtubeDLOptions, processOptions) + log.info(output.join('\n')) + await uploadVideoOnPeerTube({ + cwd, + url, + user, + videoInfo: normalizeObject(videoInfo), + videoPath: path + }) + } catch (err) { + log.error(err.message) + } } async function uploadVideoOnPeerTube (parameters: { @@ -205,10 +202,7 @@ async function uploadVideoOnPeerTube (parameters: { if (videoInfo.thumbnail) { thumbnailfile = join(cwd, sha256(videoInfo.thumbnail) + '.jpg') - await doRequestAndSaveToFile({ - method: 'GET', - uri: videoInfo.thumbnail - }, thumbnailfile) + await doRequestAndSaveToFile(videoInfo.thumbnail, thumbnailfile) } const originallyPublishedAt = buildOriginallyPublishedAt(videoInfo) @@ -396,6 +390,14 @@ function formatDate (date: Date): string { return date.toISOString().split('T')[0] } +function convertIntoMs (secondsAsStr: string): number { + const seconds = parseInt(secondsAsStr, 10) + if (seconds <= 0) { + exitError(`Invalid duration passed: ${seconds}. Expected duration to be strictly positive and in seconds`) + } + return Math.round(seconds * 1000) +} + function exitError (message: string, ...meta: any[]) { // use console.error instead of log.error here console.error(message, ...meta)