import { registerTSPaths } from '../helpers/register-ts-paths'
registerTSPaths()
-import * as program from 'commander'
+import { program } from 'commander'
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 { YoutubeDL } from '@server/helpers/youtube-dl'
import { sha256 } from '../helpers/core-utils'
import { doRequestAndSaveToFile } from '../helpers/requests'
import { CONSTRAINTS_FIELDS } from '../initializers/constants'
-import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getLogger, getServerCredentials } from './cli'
-import { YoutubeDL } from '@server/helpers/youtube-dl'
-
-type UserInfo = {
- username: string
- password: string
-}
+import {
+ assignToken,
+ buildCommonVideoOptions,
+ buildServer,
+ buildVideoAttributesFromCommander,
+ getLogger,
+ getServerCredentials
+} from './cli'
+import { PeerTubeServer } from '@shared/extra-utils'
+
+import prompt = require('prompt')
const processOptions = {
maxBuffer: Infinity
url = normalizeTargetUrl(url)
options.targetUrl = normalizeTargetUrl(options.targetUrl)
- const user = { username, password }
-
- 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 youtubeDLBinary = await YoutubeDL.safeGetYoutubeDL()
await processVideo({
cwd: options.tmpdir,
url,
- user,
+ username,
+ password,
youtubeInfo: info
})
} catch (err) {
}
}
- log.info('Video/s for user %s imported: %s', user.username, options.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)
log.debug('Fetched object.', videoInfo)
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))
+ 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))
+ log.info('Video "%s" has been published after "%s", don\'t upload it.\n', videoInfo.title, formatDate(options.until))
return
}
- const result = await advancedVideosSearch(url, { search: videoInfo.title, sort: '-match', searchTarget: 'local' })
+ 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
}
youtubeDL,
cwd,
url,
- user,
+ username,
+ password,
videoInfo: normalizeObject(videoInfo),
videoPath: path
})
videoPath: string
cwd: string
url: string
- user: { username: string, password: string }
+ username: string
+ password: string
}) {
- const { youtubeDL, 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)) {
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)
}
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]
})
}
-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.`)
return new Promise<any>((res, rej) => {
const options = [ '-j', '--flat-playlist', '--playlist-reverse', ...args ]
- youtubeDL.getInfo(url, options, processOptions, async (err, info) => {
+ youtubeDL.getInfo(url, options, processOptions, (err, info) => {
if (err) return rej(err)
return res(info)
projects / github / Chocobozzz / PeerTube.git / blobdiff