X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-import-videos.ts;h=52aae3d2c372cd51783376ec3dd0d0ea82bde4af;hb=0d22b7ad5ffea0a830a266815f7bdfd8893917c9;hp=65798adb4d525f814516abda263ebf78f560dadf;hpb=82f5527fc3945f433ad8f1af66d13b46efb877da;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 65798adb4..52aae3d2c 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -1,26 +1,26 @@ import { registerTSPaths } from '../helpers/register-ts-paths' registerTSPaths() +import { program } from 'commander' import { accessSync, constants } from 'fs' -import { join } from 'path' -import { promisify } from 'util' - -import * as program from 'commander' import { remove } from 'fs-extra' import { truncate } from 'lodash' +import { join } from 'path' import * as prompt from 'prompt' - +import { promisify } from 'util' +import { YoutubeDL } from '@server/helpers/youtube-dl' +import { sha256 } from '../helpers/core-utils' import { doRequestAndSaveToFile } from '../helpers/requests' import { CONSTRAINTS_FIELDS } from '../initializers/constants' -import { getClient, getVideoCategories, login, searchVideoWithSort, uploadVideo } from '../../shared/extra-utils/index' -import { sha256 } from '../helpers/core-utils' -import { buildOriginallyPublishedAt, getYoutubeDLVideoFormat, safeGetYoutubeDL } from '../helpers/youtube-dl' -import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getLogger, getServerCredentials } from './cli' - -type UserInfo = { - username: string - password: string -} +import { + assignToken, + buildCommonVideoOptions, + buildServer, + buildVideoAttributesFromCommander, + getLogger, + getServerCredentials +} from './cli' +import { PeerTubeServer } from '@shared/extra-utils' const processOptions = { maxBuffer: Infinity @@ -45,38 +45,36 @@ command .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']) - - const user = { username, password } + options.targetUrl = normalizeTargetUrl(options.targetUrl) - run(url, user) + run(url, username, password) .catch(err => exitError(err)) }) .catch(err => console.error(err)) -async function run (url: string, user: UserInfo) { - if (!user.password) { - user.password = await promptPassword() - } +async function run (url: string, username: string, password: string) { + if (!password) password = await promptPassword() - const youtubeDL = await safeGetYoutubeDL() + const youtubeDLBinary = await YoutubeDL.safeGetYoutubeDL() - let info = await getYoutubeDLInfo(youtubeDL, program['targetUrl'], command.args) + let info = await getYoutubeDLInfo(youtubeDLBinary, options.targetUrl, command.args) if (!Array.isArray(info)) info = [ info ] @@ -86,16 +84,16 @@ async function run (url: string, user: UserInfo) { if (uploadsObject) { console.log('Fixing URL to %s.', uploadsObject.url) - info = await getYoutubeDLInfo(youtubeDL, uploadsObject.url, command.args) + info = await getYoutubeDLInfo(youtubeDLBinary, uploadsObject.url, command.args) } let infoArray: any[] 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)) @@ -104,14 +102,15 @@ async function run (url: string, user: UserInfo) { for (const [ index, info ] of infoArray.entries()) { try { - if (index > 0 && program['waitInterval']) { - log.info("Wait for %d seconds before continuing.", program['waitInterval'] / 1000) - await new Promise(res => setTimeout(res, program['waitInterval'])) + 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, + username, + password, youtubeInfo: info }) } catch (err) { @@ -119,40 +118,49 @@ async function run (url: string, user: UserInfo) { } } - log.info('Video/s for user %s imported: %s', user.username, program['targetUrl']) + log.info('Video/s for user %s imported: %s', username, options.targetUrl) process.exit(0) } async function processVideo (parameters: { cwd: string url: string - user: { username: string, password: string } + username: string + password: string youtubeInfo: any }) { - const { youtubeInfo, cwd, url, user } = parameters + const { youtubeInfo, cwd, url, username, password } = parameters + const youtubeDL = new YoutubeDL('', []) log.debug('Fetching object.', youtubeInfo) const videoInfo = await fetchObject(youtubeInfo) log.debug('Fetched object.', videoInfo) - 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'])) + const originallyPublishedAt = youtubeDL.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 (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'])) + + 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 } - const result = await searchVideoWithSort(url, videoInfo.title, '-match') + const server = buildServer(url) + const { data } = await server.search.advancedVideoSearch({ + search: { + search: videoInfo.title, + sort: '-match', + searchTarget: 'local' + } + }) log.info('############################################################\n') - if (result.body.data.find(v => v.name === videoInfo.title)) { + if (data.find(v => v.name === videoInfo.title)) { log.info('Video "%s" already exists, don\'t reupload it.\n', videoInfo.title) return } @@ -161,16 +169,18 @@ async function processVideo (parameters: { log.info('Downloading video "%s"...', videoInfo.title) - const options = [ '-f', getYoutubeDLVideoFormat(), ...command.args, '-o', path ] + const youtubeDLOptions = [ '-f', youtubeDL.getYoutubeDLVideoFormat(), ...command.args, '-o', path ] try { - const youtubeDL = await safeGetYoutubeDL() - const youtubeDLExec = promisify(youtubeDL.exec).bind(youtubeDL) - const output = await youtubeDLExec(videoInfo.url, options, processOptions) + const youtubeDLBinary = await YoutubeDL.safeGetYoutubeDL() + const youtubeDLExec = promisify(youtubeDLBinary.exec).bind(youtubeDLBinary) + const output = await youtubeDLExec(videoInfo.url, youtubeDLOptions, processOptions) log.info(output.join('\n')) await uploadVideoOnPeerTube({ + youtubeDL, cwd, url, - user, + username, + password, videoInfo: normalizeObject(videoInfo), videoPath: path }) @@ -180,15 +190,20 @@ async function processVideo (parameters: { } async function uploadVideoOnPeerTube (parameters: { + youtubeDL: YoutubeDL videoInfo: any videoPath: string cwd: string url: string - user: { username: string, password: string } + username: string + password: string }) { - const { videoInfo, videoPath, cwd, url, user } = parameters + const { youtubeDL, videoInfo, videoPath, cwd, url, username, password } = parameters - const category = await getCategory(videoInfo.categories, url) + const server = buildServer(url) + await assignToken(server, username, password) + + const category = await getCategory(server, videoInfo.categories) const licence = getLicence(videoInfo.license) let tags = [] if (Array.isArray(videoInfo.tags)) { @@ -202,13 +217,10 @@ 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) + const originallyPublishedAt = youtubeDL.buildOriginallyPublishedAt(videoInfo) const defaultAttributes = { name: truncate(videoInfo.title, { @@ -223,28 +235,28 @@ async function uploadVideoOnPeerTube (parameters: { tags } - const videoAttributes = await buildVideoAttributesFromCommander(url, program, defaultAttributes) + const baseAttributes = await buildVideoAttributesFromCommander(server, program, defaultAttributes) + + const attributes = { + ...baseAttributes, - Object.assign(videoAttributes, { originallyPublishedAt: originallyPublishedAt ? originallyPublishedAt.toISOString() : null, thumbnailfile, previewfile: thumbnailfile, fixture: videoPath - }) - - log.info('\nUploading on PeerTube video "%s".', videoAttributes.name) + } - let accessToken = await getAccessTokenOrDie(url, user) + log.info('\nUploading on PeerTube video "%s".', attributes.name) try { - await uploadVideo(url, accessToken, videoAttributes) + await server.videos.upload({ attributes }) } catch (err) { if (err.message.indexOf('401') !== -1) { log.info('Got 401 Unauthorized, token may have expired, renewing token and retry.') - accessToken = await getAccessTokenOrDie(url, user) + server.accessToken = await server.login.getAccessToken(username, password) - await uploadVideo(url, accessToken, videoAttributes) + await server.videos.upload({ attributes }) } else { exitError(err.message) } @@ -253,20 +265,19 @@ async function uploadVideoOnPeerTube (parameters: { await remove(videoPath) if (thumbnailfile) await remove(thumbnailfile) - log.warn('Uploaded video "%s"!\n', videoAttributes.name) + log.warn('Uploaded video "%s"!\n', attributes.name) } /* ---------------------------------------------------------- */ -async function getCategory (categories: string[], url: string) { +async function getCategory (server: PeerTubeServer, categories: string[]) { if (!categories) return undefined const categoryString = categories[0] if (categoryString === 'News & Politics') return 11 - const res = await getVideoCategories(url) - const categoriesServer = res.body + const categoriesServer = await server.videos.getCategories() for (const key of Object.keys(categoriesServer)) { const categoryServer = categoriesServer[key] @@ -307,7 +318,7 @@ function fetchObject (info: any) { const url = buildUrl(info) return new Promise(async (res, rej) => { - const youtubeDL = await safeGetYoutubeDL() + const youtubeDL = await YoutubeDL.safeGetYoutubeDL() youtubeDL.getInfo(url, undefined, processOptions, (err, videoInfo) => { if (err) return rej(err) @@ -362,21 +373,6 @@ async function promptPassword () { }) } -async function getAccessTokenOrDie (url: string, user: UserInfo) { - const resClient = await getClient(url) - const client = { - id: resClient.body.client_id, - secret: resClient.body.client_secret - } - - try { - const res = await login(url, client, user) - return res.body.access_token - } catch (err) { - exitError('Cannot authenticate. Please check your username/password.') - } -} - function parseDate (dateAsStr: string): Date { if (!/\d{4}-\d{2}-\d{2}/.test(dateAsStr)) { exitError(`Invalid date passed: ${dateAsStr}. Expected format: YYYY-MM-DD. See help for usage.`)